summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-07 12:07:12 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-07 12:07:12 +0000
commit1c2a7c6d12cd8d1cb6ca50cd0a71d2a1605fc4d4 (patch)
tree4117cd024fa1de1fd9f28aa9050b2c8b6e7f5f0f /Build
parent9e12f984a50b65e418bec2d5f33536d5857e8d95 (diff)
Reorganize build system for TeX & MF engines
No more sed substitutions for *extra.[ch], they are now distributed and #include lib/texmfmp.c resp. the generated */*_version.h git-svn-id: svn://tug.org/texlive/trunk@20964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog11
-rw-r--r--Build/source/texk/web2c/Makefile.in573
-rw-r--r--Build/source/texk/web2c/alephdir/ChangeLog10
-rw-r--r--Build/source/texk/web2c/alephdir/alephextra.c11
-rw-r--r--Build/source/texk/web2c/alephdir/am/aleph.am11
-rw-r--r--Build/source/texk/web2c/am/texmf.am24
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/etexdir/am/etex.am25
-rw-r--r--Build/source/texk/web2c/etexdir/etexextra.c11
-rw-r--r--Build/source/texk/web2c/etexdir/etexextra.h (renamed from Build/source/texk/web2c/etexdir/etexextra.in)9
-rw-r--r--Build/source/texk/web2c/lib/Makefile.am4
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c13
-rw-r--r--Build/source/texk/web2c/mfextra.c11
-rw-r--r--Build/source/texk/web2c/omegafonts/ChangeLog4
-rw-r--r--Build/source/texk/web2c/omegafonts/omfonts.c16
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am29
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftexextra.c11
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftexextra.h (renamed from Build/source/texk/web2c/pdftexdir/pdftexextra.in)10
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am27
-rw-r--r--Build/source/texk/web2c/ptexdir/ptexextra.c11
-rw-r--r--Build/source/texk/web2c/ptexdir/ptexextra.h (renamed from Build/source/texk/web2c/ptexdir/ptexextra.in)6
-rw-r--r--Build/source/texk/web2c/synctexdir/am/synctex.am10
-rw-r--r--Build/source/texk/web2c/texextra.c11
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am34
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.mk335
-rw-r--r--Build/source/texk/web2c/xetexdir/xetexextra.c11
-rw-r--r--Build/source/texk/web2c/xetexdir/xetexextra.h (renamed from Build/source/texk/web2c/xetexdir/xetexextra.in)10
30 files changed, 522 insertions, 760 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 359ff086855..d55a39c849b 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * lib/texmfmp.c: Removed the initial two #includes;
+ this file is now #included from texextra.c for TeX,
+ from mfextra.c for Metafont, ...
+
+ * texextra.c (new): #include <texd.h> and <lib/texmfmp.c>.
+ * mfextra.c (new): #include <mfd.h> and <lib/texmfmp.c>.
+
+ * am/texmf.am: {tex,mf}extra.c are now distributed.
+
2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (bin_links): New variable for required symlinks.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index d4f5abc703e..275e9bf3546 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -172,23 +172,43 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@TEX_SYNCTEX_TRUE@am__append_53 = $(ZLIB_LIBS)
@TEX_SYNCTEX_TRUE@am__append_54 = $(ZLIB_DEPEND)
@TEX_SYNCTEX_TRUE@am__append_55 = \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
+
+@TEX_SYNCTEX_TRUE@am__append_56 = \
@TEX_SYNCTEX_TRUE@ synctex.c
-@ETEX_SYNCTEX_TRUE@am__append_56 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_57 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__
-@ETEX_SYNCTEX_TRUE@am__append_57 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_58 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_59 = \
+@ETEX_SYNCTEX_TRUE@am__append_58 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_59 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_60 = \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
+
+@ETEX_SYNCTEX_TRUE@am__append_61 = \
@ETEX_SYNCTEX_TRUE@ synctex-e.c
-@PDFTEX_SYNCTEX_TRUE@am__append_60 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_62 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__
-@PDFTEX_SYNCTEX_TRUE@am__append_61 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_63 = \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
+
+@PDFTEX_SYNCTEX_TRUE@am__append_64 = \
@PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c
-@XETEX_SYNCTEX_TRUE@am__append_62 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_65 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__
-@XETEX_SYNCTEX_TRUE@am__append_63 = \
+@XETEX_SYNCTEX_TRUE@am__append_66 = \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h
+
+@XETEX_SYNCTEX_TRUE@am__append_67 = \
@XETEX_SYNCTEX_TRUE@ synctex-xe.c
subdir = .
@@ -525,11 +545,11 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
@PTEX_TRUE@ tftopl$(EXEEXT)
@OTANGLE_TRUE@am__EXEEXT_25 = pltotf$(EXEEXT) tftopl$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT)
-am__objects_11 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
-nodist_aleph_OBJECTS = $(am__objects_11) aleph-aleph-pool.$(OBJEXT) \
+dist_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) \
aleph-alephextra.$(OBJEXT)
-aleph_OBJECTS = $(am_aleph_OBJECTS) $(nodist_aleph_OBJECTS)
+am__objects_11 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
+nodist_aleph_OBJECTS = $(am__objects_11) aleph-aleph-pool.$(OBJEXT)
+aleph_OBJECTS = $(dist_aleph_OBJECTS) $(nodist_aleph_OBJECTS)
am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1)
aleph_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@@ -573,13 +593,15 @@ nodist_dvitype_OBJECTS = dvitype.$(OBJEXT)
dvitype_OBJECTS = $(nodist_dvitype_OBJECTS)
dvitype_LDADD = $(LDADD)
dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__dist_etex_SOURCES_DIST = synctexdir/synctex.h \
- synctexdir/synctex-common.h synctexdir/synctex-etex.h
-dist_etex_OBJECTS =
-am__objects_12 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
-@ETEX_SYNCTEX_TRUE@am__objects_13 = etex-synctex-e.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_12) etex-etex-pool.$(OBJEXT) \
- etex-etexextra.$(OBJEXT) $(am__objects_13)
+am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-etex.h
+am__objects_12 =
+dist_etex_OBJECTS = etex-etexextra.$(OBJEXT) $(am__objects_12)
+am__objects_13 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+@ETEX_SYNCTEX_TRUE@am__objects_14 = etex-synctex-e.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_13) etex-etex-pool.$(OBJEXT) \
+ $(am__objects_14)
etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -615,8 +637,8 @@ md5main_DEPENDENCIES = libmd5.a
md5main_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(md5main_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-nodist_mf_OBJECTS = mf-mfextra.$(OBJEXT)
-mf_OBJECTS = $(nodist_mf_OBJECTS)
+dist_mf_OBJECTS = mf-mfextra.$(OBJEXT)
+mf_OBJECTS = $(dist_mf_OBJECTS)
@WIN32_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -626,8 +648,8 @@ mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \
mf_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(mf_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-nodist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT)
-mf_nowin_OBJECTS = $(nodist_mf_nowin_OBJECTS)
+dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT)
+mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS)
mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib)
mf_nowin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(mf_nowin_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -636,8 +658,8 @@ nodist_mft_OBJECTS = mft.$(OBJEXT)
mft_OBJECTS = $(nodist_mft_OBJECTS)
mft_LDADD = $(LDADD)
mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_14 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_14)
+am__objects_15 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_15)
mpost_OBJECTS = $(nodist_mpost_OBJECTS)
mpost_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(mpost_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -680,13 +702,14 @@ pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS)
am__DEPENDENCIES_6 = $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
pbibtex_DEPENDENCIES = $(am__DEPENDENCIES_6)
-am__dist_pdftex_SOURCES_DIST = synctexdir/synctex.h \
+am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
+ pdftexdir/pdftexextra.h synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-pdftex.h
-dist_pdftex_OBJECTS =
-am__objects_15 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-@PDFTEX_SYNCTEX_TRUE@am__objects_16 = pdftex-synctex-pdf.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_15) pdftex-pdftex-pool.$(OBJEXT) \
- pdftex-pdftexextra.$(OBJEXT) $(am__objects_16)
+dist_pdftex_OBJECTS = pdftex-pdftexextra.$(OBJEXT) $(am__objects_12)
+am__objects_16 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+@PDFTEX_SYNCTEX_TRUE@am__objects_17 = pdftex-synctex-pdf.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_16) pdftex-pdftex-pool.$(OBJEXT) \
+ $(am__objects_17)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a
@@ -722,11 +745,10 @@ am_ppltotf_OBJECTS =
nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT)
ppltotf_OBJECTS = $(am_ppltotf_OBJECTS) $(nodist_ppltotf_OBJECTS)
ppltotf_DEPENDENCIES = $(am__DEPENDENCIES_6)
-am_ptex_OBJECTS = ptex-kanji.$(OBJEXT)
-am__objects_17 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_17) ptex-ptex-pool.$(OBJEXT) \
- ptex-ptexextra.$(OBJEXT)
-ptex_OBJECTS = $(am_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
+dist_ptex_OBJECTS = ptex-ptexextra.$(OBJEXT) ptex-kanji.$(OBJEXT)
+am__objects_18 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_18) ptex-ptex-pool.$(OBJEXT)
+ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
ptex_DEPENDENCIES = $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1)
ptex_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(ptex_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -750,13 +772,13 @@ tangle_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
nodist_tangleboot_OBJECTS = tangleboot.$(OBJEXT)
tangleboot_OBJECTS = $(nodist_tangleboot_OBJECTS)
tangleboot_LDADD = $(LDADD)
-am__dist_tex_SOURCES_DIST = synctexdir/synctex.h \
+am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-tex.h
-dist_tex_OBJECTS =
-am__objects_18 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-@TEX_SYNCTEX_TRUE@am__objects_19 = tex-synctex.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_18) tex-tex-pool.$(OBJEXT) \
- tex-texextra.$(OBJEXT) $(am__objects_19)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_12)
+am__objects_19 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+@TEX_SYNCTEX_TRUE@am__objects_20 = tex-synctex.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_19) tex-tex-pool.$(OBJEXT) \
+ $(am__objects_20)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -793,13 +815,14 @@ nodist_weave_OBJECTS = weave.$(OBJEXT)
weave_OBJECTS = $(nodist_weave_OBJECTS)
weave_LDADD = $(LDADD)
weave_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__dist_xetex_SOURCES_DIST = synctexdir/synctex.h \
+am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \
+ xetexdir/xetexextra.h synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-xetex.h
-dist_xetex_OBJECTS =
-am__objects_20 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-@XETEX_SYNCTEX_TRUE@am__objects_21 = xetex-synctex-xe.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_20) xetex-xetex_pool.$(OBJEXT) \
- xetex-xetexextra.$(OBJEXT) $(am__objects_21)
+dist_xetex_OBJECTS = xetex-xetexextra.$(OBJEXT) $(am__objects_12)
+am__objects_21 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+@XETEX_SYNCTEX_TRUE@am__objects_22 = xetex-synctex-xe.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_21) xetex-xetex_pool.$(OBJEXT) \
+ $(am__objects_22)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
@XETEX_MACOSX_FALSE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) \
@XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1) \
@@ -842,7 +865,7 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
$(nodist_libmf_a_SOURCES) $(libmplib_a_SOURCES) \
$(nodist_libmplib_a_SOURCES) $(libpdftex_a_SOURCES) \
$(EXTRA_libpdftex_a_SOURCES) $(libxetex_a_SOURCES) \
- $(libxetexmm_a_SOURCES) $(aleph_SOURCES) \
+ $(libxetexmm_a_SOURCES) $(dist_aleph_SOURCES) \
$(nodist_aleph_SOURCES) $(nodist_bibtex_SOURCES) \
$(nodist_ctangle_SOURCES) $(nodist_ctangleboot_SOURCES) \
$(nodist_ctie_SOURCES) $(nodist_cweave_SOURCES) \
@@ -851,7 +874,7 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
$(nodist_gftodvi_SOURCES) $(nodist_gftopk_SOURCES) \
$(nodist_gftype_SOURCES) $(luatex_SOURCES) \
$(nodist_EXTRA_luatex_SOURCES) $(md5main_SOURCES) \
- $(nodist_mf_SOURCES) $(nodist_mf_nowin_SOURCES) \
+ $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
$(nodist_mft_SOURCES) $(nodist_mpost_SOURCES) \
$(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \
$(nodist_ofm2opl_SOURCES) $(nodist_opl2ofm_SOURCES) \
@@ -864,7 +887,7 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
$(nodist_pdvitype_SOURCES) $(nodist_pktogf_SOURCES) \
$(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \
$(nodist_pooltype_SOURCES) $(ppltotf_SOURCES) \
- $(nodist_ppltotf_SOURCES) $(ptex_SOURCES) \
+ $(nodist_ppltotf_SOURCES) $(dist_ptex_SOURCES) \
$(nodist_ptex_SOURCES) $(ptftopl_SOURCES) \
$(nodist_ptftopl_SOURCES) $(synctex_SOURCES) \
$(nodist_tangle_SOURCES) $(nodist_tangleboot_SOURCES) \
@@ -880,11 +903,12 @@ DIST_SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
$(libmd5_a_SOURCES) $(libmplib_a_SOURCES) \
$(am__libpdftex_a_SOURCES_DIST) $(EXTRA_libpdftex_a_SOURCES) \
$(am__libxetex_a_SOURCES_DIST) $(libxetexmm_a_SOURCES) \
- $(aleph_SOURCES) $(am__dist_etex_SOURCES_DIST) \
+ $(dist_aleph_SOURCES) $(am__dist_etex_SOURCES_DIST) \
$(gftodvi_SOURCES) $(luatex_SOURCES) $(md5main_SOURCES) \
- $(pbibtex_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
- $(pdftosrc_SOURCES) $(pdvitype_SOURCES) $(ppltotf_SOURCES) \
- $(ptex_SOURCES) $(ptftopl_SOURCES) $(synctex_SOURCES) \
+ $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) $(pbibtex_SOURCES) \
+ $(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
+ $(pdvitype_SOURCES) $(ppltotf_SOURCES) $(dist_ptex_SOURCES) \
+ $(ptftopl_SOURCES) $(synctex_SOURCES) \
$(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \
$(EXTRA_ttf2afm_SOURCES) $(am__dist_xetex_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -1200,27 +1224,26 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
tests/testex.mp tests/testex.tex tests/translate tests/uno.dos \
tests/xampl.bib ctiedir tiedir lib/mfmpi386.asm lib/mfmpw32.c \
lib/texmfmp.c texmfmem.h texmfmp-help.h texmfmp.h \
- $(tex_ch_srcs) lib/texmfmp.c $(tex_tests) \
- tests/write18-quote.tex $(mf_ch_src) mftalk.h lib/texmfmp.c \
- $(mf_tests) triptrap/README triptrap/mftrap.diffs \
- triptrap/mftrap.fot triptrap/mftrap.log triptrap/mftrap.pl \
- triptrap/mftrap1.in triptrap/mftrap2.in triptrap/mftrapin.log \
- triptrap/mptrap.diffs triptrap/mptrap.fot triptrap/mptrap.log \
- triptrap/mptrap.pl triptrap/mptrap.readme triptrap/mptrap1.in \
- triptrap/mptrap2.in triptrap/mptrapin.log triptrap/mtrap.0 \
- triptrap/mtrap.1 triptrap/mtrap.log triptrap/mtrap.mp \
- triptrap/texmf.cnf triptrap/trap.148 triptrap/trap.149 \
- triptrap/trap.150 triptrap/trap.151 triptrap/trap.197 \
- triptrap/trap.200 triptrap/trap.5 triptrap/trap.6 \
- triptrap/trap.mf triptrap/trap.mp triptrap/trap.mpx \
- triptrap/trap.typ triptrap/trapf.pl triptrap/trapman.tex \
- triptrap/trip.diffs triptrap/trip.fot triptrap/trip.log \
- triptrap/trip.pl triptrap/trip.tex triptrap/trip.typ \
- triptrap/trip1.in triptrap/trip2.in triptrap/tripin.log \
- triptrap/tripman.tex triptrap/tripos.tex triptrap/writeo \
- triptrap/writeo.2 mplibdir/ChangeLog $(mpost_web) $(mp_tests) \
- $(libmplib_web) mplibdir/lmplib.c $(etex_web_srcs) \
- $(etex_ch_srcs) etexdir/etexextra.in lib/texmfmp.c \
+ $(tex_ch_srcs) $(tex_tests) tests/write18-quote.tex \
+ $(mf_ch_src) mftalk.h $(mf_tests) triptrap/README \
+ triptrap/mftrap.diffs triptrap/mftrap.fot triptrap/mftrap.log \
+ triptrap/mftrap.pl triptrap/mftrap1.in triptrap/mftrap2.in \
+ triptrap/mftrapin.log triptrap/mptrap.diffs \
+ triptrap/mptrap.fot triptrap/mptrap.log triptrap/mptrap.pl \
+ triptrap/mptrap.readme triptrap/mptrap1.in triptrap/mptrap2.in \
+ triptrap/mptrapin.log triptrap/mtrap.0 triptrap/mtrap.1 \
+ triptrap/mtrap.log triptrap/mtrap.mp triptrap/texmf.cnf \
+ triptrap/trap.148 triptrap/trap.149 triptrap/trap.150 \
+ triptrap/trap.151 triptrap/trap.197 triptrap/trap.200 \
+ triptrap/trap.5 triptrap/trap.6 triptrap/trap.mf \
+ triptrap/trap.mp triptrap/trap.mpx triptrap/trap.typ \
+ triptrap/trapf.pl triptrap/trapman.tex triptrap/trip.diffs \
+ triptrap/trip.fot triptrap/trip.log triptrap/trip.pl \
+ triptrap/trip.tex triptrap/trip.typ triptrap/trip1.in \
+ triptrap/trip2.in triptrap/tripin.log triptrap/tripman.tex \
+ triptrap/tripos.tex triptrap/writeo triptrap/writeo.2 \
+ mplibdir/ChangeLog $(mpost_web) $(mp_tests) $(libmplib_web) \
+ mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \
etexdir/ChangeLog etexdir/INSTALL etexdir/README \
etexdir/etex_gen.tex $(etex_tests) etexdir/etrip/etrip.diffs \
etexdir/etrip/etrip.fot etexdir/etrip/etrip.log \
@@ -1231,11 +1254,10 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
etexdir/etrip/trip2.in etexdir/etex.mak etexdir/etex.mk \
$(ptex_tests) $(ptex_web_srcs) $(ptex_ch_srcs) \
- ptexdir/ptexextra.in ptexdir/ptex.defines lib/texmfmp.c \
- ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \
- ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \
- ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \
- ptexdir/INSTALL.txt ptexdir/README.txt \
+ ptexdir/ptex.defines ptexdir/pbibtex.ch web2c/cvtbib.sed \
+ ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \
+ ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \
+ ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \
ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \
tests/memdata3.bst ptexdir/tests/goth10.tfm \
@@ -1243,8 +1265,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
ptexdir/tests/tmin10.tfm ptexdir/ptrip.diffs $(pdftex_ch_srcs) \
etexdir/etex.ch pdftexdir/pdftex.defines pdftexdir/pdftex.h \
- pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \
- pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
+ pdftexdir/ChangeLog pdftexdir/NEWS pdftexdir/README \
+ pdftexdir/change-files.txt $(pdftex_tests) \
pdftexdir/pdftex.mak pdftexdir/pdftex.mk \
pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
luatexdir/ptexlib.h luatexdir/getluatexsvnversion.sh \
@@ -1345,11 +1367,10 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
luatexdir/luafontloader/fontforge/plugins/Makefile.in \
$(libluatex_web) luatexdir/ChangeLog luatexdir/NEWS \
luatexdir/font/subfont.txt $(xetex_web_srcs) \
- xetexdir/xetex.defines xetexdir/xetexextra.in \
- xetexdir/pool2c.pl xetexdir/unicode-char-prep.pl \
- xetexdir/appleGlyphNames.c xetexdir/XeTeXFontMgr_Mac.mm \
- xetexdir/ChangeLog $(xetex_tests) xetexdir/LICENSE.txt \
- xetexdir/xetex.mk omegaware/README omegaware/ChangeLog \
+ xetexdir/xetex.defines xetexdir/pool2c.pl \
+ xetexdir/unicode-char-prep.pl xetexdir/appleGlyphNames.c \
+ xetexdir/XeTeXFontMgr_Mac.mm xetexdir/ChangeLog $(xetex_tests) \
+ xetexdir/LICENSE.txt omegaware/README omegaware/ChangeLog \
$(odvicopy_sources) $(odvitype_sources) $(ofm2opl_sources) \
$(opl2ofm_sources) $(otangle_sources) $(ovf2ovp_sources) \
$(ovp2ovf_sources) $(OTANGLE_tests) $(OMFONTS_tests) \
@@ -1374,13 +1395,12 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp \
omegaware/tests/repeat.opl omegaware/tests/repeated.opl \
omegaware/tests/specialhex.ovp $(aleph_web_srcs) \
- $(aleph_ch_srcs) lib/texmfmp.c alephdir/ChangeLog \
- alephdir/Makefile alephdir/aleph.defines \
- alephdir/aleph.version alephdir/eomega.ech alephdir/etex.ch \
- alephdir/omega.ch0 alephdir/omega.ch1 alephdir/omega.ch2 \
- alephdir/omxml.ch alephdir/aleph-pool.h alephdir/aleph.mk \
- synctexdir/ChangeLog synctexdir/README.txt \
- synctexdir/synctex_parser_readme.txt \
+ $(aleph_ch_srcs) alephdir/ChangeLog alephdir/Makefile \
+ alephdir/aleph.defines alephdir/aleph.version \
+ alephdir/eomega.ech alephdir/etex.ch alephdir/omega.ch0 \
+ alephdir/omega.ch1 alephdir/omega.ch2 alephdir/omxml.ch \
+ alephdir/aleph-pool.h alephdir/aleph.mk synctexdir/ChangeLog \
+ synctexdir/README.txt synctexdir/synctex_parser_readme.txt \
synctexdir/synctex_parser_version.txt synctexdir/tests \
synctexdir/synctex-common.h synctexdir/synctex.c \
synctexdir/synctex.defines synctexdir/synctex.h \
@@ -1409,36 +1429,34 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
common.tex common.scn common.idx tie.outc tie.outm \
$(nodist_tex_SOURCES) tex-final.ch tex-web2c tex.p tex.pool \
tex-tangle trip.diffs mftrap.diffs $(nodist_libmf_a_SOURCES) \
- mfextra.c mf-final.ch mf-web2c mf.p mf.pool mf-tangle \
+ mf-final.ch mf-web2c mf.p mf.pool mf-tangle \
$(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs ptmr.mpx \
tests/xptmr.mpx tests/xstory.mpx $(nodist_libmplib_a_SOURCES) \
memio-tangle mp-tangle psout-tangle svgout-tangle tfmin-tangle \
$(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
- etex.pool etex-tangle etexdir/etex.version etrip.diffs \
- $(pweb_programs:=.c) $(pweb_programs:=.h) $(pweb_programs:=.p) \
+ etex.pool etex-tangle etrip.diffs $(pweb_programs:=.c) \
+ $(pweb_programs:=.h) $(pweb_programs:=.p) \
$(pweb_programs:=-web2c) $(pweb_programs:=.web) \
$(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
- ptex.pool ptex-tangle ptexdir/ptex.version tests/nissya_bib.* \
- tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg \
- tests/memtest* tests/xstory.dvityp tests/xpagenum.typ \
- tests/xcmr10.tfm tests/xcmr10.pl tests/xsample.typ \
- tests/x*min10.* ptrip.diffs $(nodist_pdftex_SOURCES) pdftex.ch \
- pdftex-web2c pdftex.p pdftex.pool pdftex-tangle \
- pdftexdir/pdftex.version pdftexdir/etex.version \
- $(nodist_libluatex_a_SOURCES) $(nodist_xetex_SOURCES) \
- xetex.web xetex-web2c xetex.p xetex.pool xetex-tangle \
- xetexdir/etex.version xetexdir/xetex.version \
- $(omegaware_programs:=.c) $(omegaware_programs:=.h) \
- $(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
- omegaware/tests/xlevel1.ofm omegaware/tests/xlevel1.opl \
- ofont*vf omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
- omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
- omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
- omegaware/tests/xOCherokee.* cftest.p \
- omegaware/tests/xrepeated.* omegaware/tests/specialhex.ofm \
- omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
- omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \
- aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
+ ptex.pool ptex-tangle tests/nissya_bib.* tests/xexampl.aux \
+ tests/xexampl.bbl tests/xexampl.blg tests/memtest* \
+ tests/xstory.dvityp tests/xpagenum.typ tests/xcmr10.tfm \
+ tests/xcmr10.pl tests/xsample.typ tests/x*min10.* ptrip.diffs \
+ $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \
+ pdftex.pool pdftex-tangle $(nodist_libluatex_a_SOURCES) \
+ $(nodist_xetex_SOURCES) xetex.web xetex-web2c xetex.p \
+ xetex.pool xetex-tangle $(omegaware_programs:=.c) \
+ $(omegaware_programs:=.h) $(omegaware_programs:=.p) \
+ $(omegaware_programs:=-web2c) omegaware/tests/xlevel1.ofm \
+ omegaware/tests/xlevel1.opl ofont*vf omegaware/tests/xofont* \
+ omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
+ omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
+ omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
+ cftest.p omegaware/tests/xrepeated.* \
+ omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+ omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
+ $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
+ aleph.pool aleph-tangle
CLEANFILES =
TRIPTRAP = $(am__append_6) $(am__append_9) $(am__append_16) \
$(am__append_20) $(am__append_25)
@@ -1534,7 +1552,8 @@ tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_53)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
-nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_55)
+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c $(am__append_56)
+dist_tex_SOURCES = texextra.c $(am__append_55)
# We must create texd.h before building the tex_OBJECTS.
tex_prereq = texd.h $(am__append_54)
@@ -1548,11 +1567,11 @@ tex_ch_srcs = \
# TeX tests
#
tex_tests = trip.test tests/write18-quote-test.pl
-nodist_mf_SOURCES = mfextra.c
+dist_mf_SOURCES = mfextra.c
mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
mf_CFLAGS = $(WARNING_CFLAGS)
mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
-nodist_mf_nowin_SOURCES = mfextra.c
+dist_mf_nowin_SOURCES = mfextra.c
mf_nowin_CPPFLAGS = $(mf_CPPFLAGS) -DMFNOWIN
mf_nowin_CFLAGS = $(WARNING_CFLAGS)
mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib)
@@ -1604,19 +1623,21 @@ svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
tfmin_c_h = mptfmin.h tfmin.c
libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/memio.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_56)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_57)
etex_CFLAGS = $(WARNING_CFLAGS)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_57)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_58)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
-nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \
- etexdir/etexextra.h $(am__append_59)
+nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h \
+ $(am__append_61)
+dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
+ $(am__append_60)
-# We must create etexd.h before building the etex_OBJECTS.
-etex_prereq = etexd.h $(am__append_58)
+# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_59)
etex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -1655,11 +1676,13 @@ ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs)
# pTeX C sources
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
-nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexextra.c ptexdir/ptexextra.h
-ptex_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
+nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h
+dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
+ ptexdir/kanji.c ptexdir/kanji.h
+
-# We must create ptexd.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h
+# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
+ptex_prereq = ptexd.h ptexdir/ptex_version.h
ptex_web_srcs = \
tex.web \
tex.ch
@@ -1697,16 +1720,22 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_60)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_62)
pdftex_CFLAGS = $(WARNING_CFLAGS)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
+
+# We must create libpdftex.a etc before building the pdftex_OBJECTS.
+pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h
pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
-nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \
- pdftexdir/pdftexextra.h $(am__append_61)
+nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
+ pdftexdir/etex_version.h pdftexdir/pdftex_version.h \
+ $(am__append_64)
+dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
+ $(am__append_63)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -2212,14 +2241,19 @@ xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
$(TECKIT_DEPEND) $(am__append_38) $(am__append_41) \
$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_62)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_65)
xetex_CFLAGS = # $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
-xetex_prereq = $(libxetex)
+
+# We must create libxetex.a etc before building the xetex_OBJECTS
+xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
-nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c \
- xetexdir/xetexextra.h $(am__append_63)
+nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
+ xetexdir/etex_version.h xetexdir/xetex_version.h \
+ $(am__append_67)
+dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
+ $(am__append_66)
xetex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2296,10 +2330,11 @@ aleph_CFLAGS = $(WARNING_CFLAGS)
# Aleph C sources
aleph_c_h = alephini.c aleph0.c alephcoerce.h alephd.h
-nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c alephextra.c
-aleph_SOURCES = \
+nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c
+dist_aleph_SOURCES = \
alephdir/aleph.c \
alephdir/alephbis.c \
+ alephdir/alephextra.c \
alephdir/alephextra.h \
alephdir/alephmem.h
@@ -2365,11 +2400,6 @@ synctex_LDADD = $(ZLIB_LIBS)
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2
-@TEX_SYNCTEX_TRUE@dist_tex_SOURCES = \
-@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
-@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
-@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
-
@ETEX_SYNCTEX_TRUE@etex_ch_synctex = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch1 \
@@ -2380,11 +2410,6 @@ synctex_LDADD = $(ZLIB_LIBS)
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch1
-@ETEX_SYNCTEX_TRUE@dist_etex_SOURCES = \
-@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
-@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
-@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
-
@PDFTEX_SYNCTEX_TRUE@pdftex_ch_synctex = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch1 \
@@ -2396,11 +2421,6 @@ synctex_LDADD = $(ZLIB_LIBS)
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch1 \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdf-rec.ch2
-@PDFTEX_SYNCTEX_TRUE@dist_pdftex_SOURCES = \
-@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
-@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
-@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
-
@XETEX_SYNCTEX_TRUE@xetex_ch_synctex = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
@@ -2413,11 +2433,6 @@ synctex_LDADD = $(ZLIB_LIBS)
@XETEX_SYNCTEX_TRUE@xetex_post_ch_synctex = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-rec.ch3
-@XETEX_SYNCTEX_TRUE@dist_xetex_SOURCES = \
-@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
-@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
-@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h
-
libmd5_a_CPPFLAGS = -I$(srcdir)/libmd5
libmd5_a_CFLAGS = $(WARNING_CFLAGS)
libmd5_a_SOURCES = libmd5/md5.c libmd5/md5.h
@@ -6953,6 +6968,20 @@ aleph-alephbis.obj: alephdir/alephbis.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -c -o aleph-alephbis.obj `if test -f 'alephdir/alephbis.c'; then $(CYGPATH_W) 'alephdir/alephbis.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/alephbis.c'; fi`
+aleph-alephextra.o: alephdir/alephextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -MT aleph-alephextra.o -MD -MP -MF $(DEPDIR)/aleph-alephextra.Tpo -c -o aleph-alephextra.o `test -f 'alephdir/alephextra.c' || echo '$(srcdir)/'`alephdir/alephextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/aleph-alephextra.Tpo $(DEPDIR)/aleph-alephextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alephdir/alephextra.c' object='aleph-alephextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -c -o aleph-alephextra.o `test -f 'alephdir/alephextra.c' || echo '$(srcdir)/'`alephdir/alephextra.c
+
+aleph-alephextra.obj: alephdir/alephextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -MT aleph-alephextra.obj -MD -MP -MF $(DEPDIR)/aleph-alephextra.Tpo -c -o aleph-alephextra.obj `if test -f 'alephdir/alephextra.c'; then $(CYGPATH_W) 'alephdir/alephextra.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/alephextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/aleph-alephextra.Tpo $(DEPDIR)/aleph-alephextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alephdir/alephextra.c' object='aleph-alephextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -c -o aleph-alephextra.obj `if test -f 'alephdir/alephextra.c'; then $(CYGPATH_W) 'alephdir/alephextra.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/alephextra.c'; fi`
+
aleph-alephini.o: alephini.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -MT aleph-alephini.o -MD -MP -MF $(DEPDIR)/aleph-alephini.Tpo -c -o aleph-alephini.o `test -f 'alephini.c' || echo '$(srcdir)/'`alephini.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/aleph-alephini.Tpo $(DEPDIR)/aleph-alephini.Po
@@ -6995,20 +7024,6 @@ aleph-aleph-pool.obj: aleph-pool.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -c -o aleph-aleph-pool.obj `if test -f 'aleph-pool.c'; then $(CYGPATH_W) 'aleph-pool.c'; else $(CYGPATH_W) '$(srcdir)/aleph-pool.c'; fi`
-aleph-alephextra.o: alephextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -MT aleph-alephextra.o -MD -MP -MF $(DEPDIR)/aleph-alephextra.Tpo -c -o aleph-alephextra.o `test -f 'alephextra.c' || echo '$(srcdir)/'`alephextra.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/aleph-alephextra.Tpo $(DEPDIR)/aleph-alephextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alephextra.c' object='aleph-alephextra.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -c -o aleph-alephextra.o `test -f 'alephextra.c' || echo '$(srcdir)/'`alephextra.c
-
-aleph-alephextra.obj: alephextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -MT aleph-alephextra.obj -MD -MP -MF $(DEPDIR)/aleph-alephextra.Tpo -c -o aleph-alephextra.obj `if test -f 'alephextra.c'; then $(CYGPATH_W) 'alephextra.c'; else $(CYGPATH_W) '$(srcdir)/alephextra.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/aleph-alephextra.Tpo $(DEPDIR)/aleph-alephextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alephextra.c' object='aleph-alephextra.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -c -o aleph-alephextra.obj `if test -f 'alephextra.c'; then $(CYGPATH_W) 'alephextra.c'; else $(CYGPATH_W) '$(srcdir)/alephextra.c'; fi`
-
ctangle-ctangle.o: ctangle.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctangle_CFLAGS) $(CFLAGS) -MT ctangle-ctangle.o -MD -MP -MF $(DEPDIR)/ctangle-ctangle.Tpo -c -o ctangle-ctangle.o `test -f 'ctangle.c' || echo '$(srcdir)/'`ctangle.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ctangle-ctangle.Tpo $(DEPDIR)/ctangle-ctangle.Po
@@ -7079,6 +7094,20 @@ cweave-cweb.obj: cweb.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cweave_CFLAGS) $(CFLAGS) -c -o cweave-cweb.obj `if test -f 'cweb.c'; then $(CYGPATH_W) 'cweb.c'; else $(CYGPATH_W) '$(srcdir)/cweb.c'; fi`
+etex-etexextra.o: etexdir/etexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -MT etex-etexextra.o -MD -MP -MF $(DEPDIR)/etex-etexextra.Tpo -c -o etex-etexextra.o `test -f 'etexdir/etexextra.c' || echo '$(srcdir)/'`etexdir/etexextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/etex-etexextra.Tpo $(DEPDIR)/etex-etexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='etexdir/etexextra.c' object='etex-etexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -c -o etex-etexextra.o `test -f 'etexdir/etexextra.c' || echo '$(srcdir)/'`etexdir/etexextra.c
+
+etex-etexextra.obj: etexdir/etexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -MT etex-etexextra.obj -MD -MP -MF $(DEPDIR)/etex-etexextra.Tpo -c -o etex-etexextra.obj `if test -f 'etexdir/etexextra.c'; then $(CYGPATH_W) 'etexdir/etexextra.c'; else $(CYGPATH_W) '$(srcdir)/etexdir/etexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/etex-etexextra.Tpo $(DEPDIR)/etex-etexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='etexdir/etexextra.c' object='etex-etexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -c -o etex-etexextra.obj `if test -f 'etexdir/etexextra.c'; then $(CYGPATH_W) 'etexdir/etexextra.c'; else $(CYGPATH_W) '$(srcdir)/etexdir/etexextra.c'; fi`
+
etex-etexini.o: etexini.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -MT etex-etexini.o -MD -MP -MF $(DEPDIR)/etex-etexini.Tpo -c -o etex-etexini.o `test -f 'etexini.c' || echo '$(srcdir)/'`etexini.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/etex-etexini.Tpo $(DEPDIR)/etex-etexini.Po
@@ -7121,20 +7150,6 @@ etex-etex-pool.obj: etex-pool.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -c -o etex-etex-pool.obj `if test -f 'etex-pool.c'; then $(CYGPATH_W) 'etex-pool.c'; else $(CYGPATH_W) '$(srcdir)/etex-pool.c'; fi`
-etex-etexextra.o: etexextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -MT etex-etexextra.o -MD -MP -MF $(DEPDIR)/etex-etexextra.Tpo -c -o etex-etexextra.o `test -f 'etexextra.c' || echo '$(srcdir)/'`etexextra.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/etex-etexextra.Tpo $(DEPDIR)/etex-etexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='etexextra.c' object='etex-etexextra.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -c -o etex-etexextra.o `test -f 'etexextra.c' || echo '$(srcdir)/'`etexextra.c
-
-etex-etexextra.obj: etexextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -MT etex-etexextra.obj -MD -MP -MF $(DEPDIR)/etex-etexextra.Tpo -c -o etex-etexextra.obj `if test -f 'etexextra.c'; then $(CYGPATH_W) 'etexextra.c'; else $(CYGPATH_W) '$(srcdir)/etexextra.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/etex-etexextra.Tpo $(DEPDIR)/etex-etexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='etexextra.c' object='etex-etexextra.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -c -o etex-etexextra.obj `if test -f 'etexextra.c'; then $(CYGPATH_W) 'etexextra.c'; else $(CYGPATH_W) '$(srcdir)/etexextra.c'; fi`
-
etex-synctex-e.o: synctex-e.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(etex_CFLAGS) $(CFLAGS) -MT etex-synctex-e.o -MD -MP -MF $(DEPDIR)/etex-synctex-e.Tpo -c -o etex-synctex-e.o `test -f 'synctex-e.c' || echo '$(srcdir)/'`synctex-e.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/etex-synctex-e.Tpo $(DEPDIR)/etex-synctex-e.Po
@@ -7247,6 +7262,20 @@ pbibtex-pbibtex.obj: pbibtex.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pbibtex-pbibtex.obj `if test -f 'pbibtex.c'; then $(CYGPATH_W) 'pbibtex.c'; else $(CYGPATH_W) '$(srcdir)/pbibtex.c'; fi`
+pdftex-pdftexextra.o: pdftexdir/pdftexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -MT pdftex-pdftexextra.o -MD -MP -MF $(DEPDIR)/pdftex-pdftexextra.Tpo -c -o pdftex-pdftexextra.o `test -f 'pdftexdir/pdftexextra.c' || echo '$(srcdir)/'`pdftexdir/pdftexextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdftex-pdftexextra.Tpo $(DEPDIR)/pdftex-pdftexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdftexdir/pdftexextra.c' object='pdftex-pdftexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -c -o pdftex-pdftexextra.o `test -f 'pdftexdir/pdftexextra.c' || echo '$(srcdir)/'`pdftexdir/pdftexextra.c
+
+pdftex-pdftexextra.obj: pdftexdir/pdftexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -MT pdftex-pdftexextra.obj -MD -MP -MF $(DEPDIR)/pdftex-pdftexextra.Tpo -c -o pdftex-pdftexextra.obj `if test -f 'pdftexdir/pdftexextra.c'; then $(CYGPATH_W) 'pdftexdir/pdftexextra.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdftex-pdftexextra.Tpo $(DEPDIR)/pdftex-pdftexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdftexdir/pdftexextra.c' object='pdftex-pdftexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -c -o pdftex-pdftexextra.obj `if test -f 'pdftexdir/pdftexextra.c'; then $(CYGPATH_W) 'pdftexdir/pdftexextra.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftexextra.c'; fi`
+
pdftex-pdftexini.o: pdftexini.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -MT pdftex-pdftexini.o -MD -MP -MF $(DEPDIR)/pdftex-pdftexini.Tpo -c -o pdftex-pdftexini.o `test -f 'pdftexini.c' || echo '$(srcdir)/'`pdftexini.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdftex-pdftexini.Tpo $(DEPDIR)/pdftex-pdftexini.Po
@@ -7289,20 +7318,6 @@ pdftex-pdftex-pool.obj: pdftex-pool.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -c -o pdftex-pdftex-pool.obj `if test -f 'pdftex-pool.c'; then $(CYGPATH_W) 'pdftex-pool.c'; else $(CYGPATH_W) '$(srcdir)/pdftex-pool.c'; fi`
-pdftex-pdftexextra.o: pdftexextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -MT pdftex-pdftexextra.o -MD -MP -MF $(DEPDIR)/pdftex-pdftexextra.Tpo -c -o pdftex-pdftexextra.o `test -f 'pdftexextra.c' || echo '$(srcdir)/'`pdftexextra.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdftex-pdftexextra.Tpo $(DEPDIR)/pdftex-pdftexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdftexextra.c' object='pdftex-pdftexextra.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -c -o pdftex-pdftexextra.o `test -f 'pdftexextra.c' || echo '$(srcdir)/'`pdftexextra.c
-
-pdftex-pdftexextra.obj: pdftexextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -MT pdftex-pdftexextra.obj -MD -MP -MF $(DEPDIR)/pdftex-pdftexextra.Tpo -c -o pdftex-pdftexextra.obj `if test -f 'pdftexextra.c'; then $(CYGPATH_W) 'pdftexextra.c'; else $(CYGPATH_W) '$(srcdir)/pdftexextra.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdftex-pdftexextra.Tpo $(DEPDIR)/pdftex-pdftexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdftexextra.c' object='pdftex-pdftexextra.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -c -o pdftex-pdftexextra.obj `if test -f 'pdftexextra.c'; then $(CYGPATH_W) 'pdftexextra.c'; else $(CYGPATH_W) '$(srcdir)/pdftexextra.c'; fi`
-
pdftex-synctex-pdf.o: synctex-pdf.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -MT pdftex-synctex-pdf.o -MD -MP -MF $(DEPDIR)/pdftex-synctex-pdf.Tpo -c -o pdftex-synctex-pdf.o `test -f 'synctex-pdf.c' || echo '$(srcdir)/'`synctex-pdf.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdftex-synctex-pdf.Tpo $(DEPDIR)/pdftex-synctex-pdf.Po
@@ -7345,6 +7360,20 @@ ppltotf-ppltotf.obj: ppltotf.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
+ptex-ptexextra.o: ptexdir/ptexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptexextra.o -MD -MP -MF $(DEPDIR)/ptex-ptexextra.Tpo -c -o ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexextra.Tpo $(DEPDIR)/ptex-ptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexdir/ptexextra.c' object='ptex-ptexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
+
+ptex-ptexextra.obj: ptexdir/ptexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptexextra.obj -MD -MP -MF $(DEPDIR)/ptex-ptexextra.Tpo -c -o ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexextra.Tpo $(DEPDIR)/ptex-ptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexdir/ptexextra.c' object='ptex-ptexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
+
ptex-kanji.o: ptexdir/kanji.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-kanji.o -MD -MP -MF $(DEPDIR)/ptex-kanji.Tpo -c -o ptex-kanji.o `test -f 'ptexdir/kanji.c' || echo '$(srcdir)/'`ptexdir/kanji.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-kanji.Tpo $(DEPDIR)/ptex-kanji.Po
@@ -7401,20 +7430,6 @@ ptex-ptex-pool.obj: ptex-pool.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
-ptex-ptexextra.o: ptexextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptexextra.o -MD -MP -MF $(DEPDIR)/ptex-ptexextra.Tpo -c -o ptex-ptexextra.o `test -f 'ptexextra.c' || echo '$(srcdir)/'`ptexextra.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexextra.Tpo $(DEPDIR)/ptex-ptexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexextra.c' object='ptex-ptexextra.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.o `test -f 'ptexextra.c' || echo '$(srcdir)/'`ptexextra.c
-
-ptex-ptexextra.obj: ptexextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptexextra.obj -MD -MP -MF $(DEPDIR)/ptex-ptexextra.Tpo -c -o ptex-ptexextra.obj `if test -f 'ptexextra.c'; then $(CYGPATH_W) 'ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexextra.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexextra.Tpo $(DEPDIR)/ptex-ptexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexextra.c' object='ptex-ptexextra.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.obj `if test -f 'ptexextra.c'; then $(CYGPATH_W) 'ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexextra.c'; fi`
-
ptftopl-ptftopl.o: ptftopl.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptftopl-ptftopl.o -MD -MP -MF $(DEPDIR)/ptftopl-ptftopl.Tpo -c -o ptftopl-ptftopl.o `test -f 'ptftopl.c' || echo '$(srcdir)/'`ptftopl.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptftopl-ptftopl.Tpo $(DEPDIR)/ptftopl-ptftopl.Po
@@ -7471,6 +7486,20 @@ synctex-synctex_parser_utils.obj: synctexdir/synctex_parser_utils.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(synctex_CFLAGS) $(CFLAGS) -c -o synctex-synctex_parser_utils.obj `if test -f 'synctexdir/synctex_parser_utils.c'; then $(CYGPATH_W) 'synctexdir/synctex_parser_utils.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex_parser_utils.c'; fi`
+tex-texextra.o: texextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -MT tex-texextra.o -MD -MP -MF $(DEPDIR)/tex-texextra.Tpo -c -o tex-texextra.o `test -f 'texextra.c' || echo '$(srcdir)/'`texextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tex-texextra.Tpo $(DEPDIR)/tex-texextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='texextra.c' object='tex-texextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -c -o tex-texextra.o `test -f 'texextra.c' || echo '$(srcdir)/'`texextra.c
+
+tex-texextra.obj: texextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -MT tex-texextra.obj -MD -MP -MF $(DEPDIR)/tex-texextra.Tpo -c -o tex-texextra.obj `if test -f 'texextra.c'; then $(CYGPATH_W) 'texextra.c'; else $(CYGPATH_W) '$(srcdir)/texextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tex-texextra.Tpo $(DEPDIR)/tex-texextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='texextra.c' object='tex-texextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -c -o tex-texextra.obj `if test -f 'texextra.c'; then $(CYGPATH_W) 'texextra.c'; else $(CYGPATH_W) '$(srcdir)/texextra.c'; fi`
+
tex-texini.o: texini.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -MT tex-texini.o -MD -MP -MF $(DEPDIR)/tex-texini.Tpo -c -o tex-texini.o `test -f 'texini.c' || echo '$(srcdir)/'`texini.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tex-texini.Tpo $(DEPDIR)/tex-texini.Po
@@ -7513,20 +7542,6 @@ tex-tex-pool.obj: tex-pool.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -c -o tex-tex-pool.obj `if test -f 'tex-pool.c'; then $(CYGPATH_W) 'tex-pool.c'; else $(CYGPATH_W) '$(srcdir)/tex-pool.c'; fi`
-tex-texextra.o: texextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -MT tex-texextra.o -MD -MP -MF $(DEPDIR)/tex-texextra.Tpo -c -o tex-texextra.o `test -f 'texextra.c' || echo '$(srcdir)/'`texextra.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tex-texextra.Tpo $(DEPDIR)/tex-texextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='texextra.c' object='tex-texextra.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -c -o tex-texextra.o `test -f 'texextra.c' || echo '$(srcdir)/'`texextra.c
-
-tex-texextra.obj: texextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -MT tex-texextra.obj -MD -MP -MF $(DEPDIR)/tex-texextra.Tpo -c -o tex-texextra.obj `if test -f 'texextra.c'; then $(CYGPATH_W) 'texextra.c'; else $(CYGPATH_W) '$(srcdir)/texextra.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tex-texextra.Tpo $(DEPDIR)/tex-texextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='texextra.c' object='tex-texextra.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -c -o tex-texextra.obj `if test -f 'texextra.c'; then $(CYGPATH_W) 'texextra.c'; else $(CYGPATH_W) '$(srcdir)/texextra.c'; fi`
-
tex-synctex.o: synctex.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(tex_CFLAGS) $(CFLAGS) -MT tex-synctex.o -MD -MP -MF $(DEPDIR)/tex-synctex.Tpo -c -o tex-synctex.o `test -f 'synctex.c' || echo '$(srcdir)/'`synctex.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/tex-synctex.Tpo $(DEPDIR)/tex-synctex.Po
@@ -7583,6 +7598,20 @@ ttf2afm-macnames.obj: pdftexdir/macnames.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(ttf2afm_CFLAGS) $(CFLAGS) -c -o ttf2afm-macnames.obj `if test -f 'pdftexdir/macnames.c'; then $(CYGPATH_W) 'pdftexdir/macnames.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/macnames.c'; fi`
+xetex-xetexextra.o: xetexdir/xetexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.o -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.o `test -f 'xetexdir/xetexextra.c' || echo '$(srcdir)/'`xetexdir/xetexextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xetex-xetexextra.Tpo $(DEPDIR)/xetex-xetexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xetexdir/xetexextra.c' object='xetex-xetexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetexextra.o `test -f 'xetexdir/xetexextra.c' || echo '$(srcdir)/'`xetexdir/xetexextra.c
+
+xetex-xetexextra.obj: xetexdir/xetexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.obj -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.obj `if test -f 'xetexdir/xetexextra.c'; then $(CYGPATH_W) 'xetexdir/xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/xetexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xetex-xetexextra.Tpo $(DEPDIR)/xetex-xetexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xetexdir/xetexextra.c' object='xetex-xetexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetexextra.obj `if test -f 'xetexdir/xetexextra.c'; then $(CYGPATH_W) 'xetexdir/xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/xetexextra.c'; fi`
+
xetex-xetexini.o: xetexini.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexini.o -MD -MP -MF $(DEPDIR)/xetex-xetexini.Tpo -c -o xetex-xetexini.o `test -f 'xetexini.c' || echo '$(srcdir)/'`xetexini.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xetex-xetexini.Tpo $(DEPDIR)/xetex-xetexini.Po
@@ -7625,20 +7654,6 @@ xetex-xetex_pool.obj: xetex_pool.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetex_pool.obj `if test -f 'xetex_pool.c'; then $(CYGPATH_W) 'xetex_pool.c'; else $(CYGPATH_W) '$(srcdir)/xetex_pool.c'; fi`
-xetex-xetexextra.o: xetexextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.o -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.o `test -f 'xetexextra.c' || echo '$(srcdir)/'`xetexextra.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xetex-xetexextra.Tpo $(DEPDIR)/xetex-xetexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xetexextra.c' object='xetex-xetexextra.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetexextra.o `test -f 'xetexextra.c' || echo '$(srcdir)/'`xetexextra.c
-
-xetex-xetexextra.obj: xetexextra.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.obj -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.obj `if test -f 'xetexextra.c'; then $(CYGPATH_W) 'xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexextra.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xetex-xetexextra.Tpo $(DEPDIR)/xetex-xetexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xetexextra.c' object='xetex-xetexextra.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetexextra.obj `if test -f 'xetexextra.c'; then $(CYGPATH_W) 'xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexextra.c'; fi`
-
xetex-synctex-xe.o: synctex-xe.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-synctex-xe.o -MD -MP -MF $(DEPDIR)/xetex-synctex-xe.Tpo -c -o xetex-synctex-xe.o `test -f 'synctex-xe.c' || echo '$(srcdir)/'`synctex-xe.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xetex-synctex-xe.Tpo $(DEPDIR)/xetex-synctex-xe.Po
@@ -8862,9 +8877,6 @@ tex-web2c: tex.p $(web2c_texmf)
tex-pool.c: tex.pool texd.h $(makecpool_stamp)
$(makecpool) tex >$@ || rm -f $@
-texextra.c: lib/texmfmp.c texd.h
- sed s/TEX-OR-MF-OR-MP/tex/ $(srcdir)/lib/texmfmp.c >$@
-
# Tangling TeX
tex.p tex.pool: tex-tangle
@$(texmf_tangle) tex tex-final
@@ -8882,6 +8894,9 @@ trip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log
rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex
rm -rf tfm
+
+# We must create mfd.h before compiling mfextra.c.
+$(mf_OBJECTS) $(mf_nowin_OBJECTS): mfd.h
$(windowlib): mfd.h $(srcdir)/window/*.c
cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a
@@ -8896,9 +8911,6 @@ mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
mf-pool.c: mf.pool mfd.h $(makecpool_stamp)
$(makecpool) mf >$@ || rm -f $@
-mfextra.c: lib/texmfmp.c mfd.h
- sed s/TEX-OR-MF-OR-MP/mf/ $(srcdir)/lib/texmfmp.c >$@
-
# Tangling Metafont
mf.p mf.pool: mf-tangle
@$(texmf_tangle) mf mf-final
@@ -8977,13 +8989,6 @@ etex-web2c: etex.p $(web2c_texmf)
etex-pool.c: etex.pool etexd.h $(makecpool_stamp)
$(makecpool) etex >$@ || rm -f $@
-etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h
- sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@
-
-etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
- sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \
- $(srcdir)/etexdir/etexextra.in >$@
-
# Tangling e-TeX
etex.p etex.pool: etex-tangle
@$(texmf_tangle) etex etex
@@ -8991,10 +8996,10 @@ etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
@$(texmf_tangle) etex etex
# Extract etex version
-etexdir/etex.version: etexdir/etex.ch
+etexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) etexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate etex.web
etex.web: tie$(EXEEXT) $(etex_web_srcs)
@@ -9030,13 +9035,6 @@ ptex-web2c: ptex.p $(web2c_texmf) ptexdir/ptex.defines
ptex-pool.c: ptex.pool ptexd.h $(makecpool_stamp)
$(makecpool) ptex >$@ || rm -f $@
-ptexextra.c: ptexdir/ptexextra.h lib/texmfmp.c ptexd.h
- sed s/TEX-OR-MF-OR-MP/ptex/ $(srcdir)/lib/texmfmp.c >$@
-
-ptexdir/ptexextra.h: ptexdir/ptexextra.in ptexdir/ptex.version
- sed s/PTEX-VERSION/`cat ptexdir/ptex.version`/ \
- $(srcdir)/ptexdir/ptexextra.in >$@
-
# Tangling pTeX
ptex.p ptex.pool: ptex-tangle
@$(texmf_tangle) ptex ptex
@@ -9044,10 +9042,10 @@ ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
@$(texmf_tangle) ptex ptex
# Extract ptex version
-ptexdir/ptex.version: ptexdir/ptex-base.ch
+ptexdir/ptex_version.h: ptexdir/ptex-base.ch
$(MKDIR_P) ptexdir
grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \
- | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version
+ | sed "s/^.*-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate ptex.web
ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
@@ -9096,15 +9094,11 @@ ptrip-clean:
rm -f ptrip.fot ptrip.log ptrip.dvi ptrip.typ
rm -f tripos.tex 8terminal.tex
rm -rf tfm
-
-# We must create libpdftex.a before building the pdftex_OBJECTS.
-$(pdftex_OBJECTS): libpdftex.a
+$(pdftex_OBJECTS): $(pdftex_prereq)
$(pdftex_c_h): pdftex-web2c
@$(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
@$(web2c) pdftex
-pdftexextra.c: pdftexd.h pdftexdir/pdftexextra.h lib/texmfmp.c pdftexd.h
- sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/lib/texmfmp.c >$@
pdftex.p pdftex.pool: pdftex-tangle
@$(pdf_tangle) pdftex pdftex
pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
@@ -9112,19 +9106,15 @@ pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
$(makecpool) pdftex >$@ || rm -f $@
# Extract etex version
-pdftexdir/etex.version: etexdir/etex.ch
+pdftexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) pdftexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
# Extract pdftex version
-pdftexdir/pdftex.version: pdftexdir/pdftex.web
+pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
$(MKDIR_P) pdftexdir
grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
- | sed "s/^.*'-//;s/'.*$$//" >pdftexdir/pdftex.version
-pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version pdftexdir/etex.version
- sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
- -e s/ETEX-VERSION/`cat pdftexdir/etex.version`/ \
- $(srcdir)/pdftexdir/pdftexextra.in >$@
+ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate pdftex.ch
pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
$(tie) -c pdftex.ch $(pdftex_ch_srcs)
@@ -9413,29 +9403,20 @@ xetex-web2c: xetex.p $(web2c_texmf) xetexdir/xetex.defines
xetex_pool.c: xetex.pool xetexd.h
perl $(srcdir)/xetexdir/pool2c.pl $< $@
-xetexextra.c: xetexdir/xetexextra.h lib/texmfmp.c xetexd.h
- sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/lib/texmfmp.c >$@
-
-xetexdir/xetexextra.h: xetexdir/xetexextra.in xetexdir/xetex.version xetexdir/etex.version
- $(MKDIR_P) xetexdir
- sed -e s/XETEX-VERSION/`cat xetexdir/xetex.version`/ \
- -e s/ETEX-VERSION/`cat xetexdir/etex.version`/ \
- $(srcdir)/xetexdir/xetexextra.in >$@
-
xetex.p xetex.pool: xetex-tangle
@$(o_tangle) xetex
xetex-tangle: ./otangle$(EXEEXT) xetex.web tangle-sh
@$(o_tangle) xetex
-xetexdir/etex.version: etexdir/etex.ch
+xetexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) xetexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
-xetexdir/xetex.version: xetexdir/xetex.ch
+xetexdir/xetex_version.h: xetexdir/xetex.ch
$(MKDIR_P) xetexdir
grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
xetex.web: tie$(EXEEXT) $(xetex_web_srcs)
$(tie) -m xetex.web $(xetex_web_srcs)
@@ -9492,8 +9473,6 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
@$(web2c) aleph
aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp)
$(makecpool) aleph >$@ || rm -f $@
-alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h
- sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@
# Tangling Aleph
aleph.p aleph.pool: aleph-tangle
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 3f7ce719757..5e6875f9485 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * alephextra.c (new): #include <alephd.h> and <lib/texmfmp.c>.
+
+ * am/aleph.am: alephextra.c is now distributed.
+
+2010-12-31 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/aleph.am (alephextra.c): Uniform dependencies and rules.
+
2010-05-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* aleph.c (new_input_line): Cast integer to long for printing
diff --git a/Build/source/texk/web2c/alephdir/alephextra.c b/Build/source/texk/web2c/alephdir/alephextra.c
new file mode 100644
index 00000000000..8b57266c05f
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/alephextra.c
@@ -0,0 +1,11 @@
+/* alephextra.c: Hand-coded routines for Aleph.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from alephd.h here. */
+
+/* This file defines TeX and Aleph. */
+#include <alephd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index 20006b68f13..4bb996a2592 100644
--- a/Build/source/texk/web2c/alephdir/am/aleph.am
+++ b/Build/source/texk/web2c/alephdir/am/aleph.am
@@ -1,6 +1,6 @@
## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph.
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## Aleph
@@ -18,10 +18,11 @@ aleph_CFLAGS = $(WARNING_CFLAGS)
# Aleph C sources
aleph_c_h = alephini.c aleph0.c alephcoerce.h alephd.h
-nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c alephextra.c
-aleph_SOURCES = \
+nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c
+dist_aleph_SOURCES = \
alephdir/aleph.c \
alephdir/alephbis.c \
+ alephdir/alephextra.c \
alephdir/alephextra.h \
alephdir/alephmem.h
@@ -34,8 +35,6 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
@$(web2c) aleph
aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp)
$(makecpool) aleph >$@ || rm -f $@
-alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h
- sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@
# Tangling Aleph
aleph.p aleph.pool: aleph-tangle
@@ -89,7 +88,7 @@ aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
$(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
##
-EXTRA_DIST += $(aleph_web_srcs) $(aleph_ch_srcs) lib/texmfmp.c
+EXTRA_DIST += $(aleph_web_srcs) $(aleph_ch_srcs)
DISTCLEANFILES += $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c \
aleph.p aleph.pool aleph-tangle
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index 7c16c38e6f8..1d2c32900d5 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -1,6 +1,6 @@
## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF.
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## Common for MF and TeX
@@ -27,7 +27,8 @@ tex_LDADD = $(LDADD) $(ipc_socketlibs)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
-nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c
+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
+dist_tex_SOURCES = texextra.c
# We must create texd.h before building the tex_OBJECTS.
tex_prereq = texd.h
@@ -41,9 +42,6 @@ tex-web2c: tex.p $(web2c_texmf)
tex-pool.c: tex.pool texd.h $(makecpool_stamp)
$(makecpool) tex >$@ || rm -f $@
-texextra.c: lib/texmfmp.c texd.h
- sed s/TEX-OR-MF-OR-MP/tex/ $(srcdir)/lib/texmfmp.c >$@
-
# Tangling TeX
tex.p tex.pool: tex-tangle
@$(texmf_tangle) tex tex-final
@@ -59,7 +57,7 @@ tex_ch_srcs = \
$(tex_ch_synctex) \
tex-binpool.ch
##
-EXTRA_DIST += $(tex_ch_srcs) lib/texmfmp.c
+EXTRA_DIST += $(tex_ch_srcs)
DISTCLEANFILES += $(nodist_tex_SOURCES) tex-final.ch tex-web2c \
tex.p tex.pool tex-tangle
@@ -96,15 +94,18 @@ endif MF
EXTRA_PROGRAMS += mf mf-nowin
DISTCLEANFILES += mftrap.diffs
-nodist_mf_SOURCES = mfextra.c
+dist_mf_SOURCES = mfextra.c
mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
mf_CFLAGS = $(WARNING_CFLAGS)
mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
-nodist_mf_nowin_SOURCES = mfextra.c
+dist_mf_nowin_SOURCES = mfextra.c
mf_nowin_CPPFLAGS = $(mf_CPPFLAGS) -DMFNOWIN
mf_nowin_CFLAGS = $(WARNING_CFLAGS)
mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib)
+# We must create mfd.h before compiling mfextra.c.
+$(mf_OBJECTS) $(mf_nowin_OBJECTS): mfd.h
+
windowlib = window/libwindow.a
$(windowlib): mfd.h $(srcdir)/window/*.c
cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a
@@ -142,9 +143,6 @@ mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
mf-pool.c: mf.pool mfd.h $(makecpool_stamp)
$(makecpool) mf >$@ || rm -f $@
-mfextra.c: lib/texmfmp.c mfd.h
- sed s/TEX-OR-MF-OR-MP/mf/ $(srcdir)/lib/texmfmp.c >$@
-
# Tangling Metafont
mf.p mf.pool: mf-tangle
@$(texmf_tangle) mf mf-final
@@ -159,9 +157,9 @@ mf_ch_src = \
mf.ch \
mf-binpool.ch
##
-EXTRA_DIST += $(mf_ch_src) mftalk.h lib/texmfmp.c
+EXTRA_DIST += $(mf_ch_src) mftalk.h
-DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mfextra.c mf-final.ch mf-web2c \
+DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c \
mf.p mf.pool mf-tangle
# Metafont tests
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 9f8d67b3668..27c8c8a2b4b 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * etexextra.in: Renamed ...
+ * etexextra.h: into this; #include etex_version.h
+ for ETEX_VERSION.
+
+ * etexextra.c (new): #include <etexd.h> and <lib/texmfmp.c>.
+
+ * am/etex.am: etexextra.[ch] are now distributed;
+ create etex_version.h instead of etex.version.
+
2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/etex.am (etex_CPPFLAGS): Add $(AM_CPPFLAGS).
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 61b2146efce..cc0ffa08f0c 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -1,6 +1,6 @@
## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## e-TeX
@@ -18,10 +18,11 @@ etex_LDADD = $(LDADD) $(ipc_socketlibs)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
-nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c etexdir/etexextra.h
+nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h
+dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h
-# We must create etexd.h before building the etex_OBJECTS.
-etex_prereq = etexd.h
+# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
+etex_prereq = etexd.h etexdir/etex_version.h
$(etex_OBJECTS): $(etex_prereq)
$(etex_c_h): etex-web2c
@@ -32,13 +33,6 @@ etex-web2c: etex.p $(web2c_texmf)
etex-pool.c: etex.pool etexd.h $(makecpool_stamp)
$(makecpool) etex >$@ || rm -f $@
-etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h
- sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@
-
-etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
- sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \
- $(srcdir)/etexdir/etexextra.in >$@
-
# Tangling e-TeX
etex.p etex.pool: etex-tangle
@$(texmf_tangle) etex etex
@@ -46,10 +40,10 @@ etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
@$(texmf_tangle) etex etex
# Extract etex version
-etexdir/etex.version: etexdir/etex.ch
+etexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) etexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate etex.web
etex.web: tie$(EXEEXT) $(etex_web_srcs)
@@ -70,11 +64,10 @@ etex_ch_srcs = \
etexdir/tex.ech \
tex-binpool.ch
##
-EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs) etexdir/etexextra.in \
- lib/texmfmp.c
+EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs)
DISTCLEANFILES += $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c \
- etex.p etex.pool etex-tangle etexdir/etex.version
+ etex.p etex.pool etex-tangle
EXTRA_DIST += \
etexdir/ChangeLog \
diff --git a/Build/source/texk/web2c/etexdir/etexextra.c b/Build/source/texk/web2c/etexdir/etexextra.c
new file mode 100644
index 00000000000..573f9da6a1a
--- /dev/null
+++ b/Build/source/texk/web2c/etexdir/etexextra.c
@@ -0,0 +1,11 @@
+/* etexextra.c: Hand-coded routines for e-TeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from etexd.h here. */
+
+/* This file defines TeX and eTeX. */
+#include <etexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/etexdir/etexextra.in b/Build/source/texk/web2c/etexdir/etexextra.h
index f64645f119d..4d8158e9ab9 100644
--- a/Build/source/texk/web2c/etexdir/etexextra.in
+++ b/Build/source/texk/web2c/etexdir/etexextra.h
@@ -1,7 +1,6 @@
-/* etexextra.in: banner etc. for e-TeX.
+/* etexextra.h: banner etc. for e-TeX.
- This is included by e-TeX, from ../etexextra.c
- (generated from ../lib/texmfmp.c).
+ This is included by e-TeX, from etexextra.c.
Copyright (C) 1995, 1996, 2009 Karl Berry.
Copyright (C) 2004 Olaf Weber.
@@ -20,7 +19,9 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#define BANNER "This is e-TeX, Version 3.1415926-ETEX-VERSION"
+#include <etexdir/etex_version.h> /* for ETEX_VERSION */
+
+#define BANNER "This is e-TeX, Version 3.1415926-" ETEX_VERSION
#define COPYRIGHT_HOLDER "Peter Breitenlohner"
#define AUTHOR NULL
#define PROGRAM_HELP ETEXHELP
diff --git a/Build/source/texk/web2c/lib/Makefile.am b/Build/source/texk/web2c/lib/Makefile.am
index 87a5ff67a60..2368f7b053f 100644
--- a/Build/source/texk/web2c/lib/Makefile.am
+++ b/Build/source/texk/web2c/lib/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/lib/
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
INCLUDES = -I$(top_srcdir)
@@ -16,7 +16,7 @@ noinst_LIBRARIES += libp.a
endif PTEX
EXTRA_LIBRARIES = libp.a
-## We don't compile `texmfmp.c'; this file is converted into 'texextra.c'
+## We don't compile `texmfmp.c'; this file is included from 'texextra.c'
## for TeX, 'mfextra.c' for Metafont, ...
lib_a_SOURCES = \
basechsuffix.c \
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index b095cbff660..8abd37b289f 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -1,17 +1,16 @@
-/* texmf.c: Hand-coded routines for TeX or Metafont in C. Originally
+/* texmfmp.c: Hand-coded routines for TeX or Metafont in C. Originally
written by Tim Morgan, drawing from other Unix ports of TeX. This is
a collection of miscellany, everything that's easier (or only
possible) to do in C.
This file is public domain. */
-#define EXTERN /* Instantiate data from {tex,mf,mp}d.h here. */
-
-/* This file is used to create texextra.c etc., with this line
- changed to include texd.h or mfd.h. The ?d.h file is what
+/* This file is included from, e.g., texextra,c after
+ #define EXTERN
+ #include <texd.h>
+ to instantiate data from texd.h here. The ?d.h file is what
#defines TeX or MF, which avoids the need for a special
Makefile rule. */
-#include "TEX-OR-MF-OR-MPd.h"
#include <kpathsea/c-ctype.h>
#include <kpathsea/line.h>
@@ -789,7 +788,7 @@ main (int ac, string *av)
return EXIT_SUCCESS;
}
-#endif /* !(WIN32 || __MINGW32__) */
+#endif /* !WIN32 || __MINGW32__ */
/* This is supposed to ``open the terminal for input'', but what we
diff --git a/Build/source/texk/web2c/mfextra.c b/Build/source/texk/web2c/mfextra.c
new file mode 100644
index 00000000000..3682d901430
--- /dev/null
+++ b/Build/source/texk/web2c/mfextra.c
@@ -0,0 +1,11 @@
+/* mfextra.c: Hand-coded routines for Metafont.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from mfd.h here. */
+
+/* This file defines MF. */
+#include <mfd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index 798393b2cad..76c6321ffb4 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * omfonts.c: Check for argv[0] with .exe via strcasecmp().
+
2010-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* char_routines.c (ensure_existence): Avoid OpenBSD Bus error
diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c
index 5a6ec0a6c4e..971b640ccbe 100644
--- a/Build/source/texk/web2c/omegafonts/omfonts.c
+++ b/Build/source/texk/web2c/omegafonts/omfonts.c
@@ -123,21 +123,17 @@ main (int argc, string *argv)
int option_index = 0;
name_program = xbasename(argv[0]);
- if (!strcmp(name_program, "ofm2opl") ||
- !strcmp(name_program, "OFM2OPL.EXE")) {
+#define PROG_IS(s) !strcmp(name_program, s) || !strcasecmp(name_program, s ".exe")
+ if (PROG_IS("ofm2opl"))
program = PROG_OFM2OPL;
- } else if (!strcmp(name_program, "opl2ofm") ||
- !strcmp(name_program, "OPL2OFM.EXE")) {
+ else if (PROG_IS("opl2ofm"))
program = PROG_OPL2OFM;
- } else if (!strcmp(name_program, "ovf2ovp") ||
- !strcmp(name_program, "OVF2OVP.EXE")) {
+ else if (PROG_IS("ovf2ovp"))
program = PROG_OVF2OVP;
- } else if (!strcmp(name_program, "ovp2ovf") ||
- !strcmp(name_program, "OVP2OVF.EXE")) {
+ else if (PROG_IS("ovp2ovf"))
program = PROG_OVP2OVF;
- } else {
+ else
program = PROG_OMFONTS;
- }
do {
getopt_return_val =
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 157c274834a..78314204d15 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftexextra.in: Renamed ...
+ * pdftexextra.h: into this; #include {e,pdf}tex_version.h
+ for {E,PDF}TEX_VERSION.
+
+ * pdftexextra.c (new): #include <pdftexd.h> and <lib/texmfmp.c>.
+
+ * am/pdftex.am: pdftexextra.[ch] are now distributed;
+ create {e,pdf}tex_version.h instead of {e,pdf}tex.version.
+
2010-12-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* writet1.c: Drop unreachable code (after pdftex_fail).
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index c7a46dcece1..bc9ec07ab19 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -1,6 +1,6 @@
## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
@@ -36,17 +36,18 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
-# We must create libpdftex.a before building the pdftex_OBJECTS.
-$(pdftex_OBJECTS): libpdftex.a
+# We must create libpdftex.a etc before building the pdftex_OBJECTS.
+pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h
+$(pdftex_OBJECTS): $(pdftex_prereq)
pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
-nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c pdftexdir/pdftexextra.h
+nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
+ pdftexdir/etex_version.h pdftexdir/pdftex_version.h
+dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h
$(pdftex_c_h): pdftex-web2c
@$(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
@$(web2c) pdftex
-pdftexextra.c: pdftexd.h pdftexdir/pdftexextra.h lib/texmfmp.c pdftexd.h
- sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/lib/texmfmp.c >$@
pdftex.p pdftex.pool: pdftex-tangle
@$(pdf_tangle) pdftex pdftex
pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
@@ -54,19 +55,15 @@ pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
$(makecpool) pdftex >$@ || rm -f $@
# Extract etex version
-pdftexdir/etex.version: etexdir/etex.ch
+pdftexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) pdftexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
# Extract pdftex version
-pdftexdir/pdftex.version: pdftexdir/pdftex.web
+pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
$(MKDIR_P) pdftexdir
grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
- | sed "s/^.*'-//;s/'.*$$//" >pdftexdir/pdftex.version
-pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version pdftexdir/etex.version
- sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
- -e s/ETEX-VERSION/`cat pdftexdir/etex.version`/ \
- $(srcdir)/pdftexdir/pdftexextra.in >$@
+ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate pdftex.ch
pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
$(tie) -c pdftex.ch $(pdftex_ch_srcs)
@@ -78,10 +75,10 @@ pdftex_ch_srcs = \
pdftexdir/pdftex.ch
##
EXTRA_DIST += $(pdftex_ch_srcs) etexdir/etex.ch \
- pdftexdir/pdftex.defines pdftexdir/pdftex.h pdftexdir/pdftexextra.in
+ pdftexdir/pdftex.defines pdftexdir/pdftex.h
DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
- pdftex.p pdftex.pool pdftex-tangle pdftexdir/pdftex.version pdftexdir/etex.version
+ pdftex.p pdftex.pool pdftex-tangle
EXTRA_DIST += \
pdftexdir/ChangeLog \
diff --git a/Build/source/texk/web2c/pdftexdir/pdftexextra.c b/Build/source/texk/web2c/pdftexdir/pdftexextra.c
new file mode 100644
index 00000000000..3bad442a03d
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/pdftexextra.c
@@ -0,0 +1,11 @@
+/* pdftexextra.c: Hand-coded routines for pdfTeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from pdftexd.h here. */
+
+/* This file defines TeX and pdfTeX. */
+#include <pdftexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/pdftexdir/pdftexextra.in b/Build/source/texk/web2c/pdftexdir/pdftexextra.h
index 09d8514d224..4ab411fd298 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftexextra.in
+++ b/Build/source/texk/web2c/pdftexdir/pdftexextra.h
@@ -19,13 +19,15 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* pdftexextra.in: banner etc. for pdfTeX.
+/* pdftexextra.h: banner etc. for pdfTeX.
- This is included by pdfTeX, from ../pdftexextra.c
- (generated from ../lib/texmfmp.c).
+ This is included by pdfTeX, from pdftexextra.c.
*/
-#define BANNER "This is pdfTeX, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
+#include <pdftexdir/pdftex_version.h> /* for PDFTEX_VERSION */
+#include <pdftexdir/etex_version.h> /* for ETEX_VERSION */
+
+#define BANNER "This is pdfTeX, Version 3.1415926-" PDFTEX_VERSION "-" ETEX_VERSION
#define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
#define AUTHOR NULL
#define PROGRAM_HELP PDFTEXHELP
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 17226a1871a..a8e05bdaeb0 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ptexextra.in: Renamed ...
+ * ptexextra.h: into this; #include ptex_version.h
+ for PTEX_VERSION.
+
+ * ptexextra.c (new): #include <ptexd.h> and <lib/texmfmp.c>.
+
+ * am/ptex.am: ptexextra.[ch] are now distributed;
+ create ptex_version.h instead of ptex.version.
+
2010-12-31 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* ptex-base.ch: Bug fix and accent Kanji.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 320a1732ce0..27cca27d355 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -1,6 +1,6 @@
## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX.
##
-## Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
@@ -49,11 +49,12 @@ ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs)
# pTeX C sources
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
-nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexextra.c ptexdir/ptexextra.h
-ptex_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
+nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h
+dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
+ ptexdir/kanji.c ptexdir/kanji.h
-# We must create ptexd.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h
+# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
+ptex_prereq = ptexd.h ptexdir/ptex_version.h
$(ptex_OBJECTS): $(ptex_prereq)
$(ptex_c_h): ptex-web2c
@@ -64,13 +65,6 @@ ptex-web2c: ptex.p $(web2c_texmf) ptexdir/ptex.defines
ptex-pool.c: ptex.pool ptexd.h $(makecpool_stamp)
$(makecpool) ptex >$@ || rm -f $@
-ptexextra.c: ptexdir/ptexextra.h lib/texmfmp.c ptexd.h
- sed s/TEX-OR-MF-OR-MP/ptex/ $(srcdir)/lib/texmfmp.c >$@
-
-ptexdir/ptexextra.h: ptexdir/ptexextra.in ptexdir/ptex.version
- sed s/PTEX-VERSION/`cat ptexdir/ptex.version`/ \
- $(srcdir)/ptexdir/ptexextra.in >$@
-
# Tangling pTeX
ptex.p ptex.pool: ptex-tangle
@$(texmf_tangle) ptex ptex
@@ -78,10 +72,10 @@ ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
@$(texmf_tangle) ptex ptex
# Extract ptex version
-ptexdir/ptex.version: ptexdir/ptex-base.ch
+ptexdir/ptex_version.h: ptexdir/ptex-base.ch
$(MKDIR_P) ptexdir
grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \
- | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version
+ | sed "s/^.*-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate ptex.web
ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
@@ -97,11 +91,10 @@ ptex_ch_srcs = \
ptexdir/ptex-base.ch \
tex-binpool.ch
-EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptexextra.in \
- ptexdir/ptex.defines lib/texmfmp.c
+EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines
DISTCLEANFILES += $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c \
- ptex.p ptex.pool ptex-tangle ptexdir/ptex.version
+ ptex.p ptex.pool ptex-tangle
## pBibTeX
##
diff --git a/Build/source/texk/web2c/ptexdir/ptexextra.c b/Build/source/texk/web2c/ptexdir/ptexextra.c
new file mode 100644
index 00000000000..cf90e8f22d9
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/ptexextra.c
@@ -0,0 +1,11 @@
+/* ptexextra.c: Hand-coded routines for pTeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from ptexd.h here. */
+
+/* This file defines TeX and pTeX. */
+#include <ptexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/ptexdir/ptexextra.in b/Build/source/texk/web2c/ptexdir/ptexextra.h
index 9e1f5a36d0d..b39c1b0c852 100644
--- a/Build/source/texk/web2c/ptexdir/ptexextra.in
+++ b/Build/source/texk/web2c/ptexdir/ptexextra.h
@@ -1,9 +1,11 @@
-/* ptexextra.in: banner etc. for pTeX.
+/* ptexextra.h: banner etc. for pTeX.
This is included by pTeX, from ptexextra.c
*/
-#define BANNER "This is pTeX, Version 3.1415926-PTEX-VERSION"
+#include <ptexdir/ptex_version.h> /* for PTEX_VERSION */
+
+#define BANNER "This is pTeX, Version 3.1415926-" PTEX_VERSION
#define COPYRIGHT_HOLDER "D.E. Knuth"
#define AUTHOR NULL
#define PROGRAM_HELP PTEXHELP
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index 0b1c06f9dfd..136ee1c4fd6 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -1,6 +1,6 @@
## texk/web2c/synctexdir/am/synctex.am: Makefile fragment for SyncTeX.
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## The SyncTeX tool
@@ -56,7 +56,7 @@ tex_ch_synctex = \
synctexdir/synctex-rec.ch1 \
synctexdir/synctex-rec.ch2
-dist_tex_SOURCES = \
+dist_tex_SOURCES += \
synctexdir/synctex.h \
synctexdir/synctex-common.h \
synctexdir/synctex-tex.h
@@ -98,7 +98,7 @@ etex_ch_synctex = \
synctexdir/synctex-e-rec.ch0 \
synctexdir/synctex-e-rec.ch1
-dist_etex_SOURCES = \
+dist_etex_SOURCES += \
synctexdir/synctex.h \
synctexdir/synctex-common.h \
synctexdir/synctex-etex.h
@@ -136,7 +136,7 @@ pdftex_ch_synctex = \
synctexdir/synctex-e-rec.ch1 \
synctexdir/synctex-pdf-rec.ch2
-dist_pdftex_SOURCES = \
+dist_pdftex_SOURCES += \
synctexdir/synctex.h \
synctexdir/synctex-common.h \
synctexdir/synctex-pdftex.h
@@ -172,7 +172,7 @@ xetex_ch_synctex = \
xetex_post_ch_synctex = \
synctexdir/synctex-xe-rec.ch3
-dist_xetex_SOURCES = \
+dist_xetex_SOURCES += \
synctexdir/synctex.h \
synctexdir/synctex-common.h \
synctexdir/synctex-xetex.h
diff --git a/Build/source/texk/web2c/texextra.c b/Build/source/texk/web2c/texextra.c
new file mode 100644
index 00000000000..45d02951f60
--- /dev/null
+++ b/Build/source/texk/web2c/texextra.c
@@ -0,0 +1,11 @@
+/* texextra.c: Hand-coded routines for TeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from texd.h here. */
+
+/* This file defines TeX. */
+#include <texd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 171cd0a22e9..7aa765ad4c1 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * xetexextra.in: Renamed ...
+ * xetexextra.h: into this; #include {e,xe}tex_version.h
+ for {E,XE}TEX_VERSION.
+
+ * xetexextra.c (new): #include <xetexd.h> and <lib/texmfmp.c>.
+
+ * am/xetex.am: xetexextra.[ch] are now distributed;
+ create {e,xe}tex_version.h instead of {e,xe}tex.version.
+
2010-09-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* xetex.test (new): Just testing 'xetex -version'.
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 01f4efccdf0..09ecaf10e30 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -1,6 +1,6 @@
## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## XeTeX
@@ -62,12 +62,15 @@ xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
## With --enable-ipc, XeTeX may need to link with -lsocket.
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
-xetex_prereq = $(libxetex)
+# We must create libxetex.a etc before building the xetex_OBJECTS
+xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
$(xetex_OBJECTS): $(xetex_prereq)
## XeTeX C sources
xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
-nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c xetexdir/xetexextra.h
+nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
+ xetexdir/etex_version.h xetexdir/xetex_version.h
+dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h
$(xetex_c_h): xetex-web2c
@$(web2c) xetex
@@ -77,15 +80,6 @@ xetex-web2c: xetex.p $(web2c_texmf) xetexdir/xetex.defines
xetex_pool.c: xetex.pool xetexd.h
perl $(srcdir)/xetexdir/pool2c.pl $< $@
-xetexextra.c: xetexdir/xetexextra.h lib/texmfmp.c xetexd.h
- sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/lib/texmfmp.c >$@
-
-xetexdir/xetexextra.h: xetexdir/xetexextra.in xetexdir/xetex.version xetexdir/etex.version
- $(MKDIR_P) xetexdir
- sed -e s/XETEX-VERSION/`cat xetexdir/xetex.version`/ \
- -e s/ETEX-VERSION/`cat xetexdir/etex.version`/ \
- $(srcdir)/xetexdir/xetexextra.in >$@
-
## Tangling XeTeX
xetex.p xetex.pool: xetex-tangle
@$(o_tangle) xetex
@@ -93,16 +87,16 @@ xetex-tangle: ./otangle$(EXEEXT) xetex.web tangle-sh
@$(o_tangle) xetex
## Extract etex version
-xetexdir/etex.version: etexdir/etex.ch
+xetexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) xetexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
## Extract xetex version
-xetexdir/xetex.version: xetexdir/xetex.ch
+xetexdir/xetex_version.h: xetexdir/xetex.ch
$(MKDIR_P) xetexdir
grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
## Generate xetex.web
xetex.web: tie$(EXEEXT) $(xetex_web_srcs)
@@ -121,10 +115,10 @@ xetex_web_srcs = \
xetexdir/xetex-hz.ch \
$(xetex_post_ch_synctex)
##
-EXTRA_DIST += $(xetex_web_srcs) xetexdir/xetex.defines xetexdir/xetexextra.in
+EXTRA_DIST += $(xetex_web_srcs) xetexdir/xetex.defines
DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex-web2c \
- xetex.p xetex.pool xetex-tangle xetexdir/etex.version xetexdir/xetex.version
+ xetex.p xetex.pool xetex-tangle
EXTRA_DIST += \
xetexdir/pool2c.pl \
@@ -247,7 +241,3 @@ endif XETEX
##
EXTRA_DIST += xetexdir/LICENSE.txt
-## Eventually delete these files
-##
-EXTRA_DIST += xetexdir/xetex.mk
-
diff --git a/Build/source/texk/web2c/xetexdir/xetex.mk b/Build/source/texk/web2c/xetexdir/xetex.mk
deleted file mode 100644
index 9c3a180c091..00000000000
--- a/Build/source/texk/web2c/xetexdir/xetex.mk
+++ /dev/null
@@ -1,335 +0,0 @@
-# Makefile fragment for XeTeX and web2c. -- Jonathan Kew -- Public domain.
-# This fragment contains the parts of the makefile that are most likely to
-# differ between releases of XeTeX.
-
-Makefile: $(srcdir)/xetexdir/xetex.mk
-
-# this should probably move to common.mk some day,
-# but need to check possible effect on other programs
-ALL_CXXFLAGS = @CXXFLAGS@
-
-# We build xetex unless configure decides to skip it
-xetex = @XETEX@ xetex
-
-### Platform-specific defines and files to be built
-
-# On Mac OS X:
-@XETEX_MACOSX@ xetex_platform_o = XeTeX_mac.o XeTeXFontMgr_Mac.o
-@XETEX_MACOSX@ xetex_platform_layout_o = XeTeXFontInst_Mac.o XeTeXFontInst_FT2.o
-@XETEX_MACOSX@ xetex_platform_layout_cxx = XeTeXFontInst_Mac.cpp XeTeXFontInst_FT2.cpp
-@XETEX_MACOSX@ xetex_images_o =
-
-@XETEX_MACOSX@ XETEX_DEFINES = -DXETEX_MAC
-
-@XETEX_MACOSX@ EXTRALIBS = -framework Carbon -framework Cocoa -framework QuickTime
-
-@XETEX_MACOSX@ EXTRADEPS =
-
-# On non-Mac platforms:
-@XETEX_GENERIC@ xetex_platform_o = XeTeXFontMgr_FC.o
-@XETEX_GENERIC@ xetex_platform_layout_o = XeTeXFontInst_FT2.o
-@XETEX_GENERIC@ xetex_platform_layout_cxx = XeTeXFontInst_FT2.cpp
-@XETEX_GENERIC@ xetex_images_o = mfileio.o numbers.o pdfimage.o bmpimage.o jpegimage.o pngimage.o XeTeX_pic.o
-
-@XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER
-
-@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@
-
-@XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
-
-### is Graphite support included?
-
-@XETEX_GRAPHITE@ xetex_graphite_layout_o = XeTeXGrLayout.o
-@XETEX_GRAPHITE@ XETEX_GRAPHITE = -DXETEX_GRAPHITE
-
-@XETEX_GRAPHITE@ GRAPHITEDIR = ../../libs/graphite-engine
-@XETEX_GRAPHITE@ GRAPHITESRCDIR = $(srcdir)/$(GRAPHITEDIR)
-
-@XETEX_GRAPHITE@ GRAPHITEFLAGS = @GRAPHITECPPFLAGS@
-@XETEX_GRAPHITE@ LDGRAPHITE = @LDGRAPHITE@
-@XETEX_GRAPHITE@ GRAPHITEDEP = @GRAPHITEDEP@
-
-### end of platform-specific setup
-
-LDLIBXPDF=@LDLIBXPDF@
-LIBXPDFCPPFLAGS=@LIBXPDFCPPFLAGS@
-LIBXPDFDEP=@LIBXPDFDEP@
-
-LIBXPDFDIR=../../libs/xpdf
-LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
-
-LDLIBPNG=@LDLIBPNG@
-LIBPNGCPPFLAGS=@LIBPNGCPPFLAGS@
-LIBPNGDEP=@LIBPNGDEP@
-
-LIBPNGDIR=../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-
-LDFREETYPE2 = @LDFREETYPE2@
-FTFLAGS = @FREETYPE2CPPFLAGS@
-FREETYPE2DEP = @FREETYPE2DEP@
-
-FREETYPE2DIR = ../../libs/freetype2
-FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR)
-
-TECKITFLAGS = @TECKITCPPFLAGS@
-LDTECKIT = @LDTECKIT@
-TECKITDEP = @TECKITDEP@
-
-TECKITDIR=../../libs/teckit
-TECKITSRCDIR=$(srcdir)/$(TECKITDIR)
-
-ICUFLAGS = @ICUCPPFLAGS@
-LDICU = @LDICU@
-ICUDEP = @ICUDEP@
-
-ICUDIR=../../libs/icu-xetex
-ICUSRCDIR=$(srcdir)/$(ICUDIR)
-
-ICUCFLAGS = @ICUCPPFLAGS@ -DLE_USE_CMEMORY
-
-ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
-LDZLIB = @LDZLIB@
-
-ZLIBDIR = ../../libs/zlib
-ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR)
-
-FONTCONFIGCPPFLAGS = @FONTCONFIGCPPFLAGS@
-FONTCONFIGLDFLAGS = @FONTCONFIGLDFLAGS@
-
-xetexlibs = $(LDICU) $(LDTECKIT) $(LDFREETYPE2) $(LDGRAPHITE) $(LDZLIB)
-
-# Font-related headers
-XeTeXFontHdrs = \
- $(srcdir)/xetexdir/FontTableCache.h \
- $(srcdir)/xetexdir/XeTeXFontInst.h \
- $(srcdir)/xetexdir/XeTeXFontInst_FT2.h \
- $(srcdir)/xetexdir/XeTeXFontInst_Mac.h \
- $(srcdir)/xetexdir/XeTeXFontMgr.h \
- $(srcdir)/xetexdir/XeTeXFontMgr_FC.h \
- $(srcdir)/xetexdir/XeTeXFontMgr_Mac.h \
- $(srcdir)/xetexdir/XeTeXLayoutInterface.h \
- $(srcdir)/xetexdir/XeTeXOTLayoutEngine.h
-
-# Image-related headers
-XeTeXImageHdrs = \
- $(srcdir)/xetexdir/bmpimage.h \
- $(srcdir)/xetexdir/jpegimage.h \
- $(srcdir)/xetexdir/pdfimage.h \
- $(srcdir)/xetexdir/pngimage.h
-
-# Extract xetex version
-xetexdir/xetex.version: $(srcdir)/xetexdir/xetex.ch
- test -d xetexdir || mkdir xetexdir
- grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >xetexdir/xetex.version
-
-# Extract etex version
-xetexdir/etex.version: $(srcdir)/etexdir/etex.ch
- test -d xetexdir || mkdir xetexdir
- grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >xetexdir/etex.version
-
-# The C sources.
-xetex_c = xetexini.c xetex0.c xetex1.c xetex2.c
-xetex_o = xetexini.o xetex0.o xetex1.o xetex2.o xetexextra.o
-xetex_add_o = trans.o XeTeX_ext.o xetex_pool.o $(xetex_platform_o) $(xetex_o-with_synctex)
-
-# these compilations require the path to TECkit headers;
-# just setting it in XCFLAGS doesn't seem to work when we're called
-# recursively from "make world" etc
-xetexini.o: xetexini.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetex0.o: xetex0.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetex1.o: xetex1.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetex2.o: xetex2.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetexextra.o: xetexextra.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetex_pool.o: xetex_pool.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# image support
-mfileio.o: $(srcdir)/xetexdir/mfileio.c $(srcdir)/xetexdir/mfileio.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
-
-numbers.o: $(srcdir)/xetexdir/numbers.c $(srcdir)/xetexdir/numbers.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
-
-bmpimage.o: $(srcdir)/xetexdir/bmpimage.c $(srcdir)/xetexdir/bmpimage.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
-
-jpegimage.o: $(srcdir)/xetexdir/jpegimage.c $(srcdir)/xetexdir/jpegimage.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
-
-pngimage.o: $(srcdir)/xetexdir/pngimage.c $(srcdir)/xetexdir/pngimage.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@
-
-pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h
- $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@
-
-XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# Layout library
-xetex_ot_layout_o = \
- XeTeXFontMgr.o \
- XeTeXLayoutInterface.o XeTeXOTLayoutEngine.o \
- XeTeXFontInst.o cmaps.o FontTableCache.o \
- XeTeXOTMath.o \
- $(xetex_graphite_layout_o) \
- $(xetex_platform_layout_o)
-
-XeTeXLayoutInterface.o: $(srcdir)/xetexdir/XeTeXLayoutInterface.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(GRAPHITEFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -c $< -o $@
-XeTeXOTLayoutEngine.o: $(srcdir)/xetexdir/XeTeXOTLayoutEngine.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXFontMgr.o: $(srcdir)/xetexdir/XeTeXFontMgr.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-XeTeXFontMgr_FC.o: $(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXFontMgr_Mac.o: $(srcdir)/xetexdir/XeTeXFontMgr_Mac.mm $(XeTeXFontHdrs)
- $(CXX) -ObjC++ $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-cmaps.o: $(srcdir)/xetexdir/cmaps.cpp
- $(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-FontTableCache.o: $(srcdir)/xetexdir/FontTableCache.cpp
- $(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXFontInst.o: $(srcdir)/xetexdir/XeTeXFontInst.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-XeTeXFontInst_Mac.o: $(srcdir)/xetexdir/XeTeXFontInst_Mac.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-XeTeXFontInst_FT2.o: $(srcdir)/xetexdir/XeTeXFontInst_FT2.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXOTMath.o: $(srcdir)/xetexdir/XeTeXOTMath.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXGrLayout.o: $(srcdir)/xetexdir/XeTeXGrLayout.cpp $(srcdir)/xetexdir/XeTeXGrLayout.h \
- $(XeTeXFontHdrs) $(GRAPHITESRCDIR)/include/graphite/Font.h
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(GRAPHITEFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# special rules for files that need the TECkit headers as well
-XeTeX_ext.o: $(srcdir)/xetexdir/XeTeX_ext.c xetexd.h
- $(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -c $< -o $@
-XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h
- $(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-trans.o: $(srcdir)/xetexdir/trans.c
- $(compile) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# sync
-synctex-xe.o: synctex-xe.c
- $(compile) $(ALL_CFLAGS) $(TECKITFLAGS) $(FTFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# Making xetex.
-xetex: $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) \
- $(GRAPHITEDEP) $(TECKITDEP) $(FREETYPE2DEP) $(ICUDEP) $(EXTRADEPS)
- @CXXHACKLINK@ $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) \
- $(FONTCONFIGLDFLAGS) $(socketlibs) $(xetexlibs) $(EXTRALIBS) \
- @CXXHACKLDLIBS@ @CXXLDEXTRA@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-
-# C file dependencies
-$(xetex_c) xetexcoerce.h xetexd.h: xetex.p $(web2c_texmf)
- $(web2c) xetex
- $(xetexd.h-with_synctex)
-
-xetexextra.c: xetexd.h lib/texmfmp.c xetexdir/xetexextra.h
- sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/lib/texmfmp.c >$@
-xetexdir/xetexextra.h: xetexdir/xetexextra.in xetexdir/xetex.version xetexdir/etex.version
- test -d xetexdir || mkdir xetexdir
- sed -e s/XETEX-VERSION/`cat xetexdir/xetex.version`/ \
- -e s/ETEX-VERSION/`cat xetexdir/etex.version`/ \
- $(srcdir)/xetexdir/xetexextra.in >$@
-
-xetex_pool.c: xetex.pool
- perl $(srcdir)/xetexdir/pool2c.pl $< $@
-
-# Tangling
-xetex.p xetex.pool: ./otangle xetex.web
- ./otangle xetex.web
-
-# Generation of the web file.
-# Sources for xetex.web:
-xetex_web_srcs = $(srcdir)/tex.web \
- $(srcdir)/etexdir/etex.ch \
- $(srcdir)/etexdir/tex.ch0 \
- $(srcdir)/tex.ch \
- $(srcdir)/etexdir/tex.ch1 \
- $(srcdir)/etexdir/tex.ech \
- $(xetex_ch_srcs-with_synctex) \
- $(srcdir)/xetexdir/xetex.ch \
- $(srcdir)/xetexdir/xetex-latex3.ch \
- $(xetex_post_ch_srcs-with_synctex)
-xetex.web: tie xetexdir/xetex.mk $(xetex_web_srcs)
- $(TIE) -m xetex.web $(xetex_web_srcs)
-
-################## FIXME: the rest of this isn't properly updated for xetex yet...
-################## e.g., we don't have real xetex tests to run!
-
-# Tests...
-#check: @XETEX@ xetex-check
-#xetex-check: etrip xetex.fmt
-# Test truncation (but don't bother showing the warning msg).
-# ./xetex --progname=xetex --output-comment="`cat $(srcdir)/PROJECTS`" \
-# $(srcdir)/tests/hello 2>/dev/null \
-# && ./dvitype hello.dvi | grep olaf@infovore.xs4all.nl >/dev/null
-# \openout should show up in \write's.
-# ./xetex --progname=xetex $(srcdir)/tests/openout && grep xfoo openout.log
-# one.two.tex -> one.two.log
-# ./xetex --progname=xetex $(srcdir)/tests/one.two && ls -l one.two.log
-# uno.dos -> uno.log
-# ./xetex --progname=xetex $(srcdir)/tests/uno.dos && ls -l uno.log
-# ./xetex --progname=xetex $(srcdir)/tests/just.texi && ls -l just.log
-# -./xetex --progname=xetex $(srcdir)/tests/batch.tex
-# ./xetex --progname=xetex --shell $(srcdir)/tests/write18 | grep echo
-# ./xetex --mltex --progname=xeinitex $(srcdir)/tests/mltextst
-# -./xetex --progname=xetex </dev/null
-# -PATH=`pwd`:$(kpathsea_dir):$(kpathsea_srcdir):$$PATH \
-# WEB2C=$(kpathsea_srcdir) TMPDIR=.. \
-# ./xetex --progname=xetex '\nonstopmode\font\foo=nonesuch\end'
-
-# Cleaning up.
-clean:: xetex-clean
-xetex-clean: # etrip-clean
- $(LIBTOOL) --mode=clean $(RM) xetex
- rm -f $(xetex_o) $(xetex_c) xetexextra.c xetex_pool.c xetexcoerce.h xetexd.h
- rm -f xetexdir/xetexextra.h xetexdir/xetex.version
- rm -f xetex.p xetex.pool xetex.web
- rm -f xetex.fmt xetex.log
- rm -f hello.dvi hello.log xfoo.out openout.log one.two.log uno.log
- rm -f just.log batch.log write18.log mltextst.log texput.log
- rm -f missfont.log
- rm -rf tfm
-
-# Dumps
-all_xefmts = xetex.fmt $(xefmts)
-
-dumps: @XETEX@ xefmts
-xefmts: $(all_xefmts)
-
-xefmtdir = $(web2cdir)/xetex
-$(xefmtdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(xefmtdir)
-
-xetex.fmt: xetex
- $(dumpenv) $(MAKE) progname=xetex files="xetex.ini unicode-letters.tex plain.tex cmr10.tfm" prereq-check
- $(dumpenv) ./xetex --progname=xetex --jobname=xetex --ini \*\\input xetex.ini \\dump </dev/null
-
-xelatex.fmt: xetex
- $(dumpenv) $(MAKE) progname=xelatex files="xelatex.ini unicode-letters.tex latex.ltx" prereq-check
- $(dumpenv) ./xetex --progname=xelatex --jobname=xelatex --ini \*\\input xelatex.ini </dev/null
-
-#
-# Installation.
-install-xetex: install-xetex-exec
-install-programs: @XETEX@ install-xetex-programs
-install-xetex-programs: xetex $(bindir)
- for p in xetex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
-# end of xetex.mk
diff --git a/Build/source/texk/web2c/xetexdir/xetexextra.c b/Build/source/texk/web2c/xetexdir/xetexextra.c
new file mode 100644
index 00000000000..401c90ed865
--- /dev/null
+++ b/Build/source/texk/web2c/xetexdir/xetexextra.c
@@ -0,0 +1,11 @@
+/* xetexextra.c: Hand-coded routines for XeTeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from xetexd.h here. */
+
+/* This file defines TeX and XeTeX. */
+#include <xetexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/xetexdir/xetexextra.in b/Build/source/texk/web2c/xetexdir/xetexextra.h
index 1a3ef9a7c8c..6adccef578e 100644
--- a/Build/source/texk/web2c/xetexdir/xetexextra.in
+++ b/Build/source/texk/web2c/xetexdir/xetexextra.h
@@ -1,8 +1,7 @@
/****************************************************************************\
- xetexextra.in: banner etc. for XeTeX.
+ xetexextra.h: banner etc. for XeTeX.
- This is included by XeTeX, from ../xetexextra.c
- (generated from ../lib/texmfmp.c).
+ This is included by XeTeX, from xetexextra.c.
Part of the XeTeX typesetting system
copyright (c) 1994-2008 by SIL International
@@ -54,7 +53,10 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#define BANNER "This is XeTeX, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
+#include <xetexdir/etex_version.h> /* for ETEX_VERSION */
+#include <xetexdir/xetex_version.h> /* for XETEX_VERSION */
+
+#define BANNER "This is XeTeX, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION
#define COPYRIGHT_HOLDER "SIL International and Jonathan Kew"
#define AUTHOR "Jonathan Kew"
#define PROGRAM_HELP XETEXHELP