reduce race risk in parallel builds

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 835f5f19d79e1142e7eae0f18433932af3ded0c4..f0c504a17ee8739228cebf3892d269fdbe10753d 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -7,14 +7,12 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $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 delv dnssec tools tests nsupdate \
-               check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@
+SUBDIRS =      named rndc dig delv dnssec tools nsupdate check confgen \
+               @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
 TARGETS =
 
 @BIND9_MAKE_RULES@

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index ca7d0c7ddbf8ce604131bdbfd170abd34e191521..cf2e1bf0d45a75662845778954f7722adf68f00c 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -32,8 +32,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 
 LIBS =         @LIBS@
 
-SUBDIR =       system @PKCS11_TOOLS@ optional
-
+SUBDIRS =      system @PKCS11_TOOLS@
 TESTDIRS =     system
 
 # Test programs that are built by default:
@@ -43,14 +42,20 @@ TESTDIRS =  system
 # other opptional test programs have been moved to ./optional
 
 # Alphabetically
+XTARGETS =     all_tests
 TARGETS =      cfg_test@EXEEXT@ makejournal@EXEEXT@ \
-               wire_test@EXEEXT@
+               wire_test@EXEEXT@ @XTARGETS@
 
 SRCS =         cfg_test.c makejournal.c wire_test.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@ \
@@ -69,6 +74,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 e3f1287fe31eee231bfe0dd1243c576642816359..ba3972939e59272a050da337485fd8518718fafa 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -39,10 +39,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.