Add rules to make sure subdirs are always built before testdirs

(cherry picked from commit 723433cbc61d1a04c78355b25414e75e6b8880db)

diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in
index ec152497e9649cd1626422c3cf981f3576009704..a14728d6d51d21ba22424816f500d40626dae5a1 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 dfac0627ac66ed24153f38b45782bb462a3e3356..86456eb4f32e1ccc39305a519469dacbc5e3c2b3 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"; \