summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/ChangeLog8
-rw-r--r--Build/source/texk/Makefile.am7
-rw-r--r--Build/source/texk/Makefile.in4
3 files changed, 12 insertions, 7 deletions
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog
index 2be4bf51d27..b2ba4a4ed49 100644
--- a/Build/source/texk/ChangeLog
+++ b/Build/source/texk/ChangeLog
@@ -1,3 +1,11 @@
+2016-01-16 Karl Berry <karl@tug.org>
+
+ (web2c/Makefile): do not try to make the nonexistent subtexk target.
+ Apparently this is a leftover from generalizing the prior subtexk
+ into am/recurse.am.
+ http://tug.org/svn/texlive/trunk/Build/source/texk/Makefile.am?r1=31126&r2=31127
+ * Makefile.am (triptrap): no longer depend on web2c/Makefile.
+
2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Use the fragment ../am/dist_hook.am.
diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am
index a986a5cab57..62ac31c687f 100644
--- a/Build/source/texk/Makefile.am
+++ b/Build/source/texk/Makefile.am
@@ -1,6 +1,7 @@
## Makefile.am for the TeX Live subdirectory texk/
##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2016 Karl Berry <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## Ensure aclocal.m4 is up to date
@@ -24,7 +25,5 @@ EXTRA_DIST = tests
# Special target to run TRIP and TRAP tests and create diffs.
.PHONY: triptrap
-triptrap: web2c/Makefile
+triptrap:
cd web2c && $(MAKE) $(AM_MAKEFLAGS) $@
-web2c/Makefile:
- $(MAKE) $(AM_MAKEFLAGS) CONF_SUBDIRS=web2c subtexk
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 94eeb1fea5e..3002e13c22d 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -929,10 +929,8 @@ $(CONFIG_AUX):
# Special target to run TRIP and TRAP tests and create diffs.
.PHONY: triptrap
-triptrap: web2c/Makefile
+triptrap:
cd web2c && $(MAKE) $(AM_MAKEFLAGS) $@
-web2c/Makefile:
- $(MAKE) $(AM_MAKEFLAGS) CONF_SUBDIRS=web2c subtexk
# 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.