Add rules to make sure subdirs are always built before testdirs

diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in
index 679e0ba0e94a717a7b0671b9ae98150d729a3685..25cbdc70ede14aa9baea1674e1abb2feae8ca4ad 100644 (file)
--- a/lib/ns/Makefile.in
+++ b/lib/ns/Makefile.in
@@ -11,10 +11,6 @@ srcdir =     @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
-# Attempt to disable parallel processing.
-.NOTPARALLEL:
-.NO_PARALLEL:
-
 VERSION=@BIND9_VERSION@
 @BIND9_MAJOR@
 

diff --git a/make/rules.in b/make/rules.in
index dce80da8315286cd2c4933648331519fee2a1214..97d3e57fd1a35bac1a20b136dab3a825c8c75293 100644 (file)
--- a/make/rules.in
+++ b/make/rules.in
@@ -71,7 +71,7 @@ subdirs:
 #
 # Tests are built after the targets instead of before
 #
-testdirs:
+testdirs: subdirs ${TARGETS}
        @for i in ${ALL_TESTDIRS}; do \
                if [ "$$i" != "nulldir" -a -d $$i ]; then \
                        echo "making all in `pwd`/$$i"; \