Fix parallel `maintainer-check'.

* Makefile.am (maintainer-check-tests): Depend on `all'.
Use `$(MAKE) $(AM_MAKEFLAGS)' instead of plain `make'.
* tests/Makefile.am (maintainer-check-c++, maintainer-check-posix):
Likewise.
(maintainer-check): Serialize the testsuite runs.

diff --git a/ChangeLog b/ChangeLog
index ac0aec4da0c93df0d53be37c33a8111423eba903..74b8b909ebbc0f070d1827c638f2e68945b4cc3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-01-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix parallel `maintainer-check'.
+       * Makefile.am (maintainer-check-tests): Depend on `all'.
+       Use `$(MAKE) $(AM_MAKEFLAGS)' instead of plain `make'.
+       * tests/Makefile.am (maintainer-check-c++, maintainer-check-posix):
+       Likewise.
+       (maintainer-check): Serialize the testsuite runs.
+
        * lib/autoconf/general.m4 (_AC_INIT_PARSE_ENABLE2): Accept `+'
        in feature string for --enable/--with.  Convert to underscore
        for variable name.

diff --git a/Makefile.am b/Makefile.am
index cfe88a1daf6d8aef0d26eeec851702262f0ada14..6a111f2d17c91ce8298be600485bba33c49a3add 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autoconf.
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007 Free
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free
 # Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -53,8 +53,8 @@ $(srcdir)/INSTALL: $(top_srcdir)/doc/install.texi
 
 ## maintainer-check ##
 maintainer-check: maintainer-check-tests
-maintainer-check-tests:
-       cd tests && make maintainer-check
+maintainer-check-tests: all
+       cd tests && $(MAKE) $(AM_MAKEFLAGS) maintainer-check
 
 
 ## ----------------------------------- ##

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 91b09e2db267db0845ad49aebc5bd852b41e1b4b..ac89c624cd56bf90cc93335712f62a6283cd09ed 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -190,7 +190,10 @@ MAINTAINERCLEANFILES += mktests.stamp
 
 ## maintainer-check ##
 
-maintainer-check: maintainer-check-posix maintainer-check-c++
+# These cannot be run in parallel.
+maintainer-check:
+       $(MAKE) $(AM_MAKEFLAGS) maintainer-check-posix
+       $(MAKE) $(AM_MAKEFLAGS) maintainer-check-c++
 
 # The hairy heredoc is more robust than using echo.
 CLEANFILES += expr
@@ -209,9 +212,9 @@ expr:
 
 # Try the test suite with more severe environments.
 maintainer-check-posix: expr
-       POSIXLY_CORRECT=yes make check
+       POSIXLY_CORRECT=yes $(MAKE) $(AM_MAKEFLAGS) check
        rm expr
 
 # Try using G++ as a C compiler.
 maintainer-check-c++:
-       CC=g++ make check
+       CC=g++ $(MAKE) $(AM_MAKEFLAGS) check