From aa328aa555e4b4370722cdb0476f785aeb6ea0f2 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Fri, 17 Jul 2020 13:13:57 +0000 Subject: Avoid changefile ambiguity for pdfTeX and XeTeX. Similar to TeX and Metafont, the 'final' composed changefile will be named such. git-svn-id: svn://tug.org/texlive/trunk@55856 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 5 +++++ Build/source/texk/web2c/Makefile.in | 23 ++++++++++++----------- Build/source/texk/web2c/pdftexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/pdftexdir/am/pdftex.am | 12 ++++++------ Build/source/texk/web2c/xetexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/xetexdir/am/xetex.am | 12 ++++++------ 6 files changed, 37 insertions(+), 23 deletions(-) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 377ae17e312..cc416ac5111 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2020-07-17 Andreas Scherer + + * Makefile.am, + * Makefile.in: Avoid changefile ambiguity. + 2020-07-15 Andreas Scherer * ctangleboot.cin, diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 058cc729997..56a690b5f6a 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -3316,13 +3316,13 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \ uptests/yuparse.* uptests/ygkhuge*.* uptrip.diffs \ $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \ euptex.p euptex.pool euptex-tangle euptrip.diffs \ - pdfprimitive-euptex.* $(nodist_pdftex_SOURCES) pdftex.ch \ + pdfprimitive-euptex.* $(nodist_pdftex_SOURCES) pdftex-final.ch \ pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \ pwprob.tex pdfimage.fmt pdfimage.log pdfimage.pdf expanded.log \ cnfline.log postV3.afm postV7.afm test-13.pdf test-13.xref \ test-15.pdf test-15.xref $(nodist_libluatex_sources) \ luaimage.* luajitimage.* $(nodist_xetex_SOURCES) xetex.web \ - xetex.ch xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \ + xetex-final.ch xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \ bug73.log bug73.out bug73.tex filedump.log filedump.out \ filedump.tex $(omegaware_programs:=.c) \ $(omegaware_programs:=.h) $(omegaware_programs:=.p) \ @@ -18617,9 +18617,9 @@ $(pdftex_c_h): pdftex-web2c pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines @$(web2c) pdftex pdftex.p pdftex.pool: pdftex-tangle - @$(pdf_tangle) pdftex pdftex -pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh - @$(pdf_tangle) pdftex pdftex + @$(pdf_tangle) pdftex pdftex-final +pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex-final.ch tangle-sh + @$(pdf_tangle) pdftex pdftex-final pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp) $(makecpool) pdftex >$@ || rm -f $@ @@ -18633,8 +18633,8 @@ $(srcdir)/pdftexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ -# Generate pdftex.ch -pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) +# Generate pdftex-final.ch +pdftex-final.ch: tie$(EXEEXT) $(pdftex_ch_srcs) $(tie_c) $(pdftex_ch_srcs) # Convenience target for making the typeset output; not invoked automatically @@ -18770,9 +18770,9 @@ xetex-pool.c: xetex.pool xetexd.h $(makecpool_stamp) $(makecpool) xetex >$@ || rm -f $@ xetex.p xetex.pool: xetex-tangle - @$(xe_tangle) xetex xetex -xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh - @$(xe_tangle) xetex xetex + @$(xe_tangle) xetex xetex-final +xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex-final.ch tangle-sh + @$(xe_tangle) xetex xetex-final # Extract etex version $(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web @@ -18783,7 +18783,8 @@ $(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web $(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@ -xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs) +# Generate xetex-final.ch +xetex-final.ch: tie$(EXEEXT) $(xetex_ch_srcs) $(tie_c) $(xetex_ch_srcs) $(libxetex_a_OBJECTS): $(libxetex_prereq) xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT) diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index c4d2c59d08d..d99bbc8826b 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,7 @@ +2020-07-17 Andreas Scherer + + * am/pdftex.am: Avoid changefile ambiguity. + 2020-06-11 Thanh Han The * pdftex.web (Create link annotations...): check for gen_running_link. diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index 6e9b9e21260..1eb82160dcc 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -46,9 +46,9 @@ $(pdftex_c_h): pdftex-web2c pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines @$(web2c) pdftex pdftex.p pdftex.pool: pdftex-tangle - @$(pdf_tangle) pdftex pdftex -pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh - @$(pdf_tangle) pdftex pdftex + @$(pdf_tangle) pdftex pdftex-final +pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex-final.ch tangle-sh + @$(pdf_tangle) pdftex pdftex-final pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp) $(makecpool) pdftex >$@ || rm -f $@ @@ -62,8 +62,8 @@ $(srcdir)/pdftexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ -# Generate pdftex.ch -pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) +# Generate pdftex-final.ch +pdftex-final.ch: tie$(EXEEXT) $(pdftex_ch_srcs) $(tie_c) $(pdftex_ch_srcs) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ @@ -84,7 +84,7 @@ pdftex.tex: $(srcdir)/pdftexdir/pdftex.web ## EXTRA_DIST += $(pdftex_ch_srcs) pdftexdir/pdftex.defines -DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \ +DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c \ pdftex.p pdftex.pool pdftex-tangle EXTRA_DIST += \ diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 933e968cf7d..81b02b0fcfc 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,7 @@ +2020-07-17 Andreas Scherer + + * am/xetex.am: Avoid changefile ambiguity. + 2020-07-04 Clerk Ma * xetex.web: Tweak indentation, etc. diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index ec34981a1dd..ddba5f9f10b 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -92,9 +92,9 @@ xetex-pool.c: xetex.pool xetexd.h $(makecpool_stamp) ## Tangling XeTeX xetex.p xetex.pool: xetex-tangle - @$(xe_tangle) xetex xetex -xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh - @$(xe_tangle) xetex xetex + @$(xe_tangle) xetex xetex-final +xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex-final.ch tangle-sh + @$(xe_tangle) xetex xetex-final # Extract etex version $(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web @@ -106,8 +106,8 @@ $(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web $(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@ -## Generate xetex.ch -xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs) +## Generate xetex-final.ch +xetex-final.ch: tie$(EXEEXT) $(xetex_ch_srcs) $(tie_c) $(xetex_ch_srcs) xetex_ch_srcs = \ xetexdir/xetex.web \ @@ -121,7 +121,7 @@ xetex_ch_srcs = \ ## EXTRA_DIST += $(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines -DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c \ +DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \ xetex.p xetex.pool xetex-tangle -- cgit v1.2.3