reduce race risk in parallel builds

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

diff --git a/bin/Makefile.in b/bin/Makefile.in
index e3aeffbf924771833e6e903430f26c5a0455f142..2959e476c81408d3543111216036bb05a5eb11d7 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 delv dnssec tools tests nsupdate \
-               check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+SUBDIRS =      named rndc dig delv dnssec tools nsupdate \
+               check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
 TARGETS =
 
 @BIND9_MAKE_RULES@

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 9e02628dbf9f0f0aba8442e0045b17bc09641582..585b649bf22b91e2556bb43c372ed6cf1b3866e5 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -40,7 +40,8 @@ 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:
 # cfg_test is needed for regenerating doc/misc/options
@@ -49,14 +50,20 @@ SUBDIR =    system @PKCS11_TOOLS@ optional
 # 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@ \
@@ -79,6 +86,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 73bc2ef75d2b28b2ad81a1941738a08197f4645a..69f0ccf886e9581373501be5136aea39da96d1eb 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.