summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/texk/web2c/ChangeLog6
-rw-r--r--Build/source/texk/web2c/Makefile.am4
-rw-r--r--Build/source/texk/web2c/Makefile.in16
-rw-r--r--Build/source/texk/web2c/am/texmf.am4
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog.TL2
-rw-r--r--Build/source/texk/web2c/eptexdir/am/eptex.am2
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/etexdir/am/etex.am2
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mplibdir/am/mplib.am2
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog2
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am2
12 files changed, 46 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 01ce52c9f83..9baf69fca0a 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (triptrap_diffs): Recipe fragment for trip/trap,
+ used for $(TRIPTRAP).
+ * am/texmf.am (trip.diffs, mftrap.diffs): Use $(triptrap_diffs).
+
2011-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (clean-local, triptrap-clean): Use TRIPTRAP_CLEAN
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 6fd3d4354c4..50ef355c43d 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -118,11 +118,11 @@ o_tangle = WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(OTANGLE)
DIFF = diff
DIFFFLAGS =
TESTS_ENVIRONMENT = DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)'
+triptrap_diffs = srcdir=$(srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
.PHONY: triptrap
triptrap:
- srcdir=$(srcdir) MAKE=$(MAKE) \
- $(SHELL) $(srcdir)/triptrap-sh $(TRIPTRAP)
+ $(triptrap_diffs) $(TRIPTRAP)
EXTRA_DIST += triptrap-sh
clean-local: triptrap-clean
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 6a86012c7c6..59f62a56532 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1535,6 +1535,7 @@ o_tangle = WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(OTANGLE)
DIFF = diff
DIFFFLAGS =
TESTS_ENVIRONMENT = DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)'
+triptrap_diffs = srcdir=$(srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
# The environment for making dumps.
# No need to specify TEXMF, as ../kpathsea/texmf.cnf should contain
@@ -8858,8 +8859,7 @@ $(proglib): ${srcdir}/lib/*.c
.PHONY: triptrap
triptrap:
- srcdir=$(srcdir) MAKE=$(MAKE) \
- $(SHELL) $(srcdir)/triptrap-sh $(TRIPTRAP)
+ $(triptrap_diffs) $(TRIPTRAP)
clean-local: triptrap-clean
.PHONY: triptrap-clean
@@ -9033,6 +9033,8 @@ tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
$(tie) -c $@ $(tex_ch_srcs)
# trip.test
+trip.diffs: tex$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: trip-clean
trip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log
@@ -9066,6 +9068,8 @@ mf-final.ch: tie$(EXEEXT) $(mf_ch_src)
$(tie) -c $@ $(mf_ch_src)
# trap.test
+mftrap.diffs: mf$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: trap-clean
trap-clean:
rm -f trap.mf trap.base
@@ -9082,6 +9086,8 @@ mpxout-tangle: ctangle$(EXEEXT) mplibdir/mpxout.w tangle-sh
@$(mp_ctangle_sh) mpxout
$(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a
+mptrap.diffs: mpost$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: mptrap-clean
mptrap-clean:
rm -f mtrap.mp mtrap.mem trapf.tfm
@@ -9151,6 +9157,8 @@ etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
$(tie) -c etex.ch etex.web $(etex_ch_srcs)
# etrip.test
+etrip.diffs: etex$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: etrip-clean
etrip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log
@@ -9226,6 +9234,8 @@ 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
+ptrip.diffs: ptex$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: ptrip-clean
ptrip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt ptripin.fot ptripin.log
@@ -9268,6 +9278,8 @@ eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
# Generate eptex.ch
eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
$(tie) -c eptex.ch eptex.web $(eptex_ch_srcs)
+eptrip.diffs: eptex$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: eptrip-clean
eptrip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index e74c437214f..74c8338b91d 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -77,6 +77,8 @@ endif TEX
DISTCLEANFILES += trip.diffs
# trip.test
+trip.diffs: tex$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: trip-clean
trip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log
@@ -174,6 +176,8 @@ TRIPTRAP_CLEAN += trap-clean
endif MF
# trap.test
+mftrap.diffs: mf$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: trap-clean
trap-clean:
rm -f trap.mf trap.base
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
index dc0dc86deee..c7a12fa4f77 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
@@ -5,6 +5,8 @@ ChangeLog.TL: TeX Live (TL) changes for e-pTeX
* eptex.ech: banner_k==banner for e-pTeX.
+ * am/eptex.am (eptrip.diffs): Use $(triptrap_diffs).
+
2011-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/eptex.am (eptrip-clean): Use TRIPTRAP_CLEAN.
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index 0c69b955518..b1b1266d954 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -102,6 +102,8 @@ endif EPTEX
##
## eptexdir/eptrip.test
EXTRA_DIST += eptexdir/eptrip.diffs
+eptrip.diffs: eptex$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: eptrip-clean
eptrip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 106ebd2b468..c7c022fe36f 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/etex.am (etrip.diffs): Use $(triptrap_diffs).
+
2011-01-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* etrip/etrip.tex: Fixed 'wrong last node type' diagnostic.
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 008aeebc65a..e25a1e256b9 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -90,6 +90,8 @@ endif ETEX
DISTCLEANFILES += etrip.diffs
# etrip.test
+etrip.diffs: etex$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: etrip-clean
etrip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 06a08fc820e..97972dfbf94 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/mplib.am (mptrap.diffs): Use $(triptrap_diffs).
+
2011-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/mplib.am (mptrap-clean): Use TRIPTRAP_CLEAN.
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index 0898cf3aac7..b7067f9376a 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -59,6 +59,8 @@ DISTCLEANFILES += mptrap.diffs
## dvitomp.test
DISTCLEANFILES += ptmr.mpx tests/xptmr.mpx tests/xstory.mpx
## mptrap.test
+mptrap.diffs: mpost$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: mptrap-clean
mptrap-clean:
rm -f mtrap.mp mtrap.mem trapf.tfm
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 70372af5b16..dd270f6c6f8 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -2,6 +2,8 @@
* ptex-base.ch: banner_k==banner for pTeX.
+ * am/ptex.am (ptrip.diffs): Use $(triptrap_diffs).
+
2011-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/ptex.am (ptrip-clean): Use TRIPTRAP_CLEAN.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index df62eeb7c8b..c07411f1196 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -214,6 +214,8 @@ EXTRA_DIST += ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm
DISTCLEANFILES += tests/x*min10.*
## ptexdir/ptrip.test
EXTRA_DIST += ptexdir/ptrip.diffs
+ptrip.diffs: ptex$(EXEEXT)
+ $(triptrap_diffs) $@
.PHONY: ptrip-clean
ptrip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt ptripin.fot ptripin.log
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 18:23:10 +0000