]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
build: avoid parallel distcheck failure
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 11 Apr 2009 12:48:49 +0000 (14:48 +0200)
committerJim Meyering <meyering@redhat.com>
Sat, 11 Apr 2009 13:20:37 +0000 (15:20 +0200)
* Makefile.am (ALL_RECURSIVE_TARGETS): Initialize here, too,
to please automake.  Add install-root, check-root, distcheck-hook.
* cfg.mk (ALL_RECURSIVE_TARGETS): Add sc_tight_scope.
* maint.mk (ALL_RECURSIVE_TARGETS): Add patch-check,
check-AUTHORS, maintainer-distcheck, vc-dist, taint-distcheck,
my-distcheck, alpha, beta, major.

Makefile.am
cfg.mk
maint.mk

index 088cf4fa5e9bee932540e34bfa600957f199af0b..13891ee9cef9299e4a6e3644fe399038df06f657 100644 (file)
@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+ALL_RECURSIVE_TARGETS =
+
 SUBDIRS = lib src doc man po tests gnulib-tests
 
 changelog_etc =                                \
@@ -67,12 +69,14 @@ EXTRA_DIST =                                \
   gl/modules/getloadavg.diff           \
   maint.mk
 
+ALL_RECURSIVE_TARGETS += install-root
 install-root:
        cd src && $(MAKE) $@
 
 ACLOCAL_AMFLAGS = -I m4
 
 # Some tests always need root privileges, others need them only sometimes.
+ALL_RECURSIVE_TARGETS += check-root
 check-root:
        cd tests && $(MAKE) $@ SUBDIRS=
 
@@ -108,6 +112,7 @@ gen-ChangeLog:
          mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
        fi
 
+ALL_RECURSIVE_TARGETS += distcheck-hook
 distcheck-hook: check-ls-dircolors
        $(MAKE) my-distcheck
 
diff --git a/cfg.mk b/cfg.mk
index f5dab6ac280e27a6a18712e685f5baf174ed6d5e..7f4cdd2656eee58b33af2d4220a88b4f99db19a1 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -167,6 +167,7 @@ sc_sun_os_names:
          { echo '$(ME): found misuse of Sun OS version numbers' 1>&2;  \
            exit 1; } || :
 
+ALL_RECURSIVE_TARGETS += sc_tight_scope
 sc_tight_scope:
        @$(MAKE) -C src $@
 
index 8b2ea6ce8cd7f24ed8d1b7aab5896504f36205d4..1e6b13fe847ef6a35dd64d420aa76bfe8215933c 100644 (file)
--- a/maint.mk
+++ b/maint.mk
@@ -484,6 +484,7 @@ update-NEWS-hash: NEWS
          $(srcdir)/cfg.mk
 
 epoch_date = 1970-01-01 00:00:00.000000000 +0000
+ALL_RECURSIVE_TARGETS += patch-check
 # Ensure that the c99-to-c89 patch applies cleanly.
 patch-check:
        rm -rf src-c89 $@.1 $@.2
@@ -509,6 +510,7 @@ patch-check:
        test "$$msg" = ok && rm -rf src-c89 $@.1 $@.2 || echo "$$msg" 1>&2; \
        test "$$msg" = ok
 
+ALL_RECURSIVE_TARGETS += check-AUTHORS
 check-AUTHORS:
        $(MAKE) -C src $@
 
@@ -643,6 +645,7 @@ vc-diff-check:
 
 cvs-check: vc-diff-check
 
+ALL_RECURSIVE_TARGETS += maintainer-distcheck
 maintainer-distcheck:
        $(MAKE) distcheck
        $(MAKE) taint-distcheck
@@ -651,6 +654,7 @@ maintainer-distcheck:
 
 # Don't make a distribution if checks fail.
 # Also, make sure the NEWS file is up-to-date.
+ALL_RECURSIVE_TARGETS += vc-dist
 vc-dist: $(local-check) cvs-check maintainer-distcheck
        XZ_OPT=-9ev $(MAKE) dist
 
@@ -686,6 +690,7 @@ fake_home = $(tp)/home
 # and don't affect anything in $HOME.  Create witness files in $HOME,
 # record their attributes, and build/test.  Then ensure that the
 # witnesses were not affected.
+ALL_RECURSIVE_TARGETS += taint-distcheck
 taint-distcheck: $(DIST_ARCHIVES)
        test -d $(t_taint) && chmod -R 700 $(t_taint) || :
        -rm -rf $(t_taint) $(fake_home)
@@ -774,6 +779,7 @@ endef
 # the build srcdir, these always-failing programs will run.
 # Otherwise, it is too easy to test the wrong programs.
 # Note that "false" itself is a symlink to true, so it too will malfunction.
+ALL_RECURSIVE_TARGETS += my-distcheck
 my-distcheck: $(DIST_ARCHIVES) $(local-check)
        $(MAKE) syntax-check
        $(MAKE) check
@@ -855,6 +861,7 @@ define emit-commit-log
 endef
 
 .PHONY: alpha beta major
+ALL_RECURSIVE_TARGETS += alpha beta major
 alpha beta major: $(local-check) writable-files
        test $@ = major                                         \
          && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \