From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 2 Jul 2019 10:16:30 +0000 (+0200)
Subject: Add rules to make sure subdirs are always built before testdirs
X-Git-Tag: v9.15.2~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=723433cbc61d1a04c78355b25414e75e6b8880db;p=thirdparty%2Fbind9.git

Add rules to make sure subdirs are always built before testdirs
---

diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in
index 679e0ba0e94..25cbdc70ede 100644
--- 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 dce80da8315..97d3e57fd1a 100644
--- 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"; \