Build system: Better dependencies for 'make check'

git-svn-id: svn://tug.org/texlive/trunk@37824 c570f23f-e606-0410-a88d-b1316a301751

46 files changed, 665 insertions, 629 deletions

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index fd97ed6052c..978043f2b40 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* test-dvips (removed): Renamed ...
+	* test-dvips.test (new): ... into this.
+	* Makefile.am: Better dependencies for 'make check'.
+
 2015-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index 327e8fc2636..8dd2eb1027e 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -107,10 +107,13 @@ EXTRA_DIST = $(dist_prologues) texc.script
 CLEANFILES = $(prologues) texc.lpro
 
 ## dvips tests
+TEST_EXTENSIONS = .pl .test
 TESTS = afm2tfm-test.pl
-TESTS += beginfontk1.test eepic-nan.test \
-         pfbincl.test quotecmd-test.pl same-name.test test-dvips
-beginfontk1.log eepic-nan.log pfbincl.log same-name.log: dvips$(EXEEXT)
+afm2tfm-test.log: afm2tfm$(EXEEXT)
+TESTS += beginfontk1.test eepic-nan.test pfbincl.test \
+	quotecmd-test.pl same-name.test test-dvips.test
+beginfontk1.log eepic-nan.log pfbincl.log \
+	quotecmd-test.log same-name.log test-dvips.log: dvips$(EXEEXT)
 
 TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea
 TESTS_ENVIRONMENT += TEXCONFIG=$(srcdir)/testdata
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index b689ef0d1ee..bd2bf4441f8 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -444,9 +444,11 @@ am__set_TESTS_bases = \
   bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
 TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+am__test_logs3 = $(am__test_logs2:.pl.log=.log)
+PL_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+PL_LOG_COMPILE = $(PL_LOG_COMPILER) $(AM_PL_LOG_FLAGS) $(PL_LOG_FLAGS)
 am__set_b = \
   case '$@' in \
     */*) \
@@ -457,9 +459,7 @@ am__set_b = \
     *) \
       b='$*';; \
   esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOGS = $(am__test_logs3:.test.log=.log)
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
@@ -734,8 +734,9 @@ EXTRA_DIST = $(dist_prologues) texc.script $(TESTS) testdata/8r.enc \
 	hps/CHANGES_HPS.txt hps/README_HPS.txt lafonts.map makefont.c \
 	mvs psfonts.map tex vmcms vms
 CLEANFILES = $(prologues) texc.lpro
+TEST_EXTENSIONS = .pl .test
 TESTS = afm2tfm-test.pl beginfontk1.test eepic-nan.test pfbincl.test \
-	quotecmd-test.pl same-name.test test-dvips
+	quotecmd-test.pl same-name.test test-dvips.test
 TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea \
 	TEXCONFIG=$(srcdir)/testdata TEXFONTS=$(srcdir)/testdata \
 	TEXFONTMAPS=$(srcdir)/testdata TEXPSHEADERS=$(srcdir)/testdata
@@ -747,7 +748,7 @@ all: c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .pro .lpro .c .dvi .html .info .lo .log .o .obj .pdf .ps .test .test$(EXEEXT) .texi .trs
+.SUFFIXES: .pro .lpro .c .dvi .html .info .lo .log .o .obj .pdf .pl .pl$(EXEEXT) .ps .test .test$(EXEEXT) .texi .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(am__configure_deps)
@@ -1377,27 +1378,20 @@ recheck: all
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
-afm2tfm-test.pl.log: afm2tfm-test.pl
-	@p='afm2tfm-test.pl'; \
-	b='afm2tfm-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-quotecmd-test.pl.log: quotecmd-test.pl
-	@p='quotecmd-test.pl'; \
-	b='quotecmd-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-dvips.log: test-dvips
-	@p='test-dvips'; \
-	b='test-dvips'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+.pl.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.pl$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \
@@ -1867,7 +1861,9 @@ $(prologues): squeeze/stamp-squeeze
 
 squeeze/stamp-squeeze:
 	cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze
-beginfontk1.log eepic-nan.log pfbincl.log same-name.log: dvips$(EXEEXT)
+afm2tfm-test.log: afm2tfm$(EXEEXT)
+beginfontk1.log eepic-nan.log pfbincl.log \
+	quotecmd-test.log same-name.log test-dvips.log: dvips$(EXEEXT)
 dist-hook:
 	cd "$(distdir)" && rm -rf $(NEVER_DIST)
 
diff --git a/Build/source/texk/dvipsk/test-dvips b/Build/source/texk/dvipsk/test-dvips.test
index 253515a5ce7..253515a5ce7 100755
--- a/Build/source/texk/dvipsk/test-dvips
+++ b/Build/source/texk/dvipsk/test-dvips.test
diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog
index 15323817ebf..070bab95cfa 100644
--- a/Build/source/texk/makeindexk/ChangeLog
+++ b/Build/source/texk/makeindexk/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Better dependencies for 'make check'.
+
 2015-07-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am
index 6fa5a6c21a2..64e2956757c 100644
--- a/Build/source/texk/makeindexk/Makefile.am
+++ b/Build/source/texk/makeindexk/Makefile.am
@@ -38,8 +38,9 @@ EXTRA_DIST = CONTRIB NOTES ind-src
 
 ## Tests
 ##
+TEST_EXTENSIONS = .pl .test
 TESTS = tests/nested-range-test.pl tests/makeindex.test
-tests/nested-range-test.pl.log tests/makeindex.log: makeindex$(EXEEXT)
+tests/nested-range-test.log tests/makeindex.log: makeindex$(EXEEXT)
 EXTRA_DIST += $(TESTS)
 
 ## tests/nested-range-test.pl
diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in
index 2cada8109c9..0cee251332b 100644
--- a/Build/source/texk/makeindexk/Makefile.in
+++ b/Build/source/texk/makeindexk/Makefile.in
@@ -379,9 +379,11 @@ am__set_TESTS_bases = \
   bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
 TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+am__test_logs3 = $(am__test_logs2:.pl.log=.log)
+PL_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+PL_LOG_COMPILE = $(PL_LOG_COMPILER) $(AM_PL_LOG_FLAGS) $(PL_LOG_FLAGS)
 am__set_b = \
   case '$@' in \
     */*) \
@@ -392,9 +394,7 @@ am__set_b = \
     *) \
       b='$*';; \
   esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOGS = $(am__test_logs3:.test.log=.log)
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
@@ -572,13 +572,14 @@ dist_man1_MANS = makeindex.1 mkindex.1
 EXTRA_DIST = CONTRIB NOTES ind-src $(TESTS) tests/nested-range.tex \
 	tests/nested-range.idx tests/nested-range-bb.tex \
 	tests/nested-range-bb.idx tests/sample.idx tests/sample.ind
+TEST_EXTENSIONS = .pl .test
 TESTS = tests/nested-range-test.pl tests/makeindex.test
 DISTCLEANFILES = nested-range.ilg nested-range.ind sample.*
 all: c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .lo .log .o .obj .pl .pl$(EXEEXT) .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -1003,13 +1004,20 @@ recheck: all
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
-tests/nested-range-test.pl.log: tests/nested-range-test.pl
-	@p='tests/nested-range-test.pl'; \
-	b='tests/nested-range-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+.pl.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.pl$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \
@@ -1334,7 +1342,7 @@ uninstall-man: uninstall-man1
 $(makeindex_OBJECTS): $(KPATHSEA_DEPEND)
 
 @KPATHSEA_RULE@
-tests/nested-range-test.pl.log tests/makeindex.log: makeindex$(EXEEXT)
+tests/nested-range-test.log tests/makeindex.log: makeindex$(EXEEXT)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 5f9639ef4bf..d01a1f11c43 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Better dependencies for 'make check'.
+
 2014-11-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* w64_wrapper/runscript.{dll,exe}: Now compiled with Mingw64 to
diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am
index ab4c5d27cb9..a6ea2e3f32b 100644
--- a/Build/source/texk/texlive/Makefile.am
+++ b/Build/source/texk/texlive/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = w32_wrapper w64_wrapper
 
 ## Tests
 ##
+TEST_EXTENSIONS = .pl
 TESTS = tests/updmap-cmdline-test.pl
 EXTRA_DIST += $(TESTS)
 
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index c2dba56531d..d909c0db804 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -339,9 +339,11 @@ am__set_TESTS_bases = \
   bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
 TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.pl.log=.log)
+PL_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+PL_LOG_COMPILE = $(PL_LOG_COMPILER) $(AM_PL_LOG_FLAGS) $(PL_LOG_FLAGS)
 am__set_b = \
   case '$@' in \
     */*) \
@@ -352,12 +354,6 @@ am__set_b = \
     *) \
       b='$*';; \
   esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
 DIST_SUBDIRS = tl_scripts linked_scripts
 am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/compile \
@@ -500,11 +496,12 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = tl_scripts $(am__append_1)
 EXTRA_DIST = w32_wrapper w64_wrapper $(TESTS)
+TEST_EXTENSIONS = .pl
 TESTS = tests/updmap-cmdline-test.pl
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .log .test .test$(EXEEXT) .trs
+.SUFFIXES: .log .pl .pl$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -786,26 +783,19 @@ recheck: all
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
-tests/updmap-cmdline-test.pl.log: tests/updmap-cmdline-test.pl
-	@p='tests/updmap-cmdline-test.pl'; \
-	b='tests/updmap-cmdline-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.test.log:
+.pl.log:
 	@p='$<'; \
 	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@.pl$(EXEEXT).log:
 @am__EXEEXT_TRUE@	@p='$<'; \
 @am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
 @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 4261f2d5d10..fe7fa3586e6 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,13 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* mftraptest (removed): Renamed ...
+	* mftraptest.test (new):  ... into this.
+	* triptest (removed): Renamed ...
+	* triptest.test (new):... into this.
+	* triptrap-sh: Adapted.
+	* Makefile.am, am/bootstrap.am, am/cweb.am, am/texmf.am,
+	am/web.am, libmd5/am/md5.am: Dependencies for 'make check'.
+
 2015-07-09  Akira Kakuto  <kakuto@fuk.kinidai.ac.jp>
 
 	* texmfmp.h: Add \pdfmdfivesum to XeTeX.
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 3ba66ee54db..57e47a0e7a0 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -4,7 +4,7 @@
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
-## Not yet for C, C++, and ObjC++ (too many warnings or not yet implemented)
+## Not yet for C++ and ObjC++ (too many warnings)
 AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
 AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
@@ -25,11 +25,11 @@ lib_LTLIBRARIES =
 noinst_PROGRAMS =
 dist_man_MANS =
 nodist_man_MANS =
-check_PROGRAMS =
+TEST_EXTENSIONS = .pl .test
 TESTS =
 EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h
 DISTCLEANFILES = CXXLD.sh
-CLEANFILES =
+CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
 TRIPTRAP_CLEAN =
 TRIPTRAP =
 bin_links =
@@ -236,11 +236,6 @@ include $(srcdir)/xetexdir/am/xetex.am
 ## omegaware web programs
 include $(srcdir)/omegaware/am/omegaware.am
 
-## programs required for 'make check' in omegafonts/ and omegaware/
-if OTANGLE
-check_PROGRAMS += pltotf tftopl
-endif OTANGLE
-
 ## Aleph
 include $(srcdir)/alephdir/am/aleph.am
 
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 6649cbf38ce..eeaf141e825 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -100,7 +100,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
 	euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
 	pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
 	txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_4) \
-	aleph$(EXEEXT) synctex$(EXEEXT)
+	aleph$(EXEEXT) synctex$(EXEEXT) md5main$(EXEEXT)
 bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
@@ -112,245 +112,230 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
 	$(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27) \
 	$(am__EXEEXT_28) $(am__EXEEXT_29) $(am__EXEEXT_30)
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
-	$(am__EXEEXT_42) $(am__EXEEXT_43) $(am__EXEEXT_44) \
-	$(am__EXEEXT_45) $(am__EXEEXT_46) $(am__EXEEXT_47) \
-	$(am__EXEEXT_48) $(am__EXEEXT_49) $(am__EXEEXT_50)
-check_PROGRAMS = $(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \
+	$(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \
 	$(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
-	$(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \
-	$(am__EXEEXT_40) $(am__EXEEXT_41) md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_53) ctiedir/ctie.test \
+	$(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39)
+TESTS = tangle.test $(am__EXEEXT_42) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
-	$(am__append_17) $(am__append_28) $(am__append_39) \
-	$(am__append_48) $(am__append_62) $(am__append_63) \
-	$(am__append_65) $(am__append_71) $(am__append_75) \
-	$(am__append_77) $(am__append_83) $(am__append_87) \
-	$(am__append_89) $(am__append_95) $(am__append_106) \
-	$(am__append_107) $(am__append_115) $(am__append_117) \
-	$(am__append_120) $(am__append_154) libmd5/md5.test
+	$(am__append_16) $(am__append_26) $(am__append_36) \
+	$(am__append_44) $(am__append_57) $(am__append_58) \
+	$(am__append_60) $(am__append_65) $(am__append_68) \
+	$(am__append_70) $(am__append_75) $(am__append_78) \
+	$(am__append_80) $(am__append_85) $(am__append_96) \
+	$(am__append_97) $(am__append_105) $(am__append_107) \
+	$(am__append_109) $(am__append_143) libmd5/md5.test
 @WEB_TRUE@am__append_1 = $(web_programs)
 @WEB_TRUE@am__append_2 = $(web_tests)
 @TEX_TRUE@am__append_3 = tex
 @TEX_TRUE@@WIN32_TRUE@am__append_4 = initex
 @TEX_TRUE@@WIN32_FALSE@am__append_5 = tex$(EXEEXT):initex
 @TEX_TRUE@am__append_6 = $(tex_tests)
-@TEX_TRUE@am__append_7 = dvitype pltotf tftopl
-@TEX_TRUE@am__append_8 = trip.diffs
-@TEX_TRUE@am__append_9 = trip-clean
-@MF_TRUE@am__append_10 = mf
-@MFN_TRUE@@MF_TRUE@am__append_11 = mf-nowin
-@MF_TRUE@@WIN32_TRUE@am__append_12 = call_mf
-@MF_TRUE@@WIN32_TRUE@am__append_13 = install-mf-links
-@MF_TRUE@@WIN32_TRUE@am__append_14 = uninstall-mf-links
-@MFN_FALSE@@MF_TRUE@@WIN32_FALSE@am__append_15 = mf$(EXEEXT):mf-nowin
-@MF_TRUE@@WIN32_FALSE@am__append_16 = mf$(EXEEXT):inimf
-@MF_TRUE@am__append_17 = $(mf_tests)
-@MF_TRUE@am__append_18 = gftype tftopl
-@MF_TRUE@am__append_19 = mftrap.diffs
-@MF_TRUE@am__append_20 = trap-clean
-@MFLUA_TRUE@am__append_21 = mflua
-@MFLUAN_TRUE@@MFLUA_TRUE@am__append_22 = mflua-nowin
-@MFLUA_TRUE@@WIN32_TRUE@am__append_23 = call_mflua
-@MFLUA_TRUE@@WIN32_TRUE@am__append_24 = install-mflua-links
-@MFLUA_TRUE@@WIN32_TRUE@am__append_25 = uninstall-mflua-links
-@MFLUAN_FALSE@@MFLUA_TRUE@@WIN32_FALSE@am__append_26 = mflua$(EXEEXT):mflua-nowin
-@MFLUA_TRUE@@WIN32_FALSE@am__append_27 = mflua$(EXEEXT):inimflua
-@MFLUA_TRUE@am__append_28 = $(mflua_tests)
-@MFLUA_TRUE@am__append_29 = gftype tftopl
-@MFLUA_TRUE@am__append_30 = mfluatrap.diffs
-@MFLUA_TRUE@am__append_31 = mfluatrap-clean
-@MFLUAJIT_TRUE@am__append_32 = mfluajit
-@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@am__append_33 = mfluajit-nowin
-@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_34 = call_mfluajit
-@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_35 = install-mfluajit-links
-@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_36 = uninstall-mfluajit-links
-@MFLUAJITN_FALSE@@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_37 = mfluajit$(EXEEXT):mfluajit-nowin
-@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_38 = mfluajit$(EXEEXT):inimfluajit
-@MFLUAJIT_TRUE@am__append_39 = $(mfluajit_tests)
-@MFLUAJIT_TRUE@am__append_40 = gftype tftopl
-@MFLUAJIT_TRUE@am__append_41 = mfluajittrap.diffs
-@MFLUAJIT_TRUE@am__append_42 = mfluajittrap-clean
-@MP_TRUE@am__append_43 = mpost
-@MP_TRUE@@WIN32_TRUE@am__append_44 = call_mpost
-@MP_TRUE@@WIN32_TRUE@am__append_45 = install-mpost-links
-@MP_TRUE@@WIN32_TRUE@am__append_46 = uninstall-mpost-links
-@MP_TRUE@@WIN32_FALSE@am__append_47 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):mfplain
-@MP_TRUE@am__append_48 = $(mp_tests)
-@MP_TRUE@am__append_49 = pltotf tftopl
-@MP_TRUE@am__append_50 = mptrap.diffs
-@MP_TRUE@am__append_51 = mptrap-clean
-@PMP_TRUE@am__append_52 = pmpost
-@PMP_TRUE@@WIN32_TRUE@am__append_53 = call_pmpost
-@PMP_TRUE@@WIN32_TRUE@am__append_54 = install-pmpost-links
-@PMP_TRUE@@WIN32_TRUE@am__append_55 = uninstall-pmpost-links
-@PMP_TRUE@@WIN32_FALSE@am__append_56 = pmpost$(EXEEXT):pdvitomp
-@UPMP_TRUE@am__append_57 = upmpost
-@UPMP_TRUE@@WIN32_TRUE@am__append_58 = call_upmpost
-@UPMP_TRUE@@WIN32_TRUE@am__append_59 = install-upmpost-links
-@UPMP_TRUE@@WIN32_TRUE@am__append_60 = uninstall-upmpost-links
-@UPMP_TRUE@@WIN32_FALSE@am__append_61 = upmpost$(EXEEXT):updvitomp
-@PMP_TRUE@am__append_62 = $(pmpost_tests)
-@UPMP_TRUE@am__append_63 = $(upmpost_tests)
-@ETEX_TRUE@am__append_64 = etex
-@ETEX_TRUE@am__append_65 = $(etex_tests)
-@ETEX_TRUE@am__append_66 = dvitype pltotf tftopl
-@ETEX_TRUE@am__append_67 = etrip.diffs
-@ETEX_TRUE@am__append_68 = etrip-clean
-@PTEX_TRUE@am__append_69 = ptex
-@PWEB_TRUE@am__append_70 = $(pweb_programs)
-@PTEX_TRUE@am__append_71 = $(ptex_tests)
-@PTEX_TRUE@am__append_72 = dvitype pltotf tftopl
-@PTEX_TRUE@am__append_73 = ptrip.diffs
-@PTEX_TRUE@am__append_74 = ptrip-clean
-@PWEB_TRUE@am__append_75 = $(pweb_tests)
-@EPTEX_TRUE@am__append_76 = eptex
-@EPTEX_TRUE@am__append_77 = $(eptex_tests)
-@EPTEX_TRUE@am__append_78 = dvitype pltotf tftopl
-@EPTEX_TRUE@am__append_79 = eptrip.diffs
-@EPTEX_TRUE@am__append_80 = eptrip-clean
-@UPTEX_TRUE@am__append_81 = uptex
-@UPWEB_TRUE@am__append_82 = $(upweb_programs)
-@UPTEX_TRUE@am__append_83 = $(uptex_tests)
-@UPTEX_TRUE@am__append_84 = dvitype pltotf tftopl
-@UPTEX_TRUE@am__append_85 = uptrip.diffs
-@UPTEX_TRUE@am__append_86 = uptrip-clean
-@UPWEB_TRUE@am__append_87 = $(upweb_tests)
-@EUPTEX_TRUE@am__append_88 = euptex
-@EUPTEX_TRUE@am__append_89 = $(euptex_tests)
-@EUPTEX_TRUE@am__append_90 = dvitype pltotf tftopl
-@EUPTEX_TRUE@am__append_91 = euptrip.diffs
-@EUPTEX_TRUE@am__append_92 = euptrip-clean
-@MINGW32_TRUE@am__append_93 = \
+@TEX_TRUE@am__append_7 = trip.diffs
+@TEX_TRUE@am__append_8 = trip-clean
+@MF_TRUE@am__append_9 = mf
+@MFN_TRUE@@MF_TRUE@am__append_10 = mf-nowin
+@MF_TRUE@@WIN32_TRUE@am__append_11 = call_mf
+@MF_TRUE@@WIN32_TRUE@am__append_12 = install-mf-links
+@MF_TRUE@@WIN32_TRUE@am__append_13 = uninstall-mf-links
+@MFN_FALSE@@MF_TRUE@@WIN32_FALSE@am__append_14 = mf$(EXEEXT):mf-nowin
+@MF_TRUE@@WIN32_FALSE@am__append_15 = mf$(EXEEXT):inimf
+@MF_TRUE@am__append_16 = $(mf_tests)
+@MF_TRUE@am__append_17 = mftrap.diffs
+@MF_TRUE@am__append_18 = trap-clean
+@MFLUA_TRUE@am__append_19 = mflua
+@MFLUAN_TRUE@@MFLUA_TRUE@am__append_20 = mflua-nowin
+@MFLUA_TRUE@@WIN32_TRUE@am__append_21 = call_mflua
+@MFLUA_TRUE@@WIN32_TRUE@am__append_22 = install-mflua-links
+@MFLUA_TRUE@@WIN32_TRUE@am__append_23 = uninstall-mflua-links
+@MFLUAN_FALSE@@MFLUA_TRUE@@WIN32_FALSE@am__append_24 = mflua$(EXEEXT):mflua-nowin
+@MFLUA_TRUE@@WIN32_FALSE@am__append_25 = mflua$(EXEEXT):inimflua
+@MFLUA_TRUE@am__append_26 = $(mflua_tests)
+@MFLUA_TRUE@am__append_27 = mfluatrap.diffs
+@MFLUA_TRUE@am__append_28 = mfluatrap-clean
+@MFLUAJIT_TRUE@am__append_29 = mfluajit
+@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@am__append_30 = mfluajit-nowin
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_31 = call_mfluajit
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_32 = install-mfluajit-links
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_33 = uninstall-mfluajit-links
+@MFLUAJITN_FALSE@@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_34 = mfluajit$(EXEEXT):mfluajit-nowin
+@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_35 = mfluajit$(EXEEXT):inimfluajit
+@MFLUAJIT_TRUE@am__append_36 = $(mfluajit_tests)
+@MFLUAJIT_TRUE@am__append_37 = mfluajittrap.diffs
+@MFLUAJIT_TRUE@am__append_38 = mfluajittrap-clean
+@MP_TRUE@am__append_39 = mpost
+@MP_TRUE@@WIN32_TRUE@am__append_40 = call_mpost
+@MP_TRUE@@WIN32_TRUE@am__append_41 = install-mpost-links
+@MP_TRUE@@WIN32_TRUE@am__append_42 = uninstall-mpost-links
+@MP_TRUE@@WIN32_FALSE@am__append_43 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):mfplain
+@MP_TRUE@am__append_44 = $(mp_tests)
+@MP_TRUE@am__append_45 = mptrap.diffs
+@MP_TRUE@am__append_46 = mptrap-clean
+@PMP_TRUE@am__append_47 = pmpost
+@PMP_TRUE@@WIN32_TRUE@am__append_48 = call_pmpost
+@PMP_TRUE@@WIN32_TRUE@am__append_49 = install-pmpost-links
+@PMP_TRUE@@WIN32_TRUE@am__append_50 = uninstall-pmpost-links
+@PMP_TRUE@@WIN32_FALSE@am__append_51 = pmpost$(EXEEXT):pdvitomp
+@UPMP_TRUE@am__append_52 = upmpost
+@UPMP_TRUE@@WIN32_TRUE@am__append_53 = call_upmpost
+@UPMP_TRUE@@WIN32_TRUE@am__append_54 = install-upmpost-links
+@UPMP_TRUE@@WIN32_TRUE@am__append_55 = uninstall-upmpost-links
+@UPMP_TRUE@@WIN32_FALSE@am__append_56 = upmpost$(EXEEXT):updvitomp
+@PMP_TRUE@am__append_57 = $(pmpost_tests)
+@UPMP_TRUE@am__append_58 = $(upmpost_tests)
+@ETEX_TRUE@am__append_59 = etex
+@ETEX_TRUE@am__append_60 = $(etex_tests)
+@ETEX_TRUE@am__append_61 = etrip.diffs
+@ETEX_TRUE@am__append_62 = etrip-clean
+@PTEX_TRUE@am__append_63 = ptex
+@PWEB_TRUE@am__append_64 = $(pweb_programs)
+@PTEX_TRUE@am__append_65 = $(ptex_tests)
+@PTEX_TRUE@am__append_66 = ptrip.diffs
+@PTEX_TRUE@am__append_67 = ptrip-clean
+@PWEB_TRUE@am__append_68 = $(pweb_tests)
+@EPTEX_TRUE@am__append_69 = eptex
+@EPTEX_TRUE@am__append_70 = $(eptex_tests)
+@EPTEX_TRUE@am__append_71 = eptrip.diffs
+@EPTEX_TRUE@am__append_72 = eptrip-clean
+@UPTEX_TRUE@am__append_73 = uptex
+@UPWEB_TRUE@am__append_74 = $(upweb_programs)
+@UPTEX_TRUE@am__append_75 = $(uptex_tests)
+@UPTEX_TRUE@am__append_76 = uptrip.diffs
+@UPTEX_TRUE@am__append_77 = uptrip-clean
+@UPWEB_TRUE@am__append_78 = $(upweb_tests)
+@EUPTEX_TRUE@am__append_79 = euptex
+@EUPTEX_TRUE@am__append_80 = $(euptex_tests)
+@EUPTEX_TRUE@am__append_81 = euptrip.diffs
+@EUPTEX_TRUE@am__append_82 = euptrip-clean
+@MINGW32_TRUE@am__append_83 = \
 @MINGW32_TRUE@	pdftexdir/regex/regex.c \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
-@PDFTEX_TRUE@am__append_94 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_95 = $(pdftex_tests) $(ttf2afm_tests) \
+@PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \
 @PDFTEX_TRUE@	$(pdftosrc_tests)
-@LUATEX_TRUE@am__append_96 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_97 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_98 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_99 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_100 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
-@LUAJITTEX_TRUE@am__append_101 = luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_102 = call_luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_103 = install-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_104 = uninstall-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_105 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
-@LUATEX_TRUE@am__append_106 = $(luatex_tests)
-@LUAJITTEX_TRUE@am__append_107 = $(luajittex_tests)
-@LUATEX_TRUE@@cross_FALSE@am__append_108 = txt2zlib
-@XETEX_TRUE@am__append_109 = xetex
-@XETEX_MACOSX_TRUE@am__append_110 = -DXETEX_MAC
-@XETEX_MACOSX_FALSE@am__append_111 = $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_112 = $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_TRUE@am__append_113 = \
+@LUATEX_TRUE@am__append_86 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_87 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_88 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_89 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUAJITTEX_TRUE@am__append_91 = luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_92 = call_luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_93 = install-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_94 = uninstall-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_95 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+@LUATEX_TRUE@am__append_96 = $(luatex_tests)
+@LUAJITTEX_TRUE@am__append_97 = $(luajittex_tests)
+@LUATEX_TRUE@@cross_FALSE@am__append_98 = txt2zlib
+@XETEX_TRUE@am__append_99 = xetex
+@XETEX_MACOSX_TRUE@am__append_100 = -DXETEX_MAC
+@XETEX_MACOSX_FALSE@am__append_101 = $(FONTCONFIG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_102 = $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_TRUE@am__append_103 = \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.mm \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
 
-@XETEX_MACOSX_FALSE@am__append_114 = \
+@XETEX_MACOSX_FALSE@am__append_104 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h
 
-@XETEX_TRUE@am__append_115 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_116 = $(omegaware_programs)
-@OTANGLE_TRUE@am__append_117 = $(OTANGLE_tests) $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_118 = pltotf tftopl
-@ALEPH_TRUE@am__append_119 = aleph
-@ALEPH_TRUE@am__append_120 = $(aleph_tests)
-@SYNCTEX_TRUE@am__append_121 = synctex
-@SYNCTEX_TRUE@am__append_122 = $(LTLIBSYNCTEX)
-@SYNCTEX_TRUE@am__append_123 = $(LIBSYNCTEX)
-@MINGW32_TRUE@am__append_124 = -lshlwapi
-@MINGW32_TRUE@am__append_125 = -lshlwapi
-@TEX_SYNCTEX_TRUE@am__append_126 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_105 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_106 = $(omegaware_programs)
+@OTANGLE_TRUE@am__append_107 = $(OTANGLE_tests) $(OMFONTS_tests)
+@ALEPH_TRUE@am__append_108 = aleph
+@ALEPH_TRUE@am__append_109 = $(aleph_tests)
+@SYNCTEX_TRUE@am__append_110 = synctex
+@SYNCTEX_TRUE@am__append_111 = $(LTLIBSYNCTEX)
+@SYNCTEX_TRUE@am__append_112 = $(LIBSYNCTEX)
+@MINGW32_TRUE@am__append_113 = -lshlwapi
+@MINGW32_TRUE@am__append_114 = -lshlwapi
+@TEX_SYNCTEX_TRUE@am__append_115 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_129 = \
+@TEX_SYNCTEX_TRUE@am__append_116 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_117 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_118 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_130 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_119 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_133 = \
+@ETEX_SYNCTEX_TRUE@am__append_120 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_121 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_122 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@PTEX_SYNCTEX_TRUE@am__append_134 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_123 = -I$(srcdir)/synctexdir \
 @PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_137 = \
+@PTEX_SYNCTEX_TRUE@am__append_124 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_125 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_126 = \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-ptex.h
 
-@UPTEX_SYNCTEX_TRUE@am__append_138 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_127 = -I$(srcdir)/synctexdir \
 @UPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @UPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_140 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_141 = \
+@UPTEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_130 = \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-uptex.h
 
-@EPTEX_SYNCTEX_TRUE@am__append_142 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_131 = -I$(srcdir)/synctexdir \
 @EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_143 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_144 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_145 = \
+@EPTEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_134 = \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-eptex.h
 
-@EUPTEX_SYNCTEX_TRUE@am__append_146 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_135 = -I$(srcdir)/synctexdir \
 @EUPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EUPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_147 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_148 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_149 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_138 = \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-euptex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_150 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_139 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_151 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_140 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_152 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_153 = \
+@XETEX_SYNCTEX_TRUE@am__append_142 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
-@SYNCTEX_TRUE@am__append_154 = $(synctex_tests)
+@SYNCTEX_TRUE@am__append_143 = $(synctex_tests)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -1042,32 +1027,15 @@ am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
 @OTANGLE_TRUE@am__EXEEXT_28 = $(am__EXEEXT_4)
 @ALEPH_TRUE@am__EXEEXT_29 = aleph$(EXEEXT)
 @SYNCTEX_TRUE@am__EXEEXT_30 = synctex$(EXEEXT)
-@TEX_TRUE@am__EXEEXT_31 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
-@TEX_TRUE@	tftopl$(EXEEXT)
-@MF_TRUE@am__EXEEXT_32 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MFLUA_TRUE@am__EXEEXT_33 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MFLUAJIT_TRUE@am__EXEEXT_34 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@am__EXEEXT_35 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_36 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
-@ETEX_TRUE@	tftopl$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_37 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
-@PTEX_TRUE@	tftopl$(EXEEXT)
-@EPTEX_TRUE@am__EXEEXT_38 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
-@EPTEX_TRUE@	tftopl$(EXEEXT)
-@UPTEX_TRUE@am__EXEEXT_39 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
-@UPTEX_TRUE@	tftopl$(EXEEXT)
-@EUPTEX_TRUE@am__EXEEXT_40 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
-@EUPTEX_TRUE@	tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_41 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@MF_TRUE@@WIN32_TRUE@am__EXEEXT_42 = call_mf$(EXEEXT)
-@MFLUA_TRUE@@WIN32_TRUE@am__EXEEXT_43 = call_mflua$(EXEEXT)
-@MFLUAJIT_TRUE@@WIN32_TRUE@am__EXEEXT_44 = call_mfluajit$(EXEEXT)
-@MP_TRUE@@WIN32_TRUE@am__EXEEXT_45 = call_mpost$(EXEEXT)
-@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_46 = call_pmpost$(EXEEXT)
-@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_47 = call_upmpost$(EXEEXT)
-@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_48 = call_luatex$(EXEEXT)
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_49 = call_luajittex$(EXEEXT)
-@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_50 = txt2zlib$(EXEEXT)
+@MF_TRUE@@WIN32_TRUE@am__EXEEXT_31 = call_mf$(EXEEXT)
+@MFLUA_TRUE@@WIN32_TRUE@am__EXEEXT_32 = call_mflua$(EXEEXT)
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__EXEEXT_33 = call_mfluajit$(EXEEXT)
+@MP_TRUE@@WIN32_TRUE@am__EXEEXT_34 = call_mpost$(EXEEXT)
+@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_pmpost$(EXEEXT)
+@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_36 = call_upmpost$(EXEEXT)
+@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_luatex$(EXEEXT)
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_38 = call_luajittex$(EXEEXT)
+@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_39 = txt2zlib$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \
 	alephdir/aleph-alephbis.$(OBJEXT) \
@@ -1846,17 +1814,19 @@ am__set_TESTS_bases = \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_51 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_40 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
 	gftopk.test gftype.test mft.test patgen.test pktogf.test \
 	pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
 	vptovf.test weave.test
-am__EXEEXT_52 = $(am__EXEEXT_51) tests/bibtex-openout-test.pl \
+am__EXEEXT_41 = $(am__EXEEXT_40) tests/bibtex-openout-test.pl \
 	tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_53 = $(am__EXEEXT_52)
+@WEB_TRUE@am__EXEEXT_42 = $(am__EXEEXT_41)
 TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+am__test_logs3 = $(am__test_logs2:.pl.log=.log)
+PL_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+PL_LOG_COMPILE = $(PL_LOG_COMPILER) $(AM_PL_LOG_FLAGS) $(PL_LOG_FLAGS)
 am__set_b = \
   case '$@' in \
     */*) \
@@ -1867,9 +1837,7 @@ am__set_b = \
     *) \
       b='$*';; \
   esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOGS = $(am__test_logs3:.test.log=.log)
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
@@ -2194,10 +2162,11 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluajit.a libmputil.a \
 	libff.a libjitff.a libluatex.a libluajittex.a libxetex.a \
 	libsynctex.a libmd5.a
 EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_123)
-lib_LTLIBRARIES = $(am__append_122)
+lib_LIBRARIES = $(am__append_112)
+lib_LTLIBRARIES = $(am__append_111)
 dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 nodist_man_MANS = 
+TEST_EXTENSIONS = .pl .test
 EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
 	ctangleboot.cin cwebboot.cin cwebboot.hin tangle.test \
@@ -2290,48 +2259,48 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	etexdir/etrip/etrip1.in etexdir/etrip/etrip2.in \
 	etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
 	etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
-	etexdir/etrip/trip2.in $(ptex_tests) $(pweb_tests) \
-	$(ptex_web_srcs) $(ptex_ch_srcs) 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 \
-	ptexdir/tests/sample.dvi ptexdir/tests/min10.pl \
-	ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
-	ptexdir/tests/tmin10.tfm ptexdir/ptrip/ptrip.diffs \
-	ptexdir/ptrip/texmf.cnf $(eptex_tests) $(eptex_web_srcs) \
-	$(eptex_ch_srcs) eptexdir/eptex.defines eptexdir/ChangeLog \
-	eptexdir/Changes.txt eptexdir/README.txt \
-	eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/eptrip.log \
-	eptexdir/eptrip/eptrip.tex eptexdir/eptrip/texmf.cnf \
-	$(uptex_tests) $(upweb_tests) $(uptex_web_srcs) \
-	$(uptex_ch_srcs) uptexdir/uptex.defines ptexdir/pbibtex.ch \
-	uptexdir/upbibtex.ch ptexdir/pdvitype.ch uptexdir/updvitype.ch \
-	ptexdir/ppltotf.ch uptexdir/uppltotf.ch ptexdir/ptftopl.ch \
-	uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.jis \
-	uptexdir/ChangeLog uptexdir/tests/min10.pl \
+	etexdir/etrip/trip2.in $(ptex_web_srcs) $(ptex_ch_srcs) \
+	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 \
+	$(ptex_tests) $(pweb_tests) 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 ptexdir/tests/sample.dvi \
+	ptexdir/tests/min10.pl ptexdir/tests/min10.tfm \
+	ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm \
+	ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \
+	$(eptex_web_srcs) $(eptex_ch_srcs) eptexdir/eptex.defines \
+	eptexdir/ChangeLog eptexdir/Changes.txt eptexdir/README.txt \
+	$(eptex_tests) eptexdir/eptrip/eptrip.diffs \
+	eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
+	eptexdir/eptrip/texmf.cnf $(uptex_web_srcs) $(uptex_ch_srcs) \
+	uptexdir/uptex.defines ptexdir/pbibtex.ch uptexdir/upbibtex.ch \
+	ptexdir/pdvitype.ch uptexdir/updvitype.ch ptexdir/ppltotf.ch \
+	uptexdir/uppltotf.ch ptexdir/ptftopl.ch uptexdir/uptftopl.ch \
+	uptexdir/COPYRIGHT uptexdir/COPYRIGHT.jis uptexdir/ChangeLog \
+	$(uptex_tests) $(upweb_tests) uptexdir/tests/min10.pl \
 	uptexdir/tests/min10.tfm uptexdir/tests/tmin10.pl \
 	uptexdir/tests/tmin10.tfm uptexdir/uptrip/uptrip.diffs \
-	uptexdir/uptrip/texmf.cnf $(euptex_tests) $(euptex_web_srcs) \
-	$(euptex_ch_srcs) euptexdir/euptex.defines euptexdir/COPYRIGHT \
+	uptexdir/uptrip/texmf.cnf $(euptex_web_srcs) $(euptex_ch_srcs) \
+	euptexdir/euptex.defines euptexdir/COPYRIGHT \
 	euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
-	euptexdir/EUPTEX.txt eptexdir/eptrip/eptrip.log \
-	eptexdir/eptrip/eptrip.tex euptexdir/euptrip/euptrip.diffs \
-	euptexdir/euptrip/texmf.cnf pdftexdir/regex/COPYING.LIB \
-	pdftexdir/regex/README $(pdftex_ch_srcs) \
-	pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \
-	pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
-	tests/wprob.tex pdftexdir/tests/pdfimage.tex tests/1-4.jpg \
-	tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \
-	$(ttf2afm_tests) pdftexdir/tests/postV3.afm \
-	pdftexdir/tests/postV3.ttf pdftexdir/tests/postV7.afm \
-	pdftexdir/tests/postV7.ttf $(pdftosrc_tests) \
-	pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \
-	pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref \
-	$(libluasocket_sources) luatexdir/luasocket/src/ftp_lua.c \
+	euptexdir/EUPTEX.txt $(euptex_tests) \
+	eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
+	euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \
+	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
+	$(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/ChangeLog \
+	pdftexdir/NEWS pdftexdir/README pdftexdir/change-files.txt \
+	$(pdftex_tests) tests/wprob.tex pdftexdir/tests/pdfimage.tex \
+	tests/1-4.jpg tests/B.pdf tests/basic.tex \
+	tests/lily-ledger-broken.png $(ttf2afm_tests) \
+	pdftexdir/tests/postV3.afm pdftexdir/tests/postV3.ttf \
+	pdftexdir/tests/postV7.afm pdftexdir/tests/postV7.ttf \
+	$(pdftosrc_tests) pdftexdir/tests/test-13.pdf \
+	pdftexdir/tests/test-13.xref pdftexdir/tests/test-15.pdf \
+	pdftexdir/tests/test-15.xref $(libluasocket_sources) \
+	luatexdir/luasocket/src/ftp_lua.c \
 	luatexdir/luasocket/src/headers_lua.c \
 	luatexdir/luasocket/src/http_lua.c \
 	luatexdir/luasocket/src/ltn12_lua.c \
@@ -2527,20 +2496,20 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	mpmathdouble-tangle mpstrings-tangle psout-tangle \
 	svgout-tangle pngout-tangle $(nodist_etex_SOURCES) etex.web \
 	etex.ch etex-web2c etex.p etex.pool etex-tangle etrip.diffs \
-	ewprob.log ewprob.tex $(pweb_programs:=.c) \
+	ewprob.log ewprob.tex $(nodist_ptex_SOURCES) ptex.web ptex.ch \
+	ptex-web2c ptex.p ptex.pool ptex-tangle $(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 ptests/nissya_bib.* ptests/xexampl.aux \
-	ptests/xexampl.bbl ptests/xexampl.blg ptests/memtest.bib \
-	ptests/memtest?.* ptests/xstory.dvityp ptests/xpagenum.typ \
-	ptests/xcmr10.tfm ptests/xcmr10.pl ptests/xsample.typ \
-	ptests/x*min10.* ptrip.diffs $(nodist_eptex_SOURCES) eptex.web \
-	eptex.ch eptex-web2c eptex.p eptex.pool eptex-tangle \
-	eptrip.diffs $(upweb_programs:=.c) $(upweb_programs:=.h) \
-	$(upweb_programs:=.p) $(upweb_programs:=-web2c) \
-	$(upweb_programs:=.web) $(nodist_uptex_SOURCES) uptex.web \
-	uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \
+	ptests/nissya_bib.* ptests/xexampl.aux ptests/xexampl.bbl \
+	ptests/xexampl.blg ptests/memtest.bib ptests/memtest?.* \
+	ptests/xstory.dvityp ptests/xpagenum.typ ptests/xcmr10.tfm \
+	ptests/xcmr10.pl ptests/xsample.typ ptests/x*min10.* \
+	ptrip.diffs $(nodist_eptex_SOURCES) eptex.web eptex.ch \
+	eptex-web2c eptex.p eptex.pool eptex-tangle eptrip.diffs \
+	$(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \
+	uptex.pool uptex-tangle $(upweb_programs:=.c) \
+	$(upweb_programs:=.h) $(upweb_programs:=.p) \
+	$(upweb_programs:=-web2c) $(upweb_programs:=.web) \
 	uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \
 	uptests/xstory.dvityp uptests/xpagenum.typ uptests/xcmr10.tfm \
 	uptests/xcmr10.pl uptests/x*min10.* uptrip.diffs \
@@ -2573,25 +2542,25 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	omegaware/tests/yrepeat* omegaware/tests/*yarabic* \
 	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
 	aleph.pool aleph-tangle
-CLEANFILES = 
-TRIPTRAP_CLEAN = $(am__append_9) $(am__append_20) $(am__append_31) \
-	$(am__append_42) $(am__append_51) $(am__append_68) \
-	$(am__append_74) $(am__append_80) $(am__append_86) \
-	$(am__append_92)
-TRIPTRAP = $(am__append_8) $(am__append_19) $(am__append_30) \
-	$(am__append_41) $(am__append_50) $(am__append_67) \
-	$(am__append_73) $(am__append_79) $(am__append_85) \
-	$(am__append_91)
-bin_links = $(am__append_5) $(am__append_15) $(am__append_16) \
-	$(am__append_26) $(am__append_27) $(am__append_37) \
-	$(am__append_38) $(am__append_47) $(am__append_56) \
-	$(am__append_61) $(am__append_100) $(am__append_105)
-install_exe_links = $(am__append_13) $(am__append_24) $(am__append_35) \
-	$(am__append_45) $(am__append_54) $(am__append_59) \
-	$(am__append_98) $(am__append_103)
-uninstall_exe_links = $(am__append_14) $(am__append_25) \
-	$(am__append_36) $(am__append_46) $(am__append_55) \
-	$(am__append_60) $(am__append_99) $(am__append_104)
+CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
+TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_28) \
+	$(am__append_38) $(am__append_46) $(am__append_62) \
+	$(am__append_67) $(am__append_72) $(am__append_77) \
+	$(am__append_82)
+TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_27) \
+	$(am__append_37) $(am__append_45) $(am__append_61) \
+	$(am__append_66) $(am__append_71) $(am__append_76) \
+	$(am__append_81)
+bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
+	$(am__append_24) $(am__append_25) $(am__append_34) \
+	$(am__append_35) $(am__append_43) $(am__append_51) \
+	$(am__append_56) $(am__append_90) $(am__append_95)
+install_exe_links = $(am__append_12) $(am__append_22) $(am__append_32) \
+	$(am__append_41) $(am__append_49) $(am__append_54) \
+	$(am__append_88) $(am__append_93)
+uninstall_exe_links = $(am__append_13) $(am__append_23) \
+	$(am__append_33) $(am__append_42) $(am__append_50) \
+	$(am__append_55) $(am__append_89) $(am__append_94)
 NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
 	cwebdir/cweave.trs ctiedir/ctie.log ctiedir/ctie.trs \
 	tiedir/tie.log tiedir/tie.trs
@@ -2701,18 +2670,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 nodist_initex_SOURCES = callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_126)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_115)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_127)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_116)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_129)
+dist_tex_SOURCES = texextra.c $(am__append_118)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_128)
+tex_prereq = texd.h $(am__append_117)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -2723,7 +2692,7 @@ tex_ch_srcs = \
 
 # TeX tests
 #
-tex_tests = triptest tests/write18-quote-test.pl
+tex_tests = triptest.test tests/write18-quote-test.pl
 call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
 nodist_call_mf_SOURCES = callexe.c
 call_mf_LDADD = 
@@ -2755,7 +2724,7 @@ mf_ch_src = \
 
 # Metafont tests
 #
-mf_tests = mftraptest
+mf_tests = mftraptest.test
 call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
 nodist_call_mflua_SOURCES = callexe.c
 call_mflua_LDADD = 
@@ -2785,7 +2754,7 @@ mflua_ch_src = \
 
 # MFLua tests
 #
-mflua_tests = mfluadir/mfluatraptest
+mflua_tests = mfluadir/mfluatraptest.test
 call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
 nodist_call_mfluajit_SOURCES = callexe.c
 call_mfluajit_LDADD = 
@@ -2816,7 +2785,7 @@ mfluajit_ch_src = \
 
 # MFLua tests
 #
-mfluajit_tests = mfluajitdir/mfluajittraptest
+mfluajit_tests = mfluajitdir/mfluajittraptest.test
 mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
 mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
 	$(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a
@@ -2832,7 +2801,7 @@ mp_ctangle_sh = CWEBINPUTS=$(srcdir)/mplibdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle
 nodist_mpost_SOURCES = mpost.c $(mpxout_c_h)
 mpxout_c_h = mpxout.c mpxout.h
 mpost_web = mplibdir/mpost.w mplibdir/mpxout.w
-mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest
+mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
 call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
 nodist_call_pmpost_SOURCES = callexe.c
 call_pmpost_LDADD = 
@@ -2903,19 +2872,19 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
 	mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
 	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_119)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_131)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_120)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	etexdir/etex_version.h $(am__append_133)
+	etexdir/etex_version.h $(am__append_122)
 
 # 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_132)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_121)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -2932,38 +2901,29 @@ etex_ch_srcs = \
 
 # e-TeX Tests
 #
-etex_tests = etexdir/wprob.test etexdir/etriptest
+etex_tests = etexdir/wprob.test etexdir/etriptest.test
 ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
 ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
 ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
 p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
 pweb_programs = pbibtex pdvitype ppltotf ptftopl
-
-# pTeX Tests
-#
-ptex_tests = ptexdir/ptriptest
-pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
-	ptexdir/ppltotf.test ptexdir/ptftopl.test \
-	ptexdir/pbibtex-openout-test.pl \
-	ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
-	ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test
 pproglib = lib/libp.a
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_134)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_123)
 
 # With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_135)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_124)
 ptex_DEPENDENCIES = $(ptex_dependencies)
 
 # pTeX C sources
 ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
 nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
 dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
-	ptexdir/ptex_version.h $(am__append_137)
+	ptexdir/ptex_version.h $(am__append_126)
 
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_136)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_125)
 ptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2994,26 +2954,31 @@ ptftopl_CPPFLAGS = $(ptex_cppflags)
 ptftopl_LDADD = $(ptex_ldadd)
 ptftopl_DEPENDENCIES = $(ptex_dependencies)
 
-# e-pTeX Tests
+# pTeX Tests
 #
-eptex_tests = eptexdir/eptriptest
+ptex_tests = ptexdir/ptriptest.test
+pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
+	ptexdir/ppltotf.test ptexdir/ptftopl.test \
+	ptexdir/pbibtex-openout-test.pl \
+	ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
+	ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
-	$(am__append_142)
+	$(am__append_131)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(am__append_143)
+	$(ipc_socketlibs) libmd5.a $(am__append_132)
 eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a
 
 # e-pTeX C sources
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
 nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
 dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
-	eptexdir/eptex_version.h $(am__append_145)
+	eptexdir/eptex_version.h $(am__append_134)
 
 # We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
 eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
-	eptexdir/eptex_version.h $(am__append_144)
+	eptexdir/eptex_version.h $(am__append_133)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -3032,34 +2997,32 @@ eptex_ch_srcs = \
 	eptexdir/pdfutils.ch \
 	tex-binpool.ch
 
+
+# e-pTeX Tests
+#
+eptex_tests = eptexdir/eptriptest.test
 uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
 uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
 uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
 up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE)
 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 \
-	uptexdir/yokotate.test
 libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
 libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_138)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_127)
 
 # With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_139)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_128)
 uptex_DEPENDENCIES = $(uptex_dependencies)
 
 # upTeX C sources
 uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
 nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
 dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
-	uptexdir/uptex_version.h $(am__append_141)
+	uptexdir/uptex_version.h $(am__append_130)
 
 # We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
 uptex_prereq = uptexd.h ptexdir/ptex_version.h \
-	uptexdir/uptex_version.h $(am__append_140)
+	uptexdir/uptex_version.h $(am__append_129)
 uptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -3091,27 +3054,33 @@ uptftopl_CPPFLAGS = $(uptex_cppflags)
 uptftopl_LDADD = $(uptex_ldadd)
 uptftopl_DEPENDENCIES = $(uptex_dependencies)
 
-# e-upTeX Tests
-#
-euptex_tests = euptexdir/euptriptest
+# upTeX Tests
+uptex_tests = uptexdir/uptriptest.test
+upweb_tests = \
+	uptexdir/upbibtex.test \
+	uptexdir/updvitype.test \
+	uptexdir/uppltotf.test \
+	uptexdir/uptftopl.test \
+	uptexdir/yokotate.test
+
 euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
-	-I$(srcdir)/libmd5 $(am__append_146)
+	-I$(srcdir)/libmd5 $(am__append_135)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(am__append_147)
+	$(ipc_socketlibs) libmd5.a $(am__append_136)
 euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a
 
 # e-upTeX C sources
 euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
 nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
 dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
-	$(am__append_149)
+	$(am__append_138)
 
 # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
 euptex_prereq = euptexd.h etexdir/etex_version.h \
 	ptexdir/ptex_version.h eptexdir/eptex_version.h \
-	uptexdir/uptex_version.h $(am__append_148)
+	uptexdir/uptex_version.h $(am__append_137)
 euptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -3134,6 +3103,10 @@ euptex_ch_srcs = \
 	euptexdir/pdfstrcmp-eup-post.ch \
 	tex-binpool.ch
 
+
+# e-upTeX Tests
+#
+euptex_tests = euptexdir/euptriptest.test
 libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags)
 libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
 libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
@@ -3147,7 +3120,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/writejbig2.c pdftexdir/writejpg.c \
 	pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
 	pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
-	$(am__append_93)
+	$(am__append_83)
 @MINGW32_TRUE@REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
 EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
 	pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -3163,7 +3136,7 @@ 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 AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_150)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_139)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -3176,7 +3149,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
 	pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
-	$(am__append_151)
+	$(am__append_140)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -3612,17 +3585,17 @@ libxetex = libxetex.a
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
 	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
 	$(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \
-	$(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_110) \
-	$(am__append_111)
+	$(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_100) \
+	$(am__append_101)
 xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
 	$(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \
-	$(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_112)
+	$(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_102)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
 	$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
 	$(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
 	$(ZLIB_DEPEND) libmd5.a
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_152)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_141)
 xetex_CFLAGS = # $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -3633,7 +3606,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
 nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_153)
+	$(am__append_142)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
 	xetexdir/tex.ch0 \
@@ -3660,7 +3633,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \
 	xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
 	xetexdir/image/mfileio.h xetexdir/image/numbers.c \
 	xetexdir/image/numbers.h xetexdir/image/pngimage.c \
-	xetexdir/image/pngimage.h $(am__append_113) $(am__append_114)
+	xetexdir/image/pngimage.h $(am__append_103) $(am__append_104)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -3764,12 +3737,12 @@ synctex_SOURCES = \
 	synctexdir/synctex_main.c
 
 synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_124)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_113)
 libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
 libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
 libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
 libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_125)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_114)
 libsynctex_la_SOURCES = \
 	synctexdir/synctex_parser.c \
 	synctexdir/synctex_parser_local.h \
@@ -3880,7 +3853,7 @@ all: ff-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .pl .pl$(EXEEXT) .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
@@ -5035,15 +5008,6 @@ clean-binPROGRAMS:
 	echo " rm -f" $$list; \
 	rm -f $$list
 
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
@@ -14648,7 +14612,7 @@ check-TESTS:
 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
 	exit $$?;
-recheck: all $(check_PROGRAMS)
+recheck: all 
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 	@set +e; $(am__set_TESTS_bases); \
 	bases=`for i in $$bases; do echo $$i; done \
@@ -14659,111 +14623,20 @@ recheck: all $(check_PROGRAMS)
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
-tests/bibtex-openout-test.pl.log: tests/bibtex-openout-test.pl
-	@p='tests/bibtex-openout-test.pl'; \
-	b='tests/bibtex-openout-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/bibtex-longline-test.pl.log: tests/bibtex-longline-test.pl
-	@p='tests/bibtex-longline-test.pl'; \
-	b='tests/bibtex-longline-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-triptest.log: triptest
-	@p='triptest'; \
-	b='triptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/write18-quote-test.pl.log: tests/write18-quote-test.pl
-	@p='tests/write18-quote-test.pl'; \
-	b='tests/write18-quote-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-mftraptest.log: mftraptest
-	@p='mftraptest'; \
-	b='mftraptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-mfluadir/mfluatraptest.log: mfluadir/mfluatraptest
-	@p='mfluadir/mfluatraptest'; \
-	b='mfluadir/mfluatraptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-mfluajitdir/mfluajittraptest.log: mfluajitdir/mfluajittraptest
-	@p='mfluajitdir/mfluajittraptest'; \
-	b='mfluajitdir/mfluajittraptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-mplibdir/mptraptest.log: mplibdir/mptraptest
-	@p='mplibdir/mptraptest'; \
-	b='mplibdir/mptraptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-etexdir/etriptest.log: etexdir/etriptest
-	@p='etexdir/etriptest'; \
-	b='etexdir/etriptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-ptexdir/ptriptest.log: ptexdir/ptriptest
-	@p='ptexdir/ptriptest'; \
-	b='ptexdir/ptriptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-ptexdir/pbibtex-openout-test.pl.log: ptexdir/pbibtex-openout-test.pl
-	@p='ptexdir/pbibtex-openout-test.pl'; \
-	b='ptexdir/pbibtex-openout-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-ptexdir/pbibtex-longline-test.pl.log: ptexdir/pbibtex-longline-test.pl
-	@p='ptexdir/pbibtex-longline-test.pl'; \
-	b='ptexdir/pbibtex-longline-test.pl'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-eptexdir/eptriptest.log: eptexdir/eptriptest
-	@p='eptexdir/eptriptest'; \
-	b='eptexdir/eptriptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-uptexdir/uptriptest.log: uptexdir/uptriptest
-	@p='uptexdir/uptriptest'; \
-	b='uptexdir/uptriptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-euptexdir/euptriptest.log: euptexdir/euptriptest
-	@p='euptexdir/euptriptest'; \
-	b='euptexdir/euptriptest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+.pl.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.pl$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \
@@ -14971,7 +14844,6 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(MANS) \
@@ -15080,9 +14952,9 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-	clean-libLIBRARIES clean-libLTLIBRARIES clean-libtool \
-	clean-local clean-noinstPROGRAMS mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
+	clean-libLTLIBRARIES clean-libtool clean-local \
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -15166,12 +15038,12 @@ uninstall-man: uninstall-man1 uninstall-man5
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-TESTS check-am clean clean-binPROGRAMS \
-	clean-checkPROGRAMS clean-cscope clean-generic \
-	clean-libLIBRARIES clean-libLTLIBRARIES clean-libtool \
-	clean-local clean-noinstPROGRAMS cscope cscopelist-am ctags \
-	ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
+	clean-cscope clean-generic clean-libLIBRARIES \
+	clean-libLTLIBRARIES clean-libtool clean-local \
+	clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
@@ -15286,103 +15158,120 @@ $(ctangleboot_OBJECTS): cwebboot.h $(ctangleboot_DEPENDENCIES)
 	$(cp_silent)cp -f $< $@
 .hin.h:
 	$(cp_silent)cp -f $< $@
+tangle.log: tangle$(EXEEXT)
 bibtex.c bibtex.h: bibtex-web2c
 	@$(web2c) bibtex
 bibtex-web2c: bibtex.p $(web2c_depend) web2c/cvtbib.sed
 	@$(web2c) bibtex
 bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch
 	$(tangle) bibtex bibtex
+bibtex.log tests/bibtex-openout-test.log tests/bibtex-longline-test.log \
+	tests/bibtex-mem.log: bibtex$(EXEEXT)
 dvicopy.c dvicopy.h: dvicopy-web2c
 	@$(web2c) dvicopy
 dvicopy-web2c: dvicopy.p $(web2c_depend)
 	@$(web2c) dvicopy
 dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch
 	$(tangle) dvicopy dvicopy
+dvicopy.log: dvicopy$(EXEEXT)
 dvitype.c dvitype.h: dvitype-web2c
 	@$(web2c) dvitype
 dvitype-web2c: dvitype.p $(web2c_depend)
 	@$(web2c) dvitype
 dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch
 	$(tangle) dvitype dvitype
+dvitype.log: dvitype$(EXEEXT)
 gftodvi.c gftodvi.h: gftodvi-web2c
 	@$(web2c) gftodvi
 gftodvi-web2c: gftodvi.p $(web2c_depend)
 	@$(web2c) gftodvi
 gftodvi.p: tangle$(EXEEXT) gftodvi.web gftodvi.ch
 	$(tangle) gftodvi gftodvi
+gftodvi.log: gftodvi$(EXEEXT)
 gftopk.c gftopk.h: gftopk-web2c
 	@$(web2c) gftopk
 gftopk-web2c: gftopk.p $(web2c_depend)
 	@$(web2c) gftopk
 gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch
 	$(tangle) gftopk gftopk
+gftopk.log: gftopk$(EXEEXT)
 gftype.c gftype.h: gftype-web2c
 	@$(web2c) gftype
 gftype-web2c: gftype.p $(web2c_depend)
 	@$(web2c) gftype
 gftype.p: tangle$(EXEEXT) gftype.web gftype.ch
 	$(tangle) gftype gftype
+gftype.log: gftype$(EXEEXT)
 mft.c mft.h: mft-web2c
 	@$(web2c) mft
 mft-web2c: mft.p $(web2c_depend)
 	@$(web2c) mft
 mft.p: tangle$(EXEEXT) mft.web mft.ch
 	$(tangle) mft mft
+mft.log: mft$(EXEEXT)
 patgen.c patgen.h: patgen-web2c
 	@$(web2c) patgen
 patgen-web2c: patgen.p $(web2c_depend)
 	@$(web2c) patgen
 patgen.p: tangle$(EXEEXT) patgen.web patgen.ch
 	$(tangle) patgen patgen
+patgen.log: patgen$(EXEEXT)
 pktogf.c pktogf.h: pktogf-web2c
 	@$(web2c) pktogf
 pktogf-web2c: pktogf.p $(web2c_depend)
 	@$(web2c) pktogf
 pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch
 	$(tangle) pktogf pktogf
+pktogf.log: pktogf$(EXEEXT)
 pktype.c pktype.h: pktype-web2c
 	@$(web2c) pktype
 pktype-web2c: pktype.p $(web2c_depend)
 	@$(web2c) pktype
 pktype.p: tangle$(EXEEXT) pktype.web pktype.ch
 	$(tangle) pktype pktype
+pktype.log: pktype$(EXEEXT)
 pltotf.c pltotf.h: pltotf-web2c
 	@$(web2c) pltotf
 pltotf-web2c: pltotf.p $(web2c_depend)
 	@$(web2c) pltotf
 pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch
 	$(tangle) pltotf pltotf
+pltotf.log: pltotf$(EXEEXT)
 pooltype.c pooltype.h: pooltype-web2c
 	@$(web2c) pooltype
 pooltype-web2c: pooltype.p $(web2c_depend)
 	@$(web2c) pooltype
 pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch
 	$(tangle) pooltype pooltype
+pooltype.log: pooltype$(EXEEXT) tex.pool
 tftopl.c tftopl.h: tftopl-web2c
 	@$(web2c) tftopl
 tftopl-web2c: tftopl.p $(web2c_depend)
 	@$(web2c) tftopl
 tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch
 	$(tangle) tftopl tftopl
+tftopl.log: tftopl$(EXEEXT)
 vftovp.c vftovp.h: vftovp-web2c
 	@$(web2c) vftovp
 vftovp-web2c: vftovp.p $(web2c_depend)
 	@$(web2c) vftovp
 vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch
 	$(tangle) vftovp vftovp
+vftovp.log: vftovp$(EXEEXT)
 vptovf.c vptovf.h: vptovf-web2c
 	@$(web2c) vptovf
 vptovf-web2c: vptovf.p $(web2c_depend)
 	@$(web2c) vptovf
 vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch
 	$(tangle) vptovf vptovf
+vptovf.log: vptovf$(EXEEXT)
 weave.c weave.h: weave-web2c
 	@$(web2c) weave
 weave-web2c: weave.p $(web2c_depend)
 	@$(web2c) weave
 weave.p: tangle$(EXEEXT) weave.web weave.ch
 	$(tangle) weave weave
-pooltype.log: pooltype$(EXEEXT) tex.pool
+weave.log: weave$(EXEEXT)
 ctie.c: ctangle$(EXEEXT) ctiedir/ctie.w ctiedir/ctie-k.ch
 	$(ctangle_silent)CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch
 $(cweave_OBJECTS): cweb.h
@@ -15390,6 +15279,9 @@ cweave.c: ctangle$(EXEEXT) cwebdir/common.h cwebdir/cweave.w cwebdir/prod.w cweb
 	$(ctangle_silent)CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c
 tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
 	$(ctangle_silent)CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch
+ctiedir/ctie.log: ctie$(EXEEXT)
+cwebdir/cweave.log: cweave$(EXEEXT)
+tiedir/tie.log: tie$(EXEEXT)
 $(tex_OBJECTS): $(tex_prereq)
 
 $(tex_c_h): tex-web2c
@@ -15409,8 +15301,10 @@ 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)
+triptest.log: tex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+tests/write18-quote-test.log: tex$(EXEEXT)
 
-trip.diffs: tex$(EXEEXT)
+trip.diffs: tex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: trip-clean
 trip-clean:
@@ -15449,8 +15343,9 @@ 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)
+mftraptest.log: mf$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 
-mftrap.diffs: mf$(EXEEXT)
+mftrap.diffs: mf$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: trap-clean
 trap-clean:
@@ -15496,8 +15391,9 @@ mflua.web: tie$(EXEEXT) $(mflua_web_srcs)
 # Generate mflua.ch
 mflua.ch: tie$(EXEEXT) mflua.web $(mflua_ch_src)
 	$(tie_c) mflua.web $(mflua_ch_src)
+mfluadir/mfluatraptest.log: mflua$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 
-mfluatrap.diffs: mflua$(EXEEXT)
+mfluatrap.diffs: mflua$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: mfluatrap-clean
 mfluatrap-clean:
@@ -15538,8 +15434,9 @@ mfluajit.web: tie$(EXEEXT) $(mfluajit_web_srcs)
 # Generate mfluajit.ch
 mfluajit.ch: tie$(EXEEXT) mfluajit.web $(mfluajit_ch_src)
 	$(tie_c) mfluajit.web $(mfluajit_ch_src)
+mfluajitdir/mfluajittraptest.log: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 
-mfluajittrap.diffs: mfluajit$(EXEEXT)
+mfluajittrap.diffs: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: mfluajittrap-clean
 mfluajittrap-clean:
@@ -15562,7 +15459,9 @@ mpxout-tangle: ctangle$(EXEEXT) mplibdir/mpxout.w tangle-sh
 	@$(mp_ctangle_sh) mpxout
 
 $(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a $(LIBPNG_DEPEND)
-mptrap.diffs: mpost$(EXEEXT)
+mplibdir/dvitomp.log: mpost$(EXEEXT)
+mplibdir/mptraptest.log: mpost$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+mptrap.diffs: mpost$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: mptrap-clean
 mptrap-clean:
@@ -15726,7 +15625,9 @@ etex.web: tie$(EXEEXT) $(etex_web_srcs)
 # Generate etex.ch
 etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
 	$(tie_c) etex.web $(etex_ch_srcs)
-etrip.diffs: etex$(EXEEXT)
+etexdir/wprob.test: etex$(EXEEXT)
+etexdir/etriptest.log: etex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+etrip.diffs: etex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: etrip-clean
 etrip-clean:
@@ -15794,7 +15695,14 @@ ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
 	$(p_tangle) ptftopl ptftopl
 ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
 	$(tie_m) tftopl.web tftopl.ch
-ptrip.diffs: ptex$(EXEEXT)
+ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+ptexdir/pbibtex.log ptexdir/pbibtex-openout-test.log ptexdir/pbibtex-longline-test.log \
+	ptexdir/pbibtex-mem.log ptexdir/nissya.log: pbibtex$(EXEEXT)
+ptexdir/pdvitype.log ptexdir/sample.log: pdvitype$(EXEEXT)
+ptexdir/ppltotf.log: ppltotf$(EXEEXT)
+ptexdir/ptftopl.log: ptftopl$(EXEEXT)
+ptexdir/yokotate.log: ppltotf$(EXEEXT) ptftopl$(EXEEXT)
+ptrip.diffs: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: ptrip-clean
 ptrip-clean:
@@ -15827,7 +15735,8 @@ eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
 # Generate eptex.ch
 eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
 	$(tie_c) eptex.web $(eptex_ch_srcs)
-eptrip.diffs: eptex$(EXEEXT)
+eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+eptrip.diffs: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: eptrip-clean
 eptrip-clean:
@@ -15892,7 +15801,13 @@ 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) tftopl.web tftopl.ch ptexdir/ptftopl.ch
-uptrip.diffs: uptex$(EXEEXT)
+uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+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)
+uptrip.diffs: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: uptrip-clean
 uptrip-clean:
@@ -15920,7 +15835,8 @@ euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
 # Generate euptex.ch
 euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
 	$(tie_c) euptex.web $(euptex_ch_srcs)
-euptrip.diffs: euptex$(EXEEXT)
+euptexdir/euptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: euptrip-clean
 euptrip-clean:
@@ -16279,6 +16195,16 @@ ovp2ovf.web: tie$(EXEEXT) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
 	$(tie_m) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
 omegaware/odvicopy.log: odvicopy$(EXEEXT) odvitype$(EXEEXT)
 omegaware/odvitype.log: odvitype$(EXEEXT)
+omegaware/odvitype.log: odvitype$(EXEEXT)
+omegaware/bad.log omegaware/charwd.log omegaware/help.log omegaware/overbmp.log omegaware/repeat.log \
+	omegaware/selectfont.log omegaware/specialhex.log omegaware/version.log omegaware/vrepeat.log: \
+	wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) wovp2ovf$(EXEEXT)
+omegaware/check.log omegaware/level1.log omegaware/realnum.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT)
+omegaware/ligkern.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovp2ovf$(EXEEXT)
+omegaware/omfonts.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) wovp2ovf$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+omegaware/shorten.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) pltotf$(EXEEXT)
+omegaware/yannis.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) wovp2ovf$(EXEEXT) pltotf$(EXEEXT)
+omegaware/odvitype.log: odvitype$(EXEEXT)
 omegaware/otangle.log: otangle$(EXEEXT)
 
 # We must create alephd.h before building the aleph_OBJECTS.
@@ -16305,6 +16231,7 @@ $(synctex_OBJECTS): $(libsynctex)
 
 $(libsynctex_la_OBJECTS): $(ZLIB_DEPEND)
 $(libsynctex_a_OBJECTS): $(ZLIB_DEPEND)
+libmd5/md5.log: md5main$(EXEEXT)
 .PHONY: install-bin-links uninstall-bin-links
 
 install-bin-links:
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index 5d014fa404f..f37c6ddbcd6 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -1,6 +1,6 @@
 ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle.
 ##
-## 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.
 
 cp_silent = $(cp_silent_@AM_V@)
@@ -92,6 +92,7 @@ DISTCLEANFILES += ctangleboot.c cwebboot.c cwebboot.h
 EXTRA_DIST += tangle.test
 
 TESTS += tangle.test
+tangle.log: tangle$(EXEEXT)
 
 DISTCLEANFILES += cftest.p
 
diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am
index 574a411747e..b55ae163884 100644
--- a/Build/source/texk/web2c/am/cweb.am
+++ b/Build/source/texk/web2c/am/cweb.am
@@ -1,6 +1,6 @@
 ## texk/web2c/am/cweb.am: Makefile fragment for cweb programs (except ctangle).
 ##
-## 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.
 
 bin_PROGRAMS += ctie cweave tie
@@ -31,6 +31,9 @@ DISTCLEANFILES += tie.c
 ## Tests
 ##
 TESTS += ctiedir/ctie.test cwebdir/cweave.test tiedir/tie.test
+ctiedir/ctie.log: ctie$(EXEEXT)
+cwebdir/cweave.log: cweave$(EXEEXT)
+tiedir/tie.log: tie$(EXEEXT)
 
 ## ctiedir/ctie.test
 DISTCLEANFILES += ctie.outc ctie.outm
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index ff9dcc8645c..2ec67cbd27a 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -73,12 +73,13 @@ DISTCLEANFILES += $(nodist_tex_SOURCES) tex-final.ch tex-web2c \
 
 # TeX tests
 #
-tex_tests = triptest tests/write18-quote-test.pl
+tex_tests = triptest.test tests/write18-quote-test.pl
+triptest.log: tex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+tests/write18-quote-test.log: tex$(EXEEXT)
 EXTRA_DIST += $(tex_tests)
 EXTRA_DIST += tests/write18-quote.tex
 if TEX
 TESTS += $(tex_tests)
-check_PROGRAMS += dvitype pltotf tftopl
 TRIPTRAP += trip.diffs
 TRIPTRAP_CLEAN += trip-clean
 endif TEX
@@ -88,7 +89,7 @@ DISTCLEANFILES += trip.diffs
 DISTCLEANFILES += write18-quote.log
 
 ## triptest
-trip.diffs: tex$(EXEEXT)
+trip.diffs: tex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: trip-clean
 trip-clean:
@@ -200,17 +201,17 @@ DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c \
 
 # Metafont tests
 #
-mf_tests = mftraptest
+mf_tests = mftraptest.test
+mftraptest.log: mf$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 EXTRA_DIST += $(mf_tests)
 if MF
 TESTS += $(mf_tests)
-check_PROGRAMS += gftype tftopl
 TRIPTRAP += mftrap.diffs
 TRIPTRAP_CLEAN += trap-clean
 endif MF
 
 ## mftraptest
-mftrap.diffs: mf$(EXEEXT)
+mftrap.diffs: mf$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: trap-clean
 trap-clean:
diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am
index 08f9a1e9c11..fcb7165d7db 100644
--- a/Build/source/texk/web2c/am/web.am
+++ b/Build/source/texk/web2c/am/web.am
@@ -28,6 +28,8 @@ bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch
 	$(tangle) bibtex bibtex
 web_tests += tests/bibtex-openout-test.pl tests/bibtex-longline-test.pl
 web_tests += tests/bibtex-mem.test
+bibtex.log tests/bibtex-openout-test.log tests/bibtex-longline-test.log \
+	tests/bibtex-mem.log: bibtex$(EXEEXT)
 
 nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h
 dvicopy.c dvicopy.h: dvicopy-web2c
@@ -36,6 +38,7 @@ dvicopy-web2c: dvicopy.p $(web2c_depend)
 	@$(web2c) dvicopy
 dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch
 	$(tangle) dvicopy dvicopy
+dvicopy.log: dvicopy$(EXEEXT)
 
 nodist_dvitype_SOURCES = dvitype.c dvitype.h
 dvitype.c dvitype.h: dvitype-web2c
@@ -44,6 +47,7 @@ dvitype-web2c: dvitype.p $(web2c_depend)
 	@$(web2c) dvitype
 dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch
 	$(tangle) dvitype dvitype
+dvitype.log: dvitype$(EXEEXT)
 
 nodist_gftodvi_SOURCES = gftodvi.c gftodvi.h
 gftodvi.c gftodvi.h: gftodvi-web2c
@@ -53,6 +57,7 @@ gftodvi-web2c: gftodvi.p $(web2c_depend)
 gftodvi.p: tangle$(EXEEXT) gftodvi.web gftodvi.ch
 	$(tangle) gftodvi gftodvi
 gftodvi_SOURCES = gftodmem.h
+gftodvi.log: gftodvi$(EXEEXT)
 
 nodist_gftopk_SOURCES = gftopk.c gftopk.h
 gftopk.c gftopk.h: gftopk-web2c
@@ -61,6 +66,7 @@ gftopk-web2c: gftopk.p $(web2c_depend)
 	@$(web2c) gftopk
 gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch
 	$(tangle) gftopk gftopk
+gftopk.log: gftopk$(EXEEXT)
 
 nodist_gftype_SOURCES = gftype.c gftype.h
 gftype.c gftype.h: gftype-web2c
@@ -69,6 +75,7 @@ gftype-web2c: gftype.p $(web2c_depend)
 	@$(web2c) gftype
 gftype.p: tangle$(EXEEXT) gftype.web gftype.ch
 	$(tangle) gftype gftype
+gftype.log: gftype$(EXEEXT)
 
 nodist_mft_SOURCES = mft.c mft.h
 mft.c mft.h: mft-web2c
@@ -77,6 +84,7 @@ mft-web2c: mft.p $(web2c_depend)
 	@$(web2c) mft
 mft.p: tangle$(EXEEXT) mft.web mft.ch
 	$(tangle) mft mft
+mft.log: mft$(EXEEXT)
 
 nodist_patgen_SOURCES = patgen.c patgen.h
 patgen.c patgen.h: patgen-web2c
@@ -85,6 +93,7 @@ patgen-web2c: patgen.p $(web2c_depend)
 	@$(web2c) patgen
 patgen.p: tangle$(EXEEXT) patgen.web patgen.ch
 	$(tangle) patgen patgen
+patgen.log: patgen$(EXEEXT)
 
 nodist_pktogf_SOURCES = pktogf.c pktogf.h
 pktogf.c pktogf.h: pktogf-web2c
@@ -93,6 +102,7 @@ pktogf-web2c: pktogf.p $(web2c_depend)
 	@$(web2c) pktogf
 pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch
 	$(tangle) pktogf pktogf
+pktogf.log: pktogf$(EXEEXT)
 
 nodist_pktype_SOURCES = pktype.c pktype.h
 pktype.c pktype.h: pktype-web2c
@@ -101,6 +111,7 @@ pktype-web2c: pktype.p $(web2c_depend)
 	@$(web2c) pktype
 pktype.p: tangle$(EXEEXT) pktype.web pktype.ch
 	$(tangle) pktype pktype
+pktype.log: pktype$(EXEEXT)
 
 nodist_pltotf_SOURCES = pltotf.c pltotf.h
 pltotf.c pltotf.h: pltotf-web2c
@@ -109,6 +120,7 @@ pltotf-web2c: pltotf.p $(web2c_depend)
 	@$(web2c) pltotf
 pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch
 	$(tangle) pltotf pltotf
+pltotf.log: pltotf$(EXEEXT)
 
 nodist_pooltype_SOURCES = pooltype.c pooltype.h
 pooltype.c pooltype.h: pooltype-web2c
@@ -117,6 +129,7 @@ pooltype-web2c: pooltype.p $(web2c_depend)
 	@$(web2c) pooltype
 pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch
 	$(tangle) pooltype pooltype
+pooltype.log: pooltype$(EXEEXT) tex.pool
 
 nodist_tftopl_SOURCES = tftopl.c tftopl.h
 tftopl.c tftopl.h: tftopl-web2c
@@ -125,6 +138,7 @@ tftopl-web2c: tftopl.p $(web2c_depend)
 	@$(web2c) tftopl
 tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch
 	$(tangle) tftopl tftopl
+tftopl.log: tftopl$(EXEEXT)
 
 nodist_vftovp_SOURCES = vftovp.c vftovp.h
 vftovp.c vftovp.h: vftovp-web2c
@@ -133,6 +147,7 @@ vftovp-web2c: vftovp.p $(web2c_depend)
 	@$(web2c) vftovp
 vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch
 	$(tangle) vftovp vftovp
+vftovp.log: vftovp$(EXEEXT)
 
 nodist_vptovf_SOURCES = vptovf.c vptovf.h
 vptovf.c vptovf.h: vptovf-web2c
@@ -141,6 +156,7 @@ vptovf-web2c: vptovf.p $(web2c_depend)
 	@$(web2c) vptovf
 vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch
 	$(tangle) vptovf vptovf
+vptovf.log: vptovf$(EXEEXT)
 
 nodist_weave_SOURCES = weave.c weave.h
 weave.c weave.h: weave-web2c
@@ -149,6 +165,7 @@ weave-web2c: weave.p $(web2c_depend)
 	@$(web2c) weave
 weave.p: tangle$(EXEEXT) weave.web weave.ch
 	$(tangle) weave weave
+weave.log: weave$(EXEEXT)
 
 ## Tests.
 ##
@@ -185,7 +202,6 @@ DISTCLEANFILES += tests/xcmr10.pktyp
 ## pltotf.test
 DISTCLEANFILES += badpl.* tests/xcmr10.tfm
 ## pooltype.test
-pooltype.log: pooltype$(EXEEXT) tex.pool
 DISTCLEANFILES += tests/xtexpool.typ
 ## tftopl.test
 DISTCLEANFILES += badtfm.* tests/xcmr10*.pl
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index a2b866edcce..a1a654008dc 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* eptriptest (removed): Renamed ...
+	* eptriptest.test (new):  ... into this.
+	* am/eptex.am: Better dependencies for 'make check'.
+
 2015-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/eptex.am: Add libmd5.a to eptex_DEPENDENCIES.
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index d2bef7f57c1..450699518a9 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -10,12 +10,6 @@ bin_PROGRAMS += eptex
 endif EPTEX
 EXTRA_PROGRAMS += eptex
 
-# e-pTeX Tests
-#
-eptex_tests = eptexdir/eptriptest
-
-EXTRA_DIST += $(eptex_tests)
-
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
@@ -85,9 +79,15 @@ EXTRA_DIST += \
 	eptexdir/Changes.txt \
 	eptexdir/README.txt
 
+# e-pTeX Tests
+#
+eptex_tests = eptexdir/eptriptest.test
+eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+
+EXTRA_DIST += $(eptex_tests)
+
 if EPTEX
 TESTS += $(eptex_tests)
-check_PROGRAMS += dvitype pltotf tftopl
 TRIPTRAP += eptrip.diffs
 TRIPTRAP_CLEAN += eptrip-clean
 endif EPTEX
@@ -100,7 +100,7 @@ EXTRA_DIST += \
 	eptexdir/eptrip/eptrip.log \
 	eptexdir/eptrip/eptrip.tex \
 	eptexdir/eptrip/texmf.cnf
-eptrip.diffs: eptex$(EXEEXT)
+eptrip.diffs: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: eptrip-clean
 eptrip-clean:
diff --git a/Build/source/texk/web2c/eptexdir/eptriptest b/Build/source/texk/web2c/eptexdir/eptriptest.test
index 03252230010..03252230010 100755
--- a/Build/source/texk/web2c/eptexdir/eptriptest
+++ b/Build/source/texk/web2c/eptexdir/eptriptest.test
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index d52445b57b2..cd3e1957cb2 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* etriptest (removed): Renamed ...
+	* etriptest.test (new):  ... into this.
+	* am/etex.am: Better dependencies for 'make check'.
+
 2015-06-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/etex.am: Use $(tie_c) and $(tie_m).
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 987ba544727..16c15426d8d 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -73,13 +73,14 @@ EXTRA_DIST += \
 
 # e-TeX Tests
 #
-etex_tests = etexdir/wprob.test etexdir/etriptest
+etex_tests = etexdir/wprob.test etexdir/etriptest.test
+etexdir/wprob.test: etex$(EXEEXT)
+etexdir/etriptest.log: etex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 
 EXTRA_DIST += $(etex_tests)
 
 if ETEX
 TESTS += $(etex_tests)
-check_PROGRAMS += dvitype pltotf tftopl
 TRIPTRAP += etrip.diffs
 TRIPTRAP_CLEAN += etrip-clean
 endif ETEX
@@ -89,7 +90,7 @@ DISTCLEANFILES += etrip.diffs
 EXTRA_DIST += tests/wprob.tex
 DISTCLEANFILES += ewprob.log ewprob.tex
 ## etriptest
-etrip.diffs: etex$(EXEEXT)
+etrip.diffs: etex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: etrip-clean
 etrip-clean:
diff --git a/Build/source/texk/web2c/etexdir/etriptest b/Build/source/texk/web2c/etexdir/etriptest.test
index 5f568ff1964..5f568ff1964 100755
--- a/Build/source/texk/web2c/etexdir/etriptest
+++ b/Build/source/texk/web2c/etexdir/etriptest.test
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index 1d14cc8853c..3bdb7c84ecc 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* euptriptest (removed): Renamed ...
+	* euptriptest.test (new):  ... into this.
+	* am/euptex.am: Better dependencies for 'make check'.
+
 2015-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/euptex.am: Add libmd5.a to euptex_DEPENDENCIES.
diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am
index 156a2478d8e..8519bdec014 100644
--- a/Build/source/texk/web2c/euptexdir/am/euptex.am
+++ b/Build/source/texk/web2c/euptexdir/am/euptex.am
@@ -10,12 +10,6 @@ bin_PROGRAMS += euptex
 endif EUPTEX
 EXTRA_PROGRAMS += euptex
 
-# e-upTeX Tests
-#
-euptex_tests = euptexdir/euptriptest
-
-EXTRA_DIST += $(euptex_tests)
-
 euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
@@ -86,9 +80,15 @@ EXTRA_DIST += \
 	euptexdir/ChangeLog \
 	euptexdir/EUPTEX.txt
 
+# e-upTeX Tests
+#
+euptex_tests = euptexdir/euptriptest.test
+euptexdir/euptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+
+EXTRA_DIST += $(euptex_tests)
+
 if EUPTEX
 TESTS += $(euptex_tests)
-check_PROGRAMS += dvitype pltotf tftopl
 TRIPTRAP += euptrip.diffs
 TRIPTRAP_CLEAN += euptrip-clean
 endif EUPTEX
@@ -101,7 +101,7 @@ EXTRA_DIST += \
 	eptexdir/eptrip/eptrip.tex \
 	euptexdir/euptrip/euptrip.diffs \
 	euptexdir/euptrip/texmf.cnf
-euptrip.diffs: euptex$(EXEEXT)
+euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: euptrip-clean
 euptrip-clean:
diff --git a/Build/source/texk/web2c/euptexdir/euptriptest b/Build/source/texk/web2c/euptexdir/euptriptest.test
index 726cdd41731..726cdd41731 100755
--- a/Build/source/texk/web2c/euptexdir/euptriptest
+++ b/Build/source/texk/web2c/euptexdir/euptriptest.test
diff --git a/Build/source/texk/web2c/libmd5/am/md5.am b/Build/source/texk/web2c/libmd5/am/md5.am
index 11065798b05..751e5e0db5b 100644
--- a/Build/source/texk/web2c/libmd5/am/md5.am
+++ b/Build/source/texk/web2c/libmd5/am/md5.am
@@ -1,6 +1,6 @@
 ## texk/web2c/libmd5/am/md5.am: Makefile fragment for md5.
 ##
-## Copyright (C) 2009, 2011 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.
 
 ## libmd5
@@ -13,10 +13,11 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/md5.h
 
 ## Tests
 ##
-check_PROGRAMS += md5main
+EXTRA_PROGRAMS += md5main
 EXTRA_DIST += libmd5/md5.test
 
 TESTS += libmd5/md5.test
+libmd5/md5.log: md5main$(EXEEXT)
 
 md5main_CPPFLAGS = -I$(srcdir)/libmd5
 
diff --git a/Build/source/texk/web2c/mfluadir/ChangeLog b/Build/source/texk/web2c/mfluadir/ChangeLog
index 1fb7aae18ea..3f47e483141 100644
--- a/Build/source/texk/web2c/mfluadir/ChangeLog
+++ b/Build/source/texk/web2c/mfluadir/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* mfluatraptest (removed): Renamed ...
+	* mfluatraptest.test (new):  ... into this.
+	* am/mflua.am: Better dependencies for 'make check'.
+
 2015-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/mflua.am: Fix dependencies.
diff --git a/Build/source/texk/web2c/mfluadir/am/mflua.am b/Build/source/texk/web2c/mfluadir/am/mflua.am
index cf4387a3f98..17f27d145c4 100644
--- a/Build/source/texk/web2c/mfluadir/am/mflua.am
+++ b/Build/source/texk/web2c/mfluadir/am/mflua.am
@@ -112,19 +112,19 @@ EXTRA_DIST += \
 
 # MFLua tests
 #
-mflua_tests = mfluadir/mfluatraptest
+mflua_tests = mfluadir/mfluatraptest.test
+mfluadir/mfluatraptest.log: mflua$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 EXTRA_DIST += $(mflua_tests)
 
 if MFLUA
 TESTS += $(mflua_tests)
-check_PROGRAMS += gftype tftopl
 TRIPTRAP += mfluatrap.diffs
 TRIPTRAP_CLEAN += mfluatrap-clean
 endif MFLUA
 DISTCLEANFILES += mfluatrap.diffs
 
 ## mfluadir/mfluatraptest
-mfluatrap.diffs: mflua$(EXEEXT)
+mfluatrap.diffs: mflua$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: mfluatrap-clean
 mfluatrap-clean:
diff --git a/Build/source/texk/web2c/mfluadir/mfluatraptest b/Build/source/texk/web2c/mfluadir/mfluatraptest.test
index 29fa6f09e66..29fa6f09e66 100755
--- a/Build/source/texk/web2c/mfluadir/mfluatraptest
+++ b/Build/source/texk/web2c/mfluadir/mfluatraptest.test
diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog
index e06f75abcd2..af119ecc9e1 100644
--- a/Build/source/texk/web2c/mfluajitdir/ChangeLog
+++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* mfluajittraptest (removed): Renamed ...
+	* mfluajittraptest.test (new):  ... into this.
+	* am/mfluajit.am: Better dependencies for 'make check'.
+
 2015-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/mfluajit.am: Fix dependencies.
diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
index 808d9c7b958..c990ca4b1b0 100644
--- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
+++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
@@ -108,19 +108,19 @@ EXTRA_DIST += \
 
 # MFLua tests
 #
-mfluajit_tests = mfluajitdir/mfluajittraptest
+mfluajit_tests = mfluajitdir/mfluajittraptest.test
+mfluajitdir/mfluajittraptest.log: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 EXTRA_DIST += $(mfluajit_tests)
 
 if MFLUAJIT
 TESTS += $(mfluajit_tests)
-check_PROGRAMS += gftype tftopl
 TRIPTRAP += mfluajittrap.diffs
 TRIPTRAP_CLEAN += mfluajittrap-clean
 endif MFLUAJIT
 DISTCLEANFILES += mfluajittrap.diffs
 
 ## mfluajitdir/mfluajittraptest
-mfluajittrap.diffs: mfluajit$(EXEEXT)
+mfluajittrap.diffs: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: mfluajittrap-clean
 mfluajittrap-clean:
diff --git a/Build/source/texk/web2c/mfluajitdir/mfluajittraptest b/Build/source/texk/web2c/mfluajitdir/mfluajittraptest.test
index 9d7008cea5f..9d7008cea5f 100755
--- a/Build/source/texk/web2c/mfluajitdir/mfluajittraptest
+++ b/Build/source/texk/web2c/mfluajitdir/mfluajittraptest.test
diff --git a/Build/source/texk/web2c/mftraptest b/Build/source/texk/web2c/mftraptest.test
index 71fefa76939..71fefa76939 100755
--- a/Build/source/texk/web2c/mftraptest
+++ b/Build/source/texk/web2c/mftraptest.test
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 08914bafd24..0c4707eefc6 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,21 +1,29 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* mptraptest (removed): Renamed ...
+	* mptraptest.test (new):  ... into this.
+	* am/mplib.am: Better dependencies for 'make check'.
+
 2015-03-21  Luigi Scarso  <luigi.scarso@gmail.com>
-	make_text for mplib only.
 
+	make_text for mplib only.
 
 2015-03-19  Luigi Scarso  <luigi.scarso@gmail.com>
+
 	Fixed normal rand. generator for double/decimal/binary
 	systems.
 
 2015-01-20  Luigi Scarso  <luigi.scarso@gmail.com>
+
 	Added cur_sym_mod() == mp_normal_sym 
 	to the cur_sym==0 condition mp_cur_tok 
 
-
 2015-01-19  Luigi Scarso  <luigi.scarso@gmail.com>
-	fixed a bug in mp_recycle_value with NULL node
 
+	fixed a bug in mp_recycle_value with NULL node
 
 2015-01-15  Luigi Scarso  <luigi.scarso@gmail.com>
+
 	 mpmathdecimal.w: better management for static data in mpmathdecimal.w 
 	(thanks to Philipp Gesang <phg@phi-gamma.net>)
 
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index 041bf67d012..673d3a9921a 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -63,13 +63,14 @@ DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-tangle
 
 ## MetaPost Tests
 ##
-mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest
+mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
+mplibdir/dvitomp.log: mpost$(EXEEXT)
+mplibdir/mptraptest.log: mpost$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 
 EXTRA_DIST += $(mp_tests)
 
 if MP
 TESTS += $(mp_tests)
-check_PROGRAMS += pltotf tftopl
 TRIPTRAP += mptrap.diffs
 TRIPTRAP_CLEAN += mptrap-clean
 endif MP
@@ -78,7 +79,7 @@ DISTCLEANFILES += mptrap.diffs
 ## mplibdir/dvitomp.test
 DISTCLEANFILES += ptmr.mpx tests/xptmr.mpx tests/xstory.mpx
 ## mplibdir/mptraptest
-mptrap.diffs: mpost$(EXEEXT)
+mptrap.diffs: mpost$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: mptrap-clean
 mptrap-clean:
diff --git a/Build/source/texk/web2c/mplibdir/mptraptest b/Build/source/texk/web2c/mplibdir/mptraptest.test
index 86203400491..86203400491 100755
--- a/Build/source/texk/web2c/mplibdir/mptraptest
+++ b/Build/source/texk/web2c/mplibdir/mptraptest.test
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index db86b56e56b..b1a8aa0ee37 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -99,6 +99,9 @@ DISTCLEANFILES += ovp2ovf.web
 ##
 OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \
 	omegaware/otangle.test
+omegaware/odvicopy.log: odvicopy$(EXEEXT) odvitype$(EXEEXT)
+omegaware/odvitype.log: odvitype$(EXEEXT)
+omegaware/odvitype.log: odvitype$(EXEEXT)
 OMFONTS_tests = omegaware/bad.test omegaware/charwd.test \
 	omegaware/check.test omegaware/help.test \
 	omegaware/level1.test omegaware/ligkern.test \
@@ -108,6 +111,14 @@ OMFONTS_tests = omegaware/bad.test omegaware/charwd.test \
 	omegaware/shorten.test omegaware/specialhex.test \
 	omegaware/version.test omegaware/vrepeat.test \
 	omegaware/yannis.test
+omegaware/bad.log omegaware/charwd.log omegaware/help.log omegaware/overbmp.log omegaware/repeat.log \
+	omegaware/selectfont.log omegaware/specialhex.log omegaware/version.log omegaware/vrepeat.log: \
+	wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) wovp2ovf$(EXEEXT)
+omegaware/check.log omegaware/level1.log omegaware/realnum.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT)
+omegaware/ligkern.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovp2ovf$(EXEEXT)
+omegaware/omfonts.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) wovp2ovf$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+omegaware/shorten.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) pltotf$(EXEEXT)
+omegaware/yannis.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) wovp2ovf$(EXEEXT) pltotf$(EXEEXT)
 EXTRA_DIST += $(OTANGLE_tests) $(OMFONTS_tests)
 
 if OTANGLE
@@ -137,7 +148,6 @@ EXTRA_DIST += \
 	omegaware/tests/liguse.opl omegaware/tests/liguse1.opl omegaware/tests/liguse2.opl
 DISTCLEANFILES += omegaware/tests/xlig*.*
 ## omegaware/odvicopy.test (and ofonts.test)
-omegaware/odvicopy.log: odvicopy$(EXEEXT) odvitype$(EXEEXT)
 EXTRA_DIST += \
 	omegaware/tests/ofontd1.dvi omegaware/tests/ofontd1.typ \
 	omegaware/tests/ofontd2.dvi omegaware/tests/ofontd2.typ \
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index b687e951b15..0b6cbfba7ae 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ptriptest (removed): Renamed ...
+	* ptriptest.test (new):  ... into this.
+	* am/ptex.am: Better dependencies for 'make check'.
+
 2015-06-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/ptex.am: Use $(tie_c) and $(tie_m).
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index dd0610e3147..77864e61c02 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -10,19 +10,6 @@ p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $
 
 pweb_programs = pbibtex pdvitype ppltotf ptftopl
 
-# pTeX Tests
-#
-ptex_tests = ptexdir/ptriptest
-pweb_tests = \
-	ptexdir/pbibtex.test \
-	ptexdir/pdvitype.test \
-	ptexdir/ppltotf.test \
-	ptexdir/ptftopl.test
-
-EXTRA_DIST += $(ptex_tests) $(pweb_tests)
-DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
-	$(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
-
 ## pTeX library
 ##
 pproglib = lib/libp.a
@@ -117,9 +104,6 @@ pbibtex.web: tie$(EXEEXT) 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
-pweb_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
-
 ## pDVItype
 ## 
 nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
@@ -137,8 +121,6 @@ pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
 	$(tie_m) dvitype.web dvitype.ch
 EXTRA_DIST += ptexdir/pdvitype.ch
 
-pweb_tests += ptexdir/sample.test
-
 ## pPLtoTF
 ## 
 nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
@@ -173,8 +155,6 @@ ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
 	$(tie_m) tftopl.web tftopl.ch
 EXTRA_DIST += ptexdir/ptftopl.ch
 
-pweb_tests += ptexdir/yokotate.test
-
 ## 
 EXTRA_DIST += \
 	ptexdir/COPYRIGHT \
@@ -184,9 +164,32 @@ EXTRA_DIST += \
 	ptexdir/INSTALL.txt \
 	ptexdir/README.txt
 
+# pTeX Tests
+#
+ptex_tests = ptexdir/ptriptest.test
+ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+pweb_tests = \
+	ptexdir/pbibtex.test \
+	ptexdir/pdvitype.test \
+	ptexdir/ppltotf.test \
+	ptexdir/ptftopl.test
+pweb_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
+pweb_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
+pweb_tests += ptexdir/sample.test
+pweb_tests += ptexdir/yokotate.test
+ptexdir/pbibtex.log ptexdir/pbibtex-openout-test.log ptexdir/pbibtex-longline-test.log \
+	ptexdir/pbibtex-mem.log ptexdir/nissya.log: pbibtex$(EXEEXT)
+ptexdir/pdvitype.log ptexdir/sample.log: pdvitype$(EXEEXT)
+ptexdir/ppltotf.log: ppltotf$(EXEEXT)
+ptexdir/ptftopl.log: ptftopl$(EXEEXT)
+ptexdir/yokotate.log: ppltotf$(EXEEXT) ptftopl$(EXEEXT)
+
+EXTRA_DIST += $(ptex_tests) $(pweb_tests)
+DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
+	$(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
+
 if PTEX
 TESTS += $(ptex_tests)
-check_PROGRAMS += dvitype pltotf tftopl
 TRIPTRAP += ptrip.diffs
 TRIPTRAP_CLEAN += ptrip-clean
 endif PTEX
@@ -219,7 +222,7 @@ EXTRA_DIST += ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm
 DISTCLEANFILES += ptests/x*min10.*
 ## ptexdir/ptriptest
 EXTRA_DIST += ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf
-ptrip.diffs: ptex$(EXEEXT)
+ptrip.diffs: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: ptrip-clean
 ptrip-clean:
diff --git a/Build/source/texk/web2c/ptexdir/ptriptest b/Build/source/texk/web2c/ptexdir/ptriptest.test
index 068731d34ed..068731d34ed 100755
--- a/Build/source/texk/web2c/ptexdir/ptriptest
+++ b/Build/source/texk/web2c/ptexdir/ptriptest.test
diff --git a/Build/source/texk/web2c/triptest b/Build/source/texk/web2c/triptest.test
index f3f6f131a75..f3f6f131a75 100755
--- a/Build/source/texk/web2c/triptest
+++ b/Build/source/texk/web2c/triptest.test
diff --git a/Build/source/texk/web2c/triptrap-sh b/Build/source/texk/web2c/triptrap-sh
index 7683cffd954..6c2fb779759 100755
--- a/Build/source/texk/web2c/triptrap-sh
+++ b/Build/source/texk/web2c/triptrap-sh
@@ -34,17 +34,17 @@ do
   esac
   echo ">>> Running $msg."
   is_OK=:
-  $MAKE TESTS=$tst check-am >$tmp 2>&1 \
-    && grep "PASS: $tst" $tmp >/dev/null 2>&1 \
-    || { echo "FAIL: $tst"; is_OK=false; }
+  $MAKE TESTS=$tst.test check-am >$tmp 2>&1 \
+    && grep "PASS: $tst.test" $tmp >/dev/null 2>&1 \
+    || { echo "FAIL: $tst.test"; is_OK=false; }
   sed -e "s%$abs_srcdir/%SRCDIR/%" \
       -e "s%\.\./%./%" \
       $tst.log >$file
   $is_OK && {
-    echo "PASS: $tst" >>$file
-    echo "PASS: $tst"
+    echo "PASS: $tst.test" >>$file
+    echo "PASS: $tst.test"
   } || {
-    echo "FAIL: $tst" >>$file
+    echo "FAIL: $tst.test" >>$file
     rc=1
   }
   rm -f $tmp
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