summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/ChangeLog4
-rw-r--r--Build/source/Makefile.am9
-rw-r--r--Build/source/Makefile.in8
3 files changed, 21 insertions, 0 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index c43cac7e859..dda078fe19c 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,5 +1,9 @@
2009-12-24 Karl Berry <karl@tug.org>
+ * Makefile.am (world): also run make check.
+ (check_target): new variable.
+ (skip): new target, to do nothing.
+
* Build (TL_CONF_BANNER): add /dev.
2009-12-22 Karl Berry <karl@tug.org>
diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am
index ec85b1543ee..d569191eb09 100644
--- a/Build/source/Makefile.am
+++ b/Build/source/Makefile.am
@@ -42,9 +42,18 @@ DIST_SUBDIRS = auxdir/auxsub texk/kpathsea libs utils texk
# and there is no install-hook or install-local.
world: all
## Serialize 'make all' and 'make install-strip'.
+ @echo "top-level make $@: running $(check_target)..."
+ $(MAKE) $(AM_MAKEFLAGS) $(check_target)
+##
+ @echo "top-level make $@: running install-strip..."
$(MAKE) $(AM_MAKEFLAGS) install-strip
##
@echo "top-level make $@: running texlinks in texk/tetex..."
cd texk/tetex && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
##
@echo "make $@ done."
+
+# Allow for skipping make check if needed.
+check_target = check
+skip:
+.PHONY: skip
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 65ca5b700a2..3e73eb1fa87 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -338,6 +338,9 @@ EXTRA_DIST = \
@build_kpathsea_FALSE@SUBDIRS = libs utils texk
@build_kpathsea_TRUE@SUBDIRS = texk/kpathsea libs utils texk
DIST_SUBDIRS = auxdir/auxsub texk/kpathsea libs utils texk
+
+# Allow for skipping make check if needed.
+check_target = check
all: all-recursive
.SUFFIXES:
@@ -828,10 +831,15 @@ dist-hook:
# at install-data, and fmtutil.cnf won't be there at install-exec,
# and there is no install-hook or install-local.
world: all
+ @echo "top-level make $@: running $(check_target)..."
+ $(MAKE) $(AM_MAKEFLAGS) $(check_target)
+ @echo "top-level make $@: running install-strip..."
$(MAKE) $(AM_MAKEFLAGS) install-strip
@echo "top-level make $@: running texlinks in texk/tetex..."
cd texk/tetex && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
@echo "make $@ done."
+skip:
+.PHONY: skip
# 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.