reduce race risk in parallel builds

(cherry picked from commit 74347f4a556d3049b2504615a51fbd13d17641a3)
(cherry picked from commit 7f4e62d90216ac2cdd24d97136aca2ee74fa238a)
(cherry picked from commit ade4face27319fa6ab07c056f20376cd48efb7df)
(cherry picked from commit 544bb12a0139766a7b2eb6f170020d26140622a9)

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 87ca5b2705627d46e2ef9e4da26786e400ccf243..c1e78ac501e8cc3a5c86490258dd49192c159534 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -13,14 +13,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.29 2009/10/05 12:07:08 fdupont Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
 SUBDIRS =      named rndc dig dnssec tools tests nsupdate \
-               check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+               check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
 TARGETS =
 
 @BIND9_MAKE_RULES@

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index b6cb2f449204c67ff5f45646a1faa98d693dbceb..33f3c80c3fd36f23774011e881eaaf4ba54c47ff 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -40,7 +40,8 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 
 LIBS =         @LIBS@
 
-SUBDIRS =      system optional
+SUBDIRS =      system
+TESTDIRS =     system
 
 # Test programs that are built by default:
 # cfg_test is needed for regenerating doc/misc/options
@@ -48,13 +49,19 @@ SUBDIRS =   system optional
 # other opptional test programs have been moved to ./optional
 
 # Alphabetically
-TARGETS =      cfg_test@EXEEXT@ wire_test@EXEEXT@ mdig@EXEEXT@
+XTARGETS =     all_tests
+TARGETS =      cfg_test@EXEEXT@ mdig@EXEEXT@ wire_test@EXEEXT@ @XTARGETS@
 
 SRCS =         cfg_test.c wire_test.c mdig.c
 
 @BIND9_MAKE_RULES@
 
-all_tests: subdirs
+.NOTPARALLEL:
+
+.PHONY:
+all_tests:
+       echo "making depend in `pwd`/optional"; \
+       (cd optional; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@)
 
 wire_test@EXEEXT@: wire_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ wire_test.@O@ \
@@ -73,6 +80,7 @@ distclean::
 
 clean distclean::
        rm -f ${TARGETS}
+       ( cd optional; $(MAKE) $@)
 
 check: test
 

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 39889867f1e0dd974107d898f468a80fdbef6178..d8e9228e9946ef2b1ca4b7b8c98e20ce6677376d 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -44,10 +44,11 @@ TARGETS =   feature-test@EXEEXT@
 
 @BIND9_MAKE_RULES@
 
+subdirs: ${TARGETS}
+
 feature-test@EXEEXT@: feature-test.@O@
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
 
-
 # Running the scripts below is bypassed when a separate build directory is
 # used.