summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/uptexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-07-10 09:42:52 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-07-10 09:42:52 +0000
commit29257ccc28919fcb506e6582fa5078ed0e542f70 (patch)
treeb496bed4f943710ee6abb20302b43bbadf6bb4a7 /Build/source/texk/web2c/uptexdir
parent116014c0fb6d1b6bce11288c0d39c0f1aeb7cc4e (diff)
Build system: Better dependencies for 'make check'
git-svn-id: svn://tug.org/texlive/trunk@37824 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/uptexdir')
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/uptexdir/am/uptex.am36
-rwxr-xr-xBuild/source/texk/web2c/uptexdir/uptriptest.test (renamed from Build/source/texk/web2c/uptexdir/uptriptest)0
3 files changed, 26 insertions, 16 deletions
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 2a175bdc557..06d104193ac 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * uptriptest (removed): Renamed ...
+ * uptriptest.test (new): ... into this.
+ * am/uptex.am: Better dependencies for 'make check'.
+
2015-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/uptex.am: Use $(tie_c) and $(tie_m).
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index 86dd9b27656..40babfa59cc 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -10,18 +10,6 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv)
upweb_programs = upbibtex updvitype uppltotf uptftopl
-# upTeX Tests
-uptex_tests = uptexdir/uptriptest
-upweb_tests = \
- uptexdir/upbibtex.test \
- uptexdir/updvitype.test \
- uptexdir/uppltotf.test \
- uptexdir/uptftopl.test
-
-EXTRA_DIST += $(uptex_tests) $(upweb_tests)
-DISTCLEANFILES += $(upweb_programs:=.c) $(upweb_programs:=.h) \
- $(upweb_programs:=.p) $(upweb_programs:=-web2c) $(upweb_programs:=.web)
-
## libukanji.a for upTeX and e-upTeX
##
EXTRA_LIBRARIES += libukanji.a
@@ -161,17 +149,33 @@ uptftopl.web: tie$(EXEEXT) 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
-
##
EXTRA_DIST += \
uptexdir/COPYRIGHT \
uptexdir/COPYRIGHT.jis \
uptexdir/ChangeLog
+# upTeX Tests
+uptex_tests = uptexdir/uptriptest.test
+uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+upweb_tests = \
+ uptexdir/upbibtex.test \
+ uptexdir/updvitype.test \
+ uptexdir/uppltotf.test \
+ uptexdir/uptftopl.test \
+ uptexdir/yokotate.test
+uptexdir/upbibtex.log: upbibtex$(EXEEXT)
+uptexdir/updvitype.log: updvitype$(EXEEXT)
+uptexdir/uppltotf.log: uppltotf$(EXEEXT)
+uptexdir/uptftopl.log: uptftopl$(EXEEXT)
+uptexdir/yokotate.log: uppltotf$(EXEEXT) uptftopl$(EXEEXT)
+
+EXTRA_DIST += $(uptex_tests) $(upweb_tests)
+DISTCLEANFILES += $(upweb_programs:=.c) $(upweb_programs:=.h) \
+ $(upweb_programs:=.p) $(upweb_programs:=-web2c) $(upweb_programs:=.web)
+
if UPTEX
TESTS += $(uptex_tests)
-check_PROGRAMS += dvitype pltotf tftopl
TRIPTRAP += uptrip.diffs
TRIPTRAP_CLEAN += uptrip-clean
endif UPTEX
@@ -195,7 +199,7 @@ EXTRA_DIST += uptexdir/tests/tmin10.pl uptexdir/tests/tmin10.tfm
DISTCLEANFILES += uptests/x*min10.*
## uptexdir/uptriptest
EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf
-uptrip.diffs: uptex$(EXEEXT)
+uptrip.diffs: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: uptrip-clean
uptrip-clean:
diff --git a/Build/source/texk/web2c/uptexdir/uptriptest b/Build/source/texk/web2c/uptexdir/uptriptest.test
index 280880f7675..280880f7675 100755
--- a/Build/source/texk/web2c/uptexdir/uptriptest
+++ b/Build/source/texk/web2c/uptexdir/uptriptest.test