summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-22 09:21:26 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-22 09:21:26 +0000
commit80ca8a17ccd2e0ba39ffe4e04b512e6e613562c2 (patch)
tree3914af77b1689a647cfabe82c663f33e241f0a33 /Build/source/texk
parent1e154e99250227dea61d1ddab8d687d5be2a3620 (diff)
texk/web2c: Build system: Define and use tie_c and tie_m
git-svn-id: svn://tug.org/texlive/trunk@37638 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/Makefile.am2
-rw-r--r--Build/source/texk/web2c/Makefile.in66
-rw-r--r--Build/source/texk/web2c/alephdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/alephdir/am/aleph.am6
-rw-r--r--Build/source/texk/web2c/am/texmf.am4
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/eptexdir/am/eptex.am6
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/etexdir/am/etex.am6
-rw-r--r--Build/source/texk/web2c/euptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/euptexdir/am/euptex.am6
-rw-r--r--Build/source/texk/web2c/mfluadir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mfluadir/am/mflua.am4
-rw-r--r--Build/source/texk/web2c/mfluajitdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mfluajitdir/am/mfluajit.am4
-rw-r--r--Build/source/texk/web2c/omegaware/ChangeLog4
-rw-r--r--Build/source/texk/web2c/omegaware/am/omegaware.am10
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am4
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am14
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/uptexdir/am/uptex.am14
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am4
26 files changed, 126 insertions, 73 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 6359e9d95d5..576443b54b1 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (tie_c, tie_m): New variables.
+ * am/texmf.am: Use $(tie_c).
+
2015-06-12 Peter Breitenlohner <peb@mppmu.mpg.de>
Integrate MFLua and MFLuaJIT.
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 3c220910880..3ba66ee54db 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -138,6 +138,8 @@ tie_silent = $(tie_silent_@AM_V@)
tie_silent_ = $(tie_silent_@AM_DEFAULT_V@)
tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
tie_silent_1 =
+tie_c = $(tie) -c $@
+tie_m = $(tie) -m $@
# Calling tangle & Co. via tangle-sh (several output files)
texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index bad81cfda02..b56c71cf748 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2627,6 +2627,8 @@ tie_silent = $(tie_silent_@AM_V@)
tie_silent_ = $(tie_silent_@AM_DEFAULT_V@)
tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
tie_silent_1 =
+tie_c = $(tie) -c $@
+tie_m = $(tie) -m $@
# Calling tangle & Co. via tangle-sh (several output files)
texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
@@ -15351,7 +15353,7 @@ tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh
# Generate tex-final.ch
tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
- $(tie) -c $@ $(tex_ch_srcs)
+ $(tie_c) $(tex_ch_srcs)
trip.diffs: tex$(EXEEXT)
$(triptrap_diffs) $@
@@ -15383,7 +15385,7 @@ mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh
# Generate mf-final.ch
mf-final.ch: tie$(EXEEXT) $(mf_ch_src)
- $(tie) -c $@ $(mf_ch_src)
+ $(tie_c) $(mf_ch_src)
mftrap.diffs: mf$(EXEEXT)
$(triptrap_diffs) $@
@@ -15418,11 +15420,11 @@ $(srcdir)/mfluadir/mflua_version.h: @MAINTAINER_MODE_TRUE@ mfluadir/mf-lua.ch
# Generate mflua.web
mflua.web: tie$(EXEEXT) $(mflua_web_srcs)
- $(tie) -m mflua.web $(mflua_web_srcs)
+ $(tie_m) $(mflua_web_srcs)
# Generate mflua.ch
mflua.ch: tie$(EXEEXT) mflua.web $(mflua_ch_src)
- $(tie) -c $@ mflua.web $(mflua_ch_src)
+ $(tie_c) mflua.web $(mflua_ch_src)
mfluatrap.diffs: mflua$(EXEEXT)
$(triptrap_diffs) $@
@@ -15452,11 +15454,11 @@ mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
# Generate mfluajit.web
mfluajit.web: tie$(EXEEXT) $(mfluajit_web_srcs)
- $(tie) -m mfluajit.web $(mfluajit_web_srcs)
+ $(tie_m) $(mfluajit_web_srcs)
# Generate mfluajit.ch
mfluajit.ch: tie$(EXEEXT) mfluajit.web $(mfluajit_ch_src)
- $(tie) -c $@ mfluajit.web $(mfluajit_ch_src)
+ $(tie_c) mfluajit.web $(mfluajit_ch_src)
mfluajittrap.diffs: mfluajit$(EXEEXT)
$(triptrap_diffs) $@
@@ -15640,11 +15642,11 @@ $(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch
# Generate etex.web
etex.web: tie$(EXEEXT) $(etex_web_srcs)
- $(tie) -m etex.web $(etex_web_srcs)
+ $(tie_m) $(etex_web_srcs)
# Generate etex.ch
etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
- $(tie) -c etex.ch etex.web $(etex_ch_srcs)
+ $(tie_c) etex.web $(etex_ch_srcs)
etrip.diffs: etex$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: etrip-clean
@@ -15676,11 +15678,11 @@ $(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch
# Generate ptex.web
ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
- $(tie) -m ptex.web $(ptex_web_srcs)
+ $(tie_m) $(ptex_web_srcs)
# Generate ptex.ch
ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
- $(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
+ $(tie_c) ptex.web $(ptex_ch_srcs)
pbibtex.c pbibtex.h: pbibtex-web2c
@$(web2c) pbibtex
pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
@@ -15688,7 +15690,7 @@ pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
$(p_tangle) pbibtex pbibtex
pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
- $(tie) -m pbibtex.web bibtex.web bibtex.ch
+ $(tie_m) bibtex.web bibtex.ch
pdvitype.c pdvitype.h: pdvitype-web2c
@$(web2c) pdvitype
pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
@@ -15696,7 +15698,7 @@ pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
$(p_tangle) pdvitype pdvitype
pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
- $(tie) -m pdvitype.web dvitype.web dvitype.ch
+ $(tie_m) dvitype.web dvitype.ch
ppltotf.c ppltotf.h: ppltotf-web2c
@$(web2c) ppltotf
ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
@@ -15704,7 +15706,7 @@ ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
$(p_tangle) ppltotf ppltotf
ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
- $(tie) -m ppltotf.web pltotf.web pltotf.ch
+ $(tie_m) pltotf.web pltotf.ch
ptftopl.c ptftopl.h: ptftopl-web2c
@$(web2c) ptftopl
ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
@@ -15712,7 +15714,7 @@ ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
$(p_tangle) ptftopl ptftopl
ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
- $(tie) -m ptftopl.web tftopl.web tftopl.ch
+ $(tie_m) tftopl.web tftopl.ch
ptrip.diffs: ptex$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: ptrip-clean
@@ -15741,11 +15743,11 @@ $(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech
# Generate eptex.web
eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
- $(tie) -m eptex.web $(eptex_web_srcs)
+ $(tie_m) $(eptex_web_srcs)
# Generate eptex.ch
eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
- $(tie) -c eptex.ch eptex.web $(eptex_ch_srcs)
+ $(tie_c) eptex.web $(eptex_ch_srcs)
eptrip.diffs: eptex$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: eptrip-clean
@@ -15774,11 +15776,11 @@ $(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch
# Generate uptex.web
uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
- $(tie) -m uptex.web $(uptex_web_srcs)
+ $(tie_m) $(uptex_web_srcs)
# Generate uptex.ch
uptex.ch: tie$(EXEEXT) uptex.web $(uptex_ch_srcs)
- $(tie) -c uptex.ch uptex.web $(uptex_ch_srcs)
+ $(tie_c) uptex.web $(uptex_ch_srcs)
upbibtex.c upbibtex.h: upbibtex-web2c
@$(web2c) upbibtex
upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines web2c/cvtbib.sed
@@ -15786,7 +15788,7 @@ upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines web2c/cvtbib.s
upbibtex.p: tangle$(EXEEXT) upbibtex.web uptexdir/upbibtex.ch
$(up_tangle) upbibtex upbibtex
upbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch ptexdir/pbibtex.ch
- $(tie) -m upbibtex.web bibtex.web bibtex.ch ptexdir/pbibtex.ch
+ $(tie_m) bibtex.web bibtex.ch ptexdir/pbibtex.ch
updvitype.c updvitype.h: updvitype-web2c
@$(web2c) updvitype
updvitype-web2c: updvitype.p $(web2c_depend) uptexdir/uptex.defines
@@ -15794,7 +15796,7 @@ updvitype-web2c: updvitype.p $(web2c_depend) uptexdir/uptex.defines
updvitype.p: tangle$(EXEEXT) updvitype.web uptexdir/updvitype.ch
$(up_tangle) updvitype updvitype
updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch ptexdir/pdvitype.ch
- $(tie) -m updvitype.web dvitype.web dvitype.ch ptexdir/pdvitype.ch
+ $(tie_m) dvitype.web dvitype.ch ptexdir/pdvitype.ch
uppltotf.c uppltotf.h: uppltotf-web2c
@$(web2c) uppltotf
uppltotf-web2c: uppltotf.p $(web2c_depend) uptexdir/uptex.defines
@@ -15802,7 +15804,7 @@ uppltotf-web2c: uppltotf.p $(web2c_depend) uptexdir/uptex.defines
uppltotf.p: tangle$(EXEEXT) uppltotf.web uptexdir/uppltotf.ch
$(up_tangle) uppltotf uppltotf
uppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch ptexdir/ppltotf.ch
- $(tie) -m uppltotf.web pltotf.web pltotf.ch ptexdir/ppltotf.ch
+ $(tie_m) pltotf.web pltotf.ch ptexdir/ppltotf.ch
uptftopl.c uptftopl.h: uptftopl-web2c
@$(web2c) uptftopl
uptftopl-web2c: uptftopl.p $(web2c_depend) uptexdir/uptex.defines
@@ -15810,7 +15812,7 @@ uptftopl-web2c: uptftopl.p $(web2c_depend) uptexdir/uptex.defines
uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch
$(up_tangle) uptftopl uptftopl
uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch
- $(tie) -m uptftopl.web tftopl.web tftopl.ch ptexdir/ptftopl.ch
+ $(tie_m) tftopl.web tftopl.ch ptexdir/ptftopl.ch
uptrip.diffs: uptex$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: uptrip-clean
@@ -15834,11 +15836,11 @@ euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
# Generate euptex.web
euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
- $(tie) -m euptex.web $(euptex_web_srcs)
+ $(tie_m) $(euptex_web_srcs)
# Generate euptex.ch
euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
- $(tie) -c euptex.ch euptex.web $(euptex_ch_srcs)
+ $(tie_c) euptex.web $(euptex_ch_srcs)
euptrip.diffs: euptex$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: euptrip-clean
@@ -15871,7 +15873,7 @@ $(srcdir)/pdftexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web
# Generate pdftex.ch
pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
- $(tie) -c pdftex.ch $(pdftex_ch_srcs)
+ $(tie_c) $(pdftex_ch_srcs)
$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND)
@@ -16144,7 +16146,7 @@ $(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
| sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
- $(tie) -c xetex.ch $(xetex_ch_srcs)
+ $(tie_c) $(xetex_ch_srcs)
$(libxetex_a_OBJECTS): $(libxetex_prereq)
odvicopy.c odvicopy.h: odvicopy-web2c
@$(web2c) odvicopy
@@ -16165,7 +16167,7 @@ ofm2opl-web2c: ofm2opl.p $(web2c_depend)
ofm2opl.p: otangle$(EXEEXT) ofm2opl.web omegaware/ofm2opl.ch
$(tangle_silent)$(ow_otangle) ofm2opl ofm2opl
ofm2opl.web: tie$(EXEEXT) omegaware/ofm2opl.web omegaware/ofm2opl.up
- $(tie) -m ofm2opl.web omegaware/ofm2opl.web omegaware/ofm2opl.up
+ $(tie_m) omegaware/ofm2opl.web omegaware/ofm2opl.up
opl2ofm.c opl2ofm.h: opl2ofm-web2c
@$(web2c) opl2ofm
opl2ofm-web2c: opl2ofm.p $(web2c_depend)
@@ -16173,7 +16175,7 @@ opl2ofm-web2c: opl2ofm.p $(web2c_depend)
opl2ofm.p: otangle$(EXEEXT) opl2ofm.web omegaware/opl2ofm.ch
$(tangle_silent)$(ow_otangle) opl2ofm opl2ofm
opl2ofm.web: tie$(EXEEXT) omegaware/opl2ofm.web omegaware/opl2ofm.up
- $(tie) -m opl2ofm.web omegaware/opl2ofm.web omegaware/opl2ofm.up
+ $(tie_m) omegaware/opl2ofm.web omegaware/opl2ofm.up
otangle.c otangle.h: otangle-web2c
@$(web2c) otangle
otangle-web2c: otangle.p $(web2c_depend)
@@ -16187,7 +16189,7 @@ ovf2ovp-web2c: ovf2ovp.p $(web2c_depend)
ovf2ovp.p: otangle$(EXEEXT) ovf2ovp.web omegaware/ovf2ovp.ch
$(tangle_silent)$(ow_otangle) ovf2ovp ovf2ovp
ovf2ovp.web: tie$(EXEEXT) omegaware/ovf2ovp.web omegaware/ovf2ovp.up
- $(tie) -m ovf2ovp.web omegaware/ovf2ovp.web omegaware/ovf2ovp.up
+ $(tie_m) omegaware/ovf2ovp.web omegaware/ovf2ovp.up
ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c
@$(web2c) ovp2ovf
ovp2ovf-web2c: ovp2ovf.p $(web2c_depend)
@@ -16195,7 +16197,7 @@ ovp2ovf-web2c: ovp2ovf.p $(web2c_depend)
ovp2ovf.p: otangle$(EXEEXT) ovp2ovf.web omegaware/ovp2ovf.ch
$(tangle_silent)$(ow_otangle) ovp2ovf ovp2ovf
ovp2ovf.web: tie$(EXEEXT) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
- $(tie) -m ovp2ovf.web omegaware/ovp2ovf.web omegaware/ovp2ovf.up
+ $(tie_m) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
# We must create alephd.h before building the aleph_OBJECTS.
$(aleph_OBJECTS): alephd.h
@@ -16213,9 +16215,9 @@ aleph.p aleph.pool: aleph-tangle
aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch tangle-sh
@$(al_tangle) aleph aleph
aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
- $(tie) -m aleph.web $(aleph_web_srcs)
+ $(tie_m) $(aleph_web_srcs)
aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
- $(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
+ $(tie_c) aleph.web $(aleph_ch_srcs)
$(synctex_OBJECTS): $(libsynctex)
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 461a28b598f..3c28402dc92 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/aleph.am: Use $(tie_c) and $(tie_m).
+
2015-04-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* alephbis.c: Declare {in,out}_file_fd only when used (!WIN32).
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index b7c65729d50..6de98886fbe 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-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## Aleph
@@ -69,7 +69,7 @@ aleph_web_srcs = \
alephdir/eopage.ch \
alephdir/eochar.ch
aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
- $(tie) -m aleph.web $(aleph_web_srcs)
+ $(tie_m) $(aleph_web_srcs)
# Generate aleph.ch
aleph_ch_srcs = \
@@ -86,7 +86,7 @@ aleph_ch_srcs = \
alephdir/comsrcspec.ch \
alephdir/ceostuff.ch
aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
- $(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
+ $(tie_c) aleph.web $(aleph_ch_srcs)
##
EXTRA_DIST += $(aleph_web_srcs) $(aleph_ch_srcs)
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index e6ffb1584eb..5eff3203f23 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -58,7 +58,7 @@ tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh
# Generate tex-final.ch
tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
- $(tie) -c $@ $(tex_ch_srcs)
+ $(tie_c) $(tex_ch_srcs)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -168,7 +168,7 @@ mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh
# Generate mf-final.ch
mf-final.ch: tie$(EXEEXT) $(mf_ch_src)
- $(tie) -c $@ $(mf_ch_src)
+ $(tie_c) $(mf_ch_src)
mf_ch_src = \
mf.web \
mf.ch \
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index 660b668fb2c..5e396f88c43 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/eptx.am: Use $(tie_c) and $(tie_m).
+
2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* eptrip/eptrip.diffs: Updated for TL 2015.
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index 579e7542892..b3837a3a4ea 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -1,6 +1,6 @@
## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX.
##
-## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## e-pTeX
@@ -52,7 +52,7 @@ $(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech
# Generate eptex.web
eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
- $(tie) -m eptex.web $(eptex_web_srcs)
+ $(tie_m) $(eptex_web_srcs)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -62,7 +62,7 @@ eptex_web_srcs = \
# Generate eptex.ch
eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
- $(tie) -c eptex.ch eptex.web $(eptex_ch_srcs)
+ $(tie_c) eptex.web $(eptex_ch_srcs)
eptex_ch_srcs = \
eptexdir/eptex-base.ch \
eptexdir/etex.ch0 \
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 25ddb6194d2..d52445b57b2 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/etex.am: Use $(tie_c) and $(tie_m).
+
2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* etrip/etrip.diffs: Updated for TL 2015.
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 05d86297c22..987ba544727 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-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## e-TeX
@@ -45,14 +45,14 @@ $(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch
# Generate etex.web
etex.web: tie$(EXEEXT) $(etex_web_srcs)
- $(tie) -m etex.web $(etex_web_srcs)
+ $(tie_m) $(etex_web_srcs)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
# Generate etex.ch
etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
- $(tie) -c etex.ch etex.web $(etex_ch_srcs)
+ $(tie_c) etex.web $(etex_ch_srcs)
etex_ch_srcs = \
etexdir/tex.ch0 \
tex.ch \
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index 2ab67db21a1..0f2c7c4ef9f 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/euptex.am: Use $(tie_c) and $(tie_m).
+
2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* euptrip/euptrip.diffs: Updated for TL 2015.
diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am
index 6cb847d055e..63667007f54 100644
--- a/Build/source/texk/web2c/euptexdir/am/euptex.am
+++ b/Build/source/texk/web2c/euptexdir/am/euptex.am
@@ -1,6 +1,6 @@
## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX.
##
-## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## e-upTeX
@@ -48,7 +48,7 @@ euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
# Generate euptex.web
euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
- $(tie) -m euptex.web $(euptex_web_srcs)
+ $(tie_m) $(euptex_web_srcs)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -58,7 +58,7 @@ euptex_web_srcs = \
# Generate euptex.ch
euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
- $(tie) -c euptex.ch euptex.web $(euptex_ch_srcs)
+ $(tie_c) euptex.web $(euptex_ch_srcs)
euptex_ch_srcs = \
eptexdir/etex.ch0 \
ptexdir/ptex-base.ch \
diff --git a/Build/source/texk/web2c/mfluadir/ChangeLog b/Build/source/texk/web2c/mfluadir/ChangeLog
index 8bb01a97eab..c99506bdbbb 100644
--- a/Build/source/texk/web2c/mfluadir/ChangeLog
+++ b/Build/source/texk/web2c/mfluadir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/mflua.am: Use $(tie_c) and $(tie_m).
+
2015-04-01 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported MFLua into TeX Live, based on the SVN repository
diff --git a/Build/source/texk/web2c/mfluadir/am/mflua.am b/Build/source/texk/web2c/mfluadir/am/mflua.am
index e2fea0a36ad..14a52bb95ff 100644
--- a/Build/source/texk/web2c/mfluadir/am/mflua.am
+++ b/Build/source/texk/web2c/mfluadir/am/mflua.am
@@ -70,14 +70,14 @@ $(srcdir)/mfluadir/mflua_version.h: @MAINTAINER_MODE_TRUE@ mfluadir/mf-lua.ch
# Generate mflua.web
mflua.web: tie$(EXEEXT) $(mflua_web_srcs)
- $(tie) -m mflua.web $(mflua_web_srcs)
+ $(tie_m) $(mflua_web_srcs)
mflua_web_srcs = \
mf.web \
mfluadir/mf-lua.ch
# Generate mflua.ch
mflua.ch: tie$(EXEEXT) mflua.web $(mflua_ch_src)
- $(tie) -c $@ mflua.web $(mflua_ch_src)
+ $(tie_c) mflua.web $(mflua_ch_src)
mflua_ch_src = \
mf.ch \
mfluadir/mflua-m.ch \
diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog
index 45c8f107a07..5766f9c91dc 100644
--- a/Build/source/texk/web2c/mfluajitdir/ChangeLog
+++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/mfluajit.am: Use $(tie_c) and $(tie_m).
+
2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported MFLuaJIT into TeX Live, based on the SVN repository
diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
index 4a98fa3da18..501c983c4cd 100644
--- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
+++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
@@ -65,7 +65,7 @@ mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
# Generate mfluajit.web
mfluajit.web: tie$(EXEEXT) $(mfluajit_web_srcs)
- $(tie) -m mfluajit.web $(mfluajit_web_srcs)
+ $(tie_m) $(mfluajit_web_srcs)
mfluajit_web_srcs = \
mf.web \
mfluadir/mf-lua.ch \
@@ -73,7 +73,7 @@ mfluajit_web_srcs = \
# Generate mfluajit.ch
mfluajit.ch: tie$(EXEEXT) mfluajit.web $(mfluajit_ch_src)
- $(tie) -c $@ mfluajit.web $(mfluajit_ch_src)
+ $(tie_c) mfluajit.web $(mfluajit_ch_src)
mfluajit_ch_src = \
mf.ch \
mfluadir/mflua-m.ch \
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index 3499eaee5c0..01480911ed7 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/omegaware.am: Use $(tie_m).
+
2015-01-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* odvicopy.ch: Drop intcast().
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index d98695a0bae..802dd5b6be1 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -1,6 +1,6 @@
## texk/web2c/omegaware/am/omegaware.am: Makefile fragment for omegaware web programs.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
omegaware_programs = odvicopy odvitype otangle wofm2opl wopl2ofm wovf2ovp wovp2ovf
@@ -45,7 +45,7 @@ ofm2opl-web2c: ofm2opl.p $(web2c_depend)
ofm2opl.p: otangle$(EXEEXT) ofm2opl.web omegaware/ofm2opl.ch
$(tangle_silent)$(ow_otangle) ofm2opl ofm2opl
ofm2opl.web: tie$(EXEEXT) omegaware/ofm2opl.web omegaware/ofm2opl.up
- $(tie) -m ofm2opl.web omegaware/ofm2opl.web omegaware/ofm2opl.up
+ $(tie_m) omegaware/ofm2opl.web omegaware/ofm2opl.up
EXTRA_DIST += omegaware/ofm2opl.web omegaware/ofm2opl.up omegaware/ofm2opl.ch
DISTCLEANFILES += ofm2opl.web
@@ -57,7 +57,7 @@ opl2ofm-web2c: opl2ofm.p $(web2c_depend)
opl2ofm.p: otangle$(EXEEXT) opl2ofm.web omegaware/opl2ofm.ch
$(tangle_silent)$(ow_otangle) opl2ofm opl2ofm
opl2ofm.web: tie$(EXEEXT) omegaware/opl2ofm.web omegaware/opl2ofm.up
- $(tie) -m opl2ofm.web omegaware/opl2ofm.web omegaware/opl2ofm.up
+ $(tie_m) omegaware/opl2ofm.web omegaware/opl2ofm.up
EXTRA_DIST += omegaware/opl2ofm.web omegaware/opl2ofm.up omegaware/opl2ofm.ch
DISTCLEANFILES += opl2ofm.web
@@ -79,7 +79,7 @@ ovf2ovp-web2c: ovf2ovp.p $(web2c_depend)
ovf2ovp.p: otangle$(EXEEXT) ovf2ovp.web omegaware/ovf2ovp.ch
$(tangle_silent)$(ow_otangle) ovf2ovp ovf2ovp
ovf2ovp.web: tie$(EXEEXT) omegaware/ovf2ovp.web omegaware/ovf2ovp.up
- $(tie) -m ovf2ovp.web omegaware/ovf2ovp.web omegaware/ovf2ovp.up
+ $(tie_m) omegaware/ovf2ovp.web omegaware/ovf2ovp.up
EXTRA_DIST += omegaware/ovf2ovp.web omegaware/ovf2ovp.up omegaware/ovf2ovp.ch
DISTCLEANFILES += ovf2ovp.web
@@ -91,7 +91,7 @@ ovp2ovf-web2c: ovp2ovf.p $(web2c_depend)
ovp2ovf.p: otangle$(EXEEXT) ovp2ovf.web omegaware/ovp2ovf.ch
$(tangle_silent)$(ow_otangle) ovp2ovf ovp2ovf
ovp2ovf.web: tie$(EXEEXT) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
- $(tie) -m ovp2ovf.web omegaware/ovp2ovf.web omegaware/ovp2ovf.up
+ $(tie_m) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
EXTRA_DIST += omegaware/ovp2ovf.web omegaware/ovp2ovf.up omegaware/ovp2ovf.ch
DISTCLEANFILES += ovp2ovf.web
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 7a7f7a43b09..b055b0170ca 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/pdftex.am: Use $(tie_c).
+
2015-03-07 Karl Berry <karl@tug.org>
* NEWS,
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 19fb2f4f30c..f716920bf5e 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-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
@@ -63,7 +63,7 @@ $(srcdir)/pdftexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web
# Generate pdftex.ch
pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
- $(tie) -c pdftex.ch $(pdftex_ch_srcs)
+ $(tie_c) $(pdftex_ch_srcs)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index ec2a4e5580e..b687e951b15 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ptex.am: Use $(tie_c) and $(tie_m).
+
2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* ptrip/ptrip.diffs: Updated for TL 2015.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 46a31b19740..dd0610e3147 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-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
@@ -82,14 +82,14 @@ $(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch
# Generate ptex.web
ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
- $(tie) -m ptex.web $(ptex_web_srcs)
+ $(tie_m) $(ptex_web_srcs)
ptex_web_srcs = \
tex.web \
tex.ch
# Generate ptex.ch
ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
- $(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
+ $(tie_c) ptex.web $(ptex_ch_srcs)
ptex_ch_srcs = \
ptexdir/ptex-base.ch \
$(ptex_ch_synctex) \
@@ -114,7 +114,7 @@ pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
$(p_tangle) pbibtex pbibtex
pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
- $(tie) -m pbibtex.web bibtex.web bibtex.ch
+ $(tie_m) bibtex.web bibtex.ch
EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
pweb_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
@@ -134,7 +134,7 @@ pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
$(p_tangle) pdvitype pdvitype
pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
- $(tie) -m pdvitype.web dvitype.web dvitype.ch
+ $(tie_m) dvitype.web dvitype.ch
EXTRA_DIST += ptexdir/pdvitype.ch
pweb_tests += ptexdir/sample.test
@@ -153,7 +153,7 @@ ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
$(p_tangle) ppltotf ppltotf
ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
- $(tie) -m ppltotf.web pltotf.web pltotf.ch
+ $(tie_m) pltotf.web pltotf.ch
EXTRA_DIST += ptexdir/ppltotf.ch
## pTFtoPL
@@ -170,7 +170,7 @@ ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
$(p_tangle) ptftopl ptftopl
ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
- $(tie) -m ptftopl.web tftopl.web tftopl.ch
+ $(tie_m) tftopl.web tftopl.ch
EXTRA_DIST += ptexdir/ptftopl.ch
pweb_tests += ptexdir/yokotate.test
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 638448f123d..2a175bdc557 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/uptex.am: Use $(tie_c) and $(tie_m).
+
2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* uptrip/uptrip.diffs: Updated for TL 2015.
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index 9cc6b12a101..86dd9b27656 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -1,6 +1,6 @@
## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX.
##
-## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
@@ -74,14 +74,14 @@ $(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch
# Generate uptex.web
uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
- $(tie) -m uptex.web $(uptex_web_srcs)
+ $(tie_m) $(uptex_web_srcs)
uptex_web_srcs = \
tex.web \
tex.ch
# Generate uptex.ch
uptex.ch: tie$(EXEEXT) uptex.web $(uptex_ch_srcs)
- $(tie) -c uptex.ch uptex.web $(uptex_ch_srcs)
+ $(tie_c) uptex.web $(uptex_ch_srcs)
uptex_ch_srcs = \
ptexdir/ptex-base.ch \
uptexdir/uptex-m.ch \
@@ -107,7 +107,7 @@ upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines web2c/cvtbib.s
upbibtex.p: tangle$(EXEEXT) upbibtex.web uptexdir/upbibtex.ch
$(up_tangle) upbibtex upbibtex
upbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch ptexdir/pbibtex.ch
- $(tie) -m upbibtex.web bibtex.web bibtex.ch ptexdir/pbibtex.ch
+ $(tie_m) bibtex.web bibtex.ch ptexdir/pbibtex.ch
EXTRA_DIST += ptexdir/pbibtex.ch uptexdir/upbibtex.ch
## upDVItype
@@ -124,7 +124,7 @@ updvitype-web2c: updvitype.p $(web2c_depend) uptexdir/uptex.defines
updvitype.p: tangle$(EXEEXT) updvitype.web uptexdir/updvitype.ch
$(up_tangle) updvitype updvitype
updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch ptexdir/pdvitype.ch
- $(tie) -m updvitype.web dvitype.web dvitype.ch ptexdir/pdvitype.ch
+ $(tie_m) dvitype.web dvitype.ch ptexdir/pdvitype.ch
EXTRA_DIST += ptexdir/pdvitype.ch uptexdir/updvitype.ch
## upPLtoTF
@@ -141,7 +141,7 @@ uppltotf-web2c: uppltotf.p $(web2c_depend) uptexdir/uptex.defines
uppltotf.p: tangle$(EXEEXT) uppltotf.web uptexdir/uppltotf.ch
$(up_tangle) uppltotf uppltotf
uppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch ptexdir/ppltotf.ch
- $(tie) -m uppltotf.web pltotf.web pltotf.ch ptexdir/ppltotf.ch
+ $(tie_m) pltotf.web pltotf.ch ptexdir/ppltotf.ch
EXTRA_DIST += ptexdir/ppltotf.ch uptexdir/uppltotf.ch
## upTFtoPL
@@ -158,7 +158,7 @@ uptftopl-web2c: uptftopl.p $(web2c_depend) uptexdir/uptex.defines
uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch
$(up_tangle) uptftopl uptftopl
uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch
- $(tie) -m uptftopl.web tftopl.web tftopl.ch ptexdir/ptftopl.ch
+ $(tie_m) tftopl.web tftopl.ch ptexdir/ptftopl.ch
EXTRA_DIST += ptexdir/ptftopl.ch uptexdir/uptftopl.ch
upweb_tests += uptexdir/yokotate.test
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index da973ad61f6..5a935d105ec 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/xetex.am: Use $(tie_c).
+
2015-05-07 Jonathan Kew <jfkthame@gmail.com>
* xetex.web: Merged UTF-16 surrogate-handling fixes from github.
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 41855700566..0857f0c677e 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-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## XeTeX
@@ -105,7 +105,7 @@ $(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
## Generate xetex.ch
xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
- $(tie) -c xetex.ch $(xetex_ch_srcs)
+ $(tie_c) $(xetex_ch_srcs)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \