From d995dc46614fac43a48c0f9cb915f1e9967dde82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 2 Jul 2019 12:16:30 +0200
Subject: [PATCH] Add rules to make sure subdirs are always built before
 testdirs

(cherry picked from commit 723433cbc61d1a04c78355b25414e75e6b8880db)
---
 lib/ns/Makefile.in | 4 ----
 make/rules.in      | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in
index ec152497e9..a14728d6d5 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 dfac0627ac..86456eb4f3 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"; \