From 69f5e6b73b0f53cd6027894f0a92b149cbf36e88 Mon Sep 17 00:00:00 2001
From: William King <source@isc.org>
Date: Thu, 7 Oct 1999 21:12:54 +0000
Subject: [PATCH] changed dependencies

---
 bin/tests/db/Makefile.in     | 13 ++++++++-----
 bin/tests/master/Makefile.in | 15 +++++++++------
 bin/tests/names/Makefile.in  | 13 ++++++++-----
 bin/tests/rbt/Makefile.in    | 13 ++++++++-----
 bin/tests/timers/Makefile.in | 13 ++++++++-----
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in
index c22f1dd568..b3535d3d2b 100644
--- a/bin/tests/db/Makefile.in
+++ b/bin/tests/db/Makefile.in
@@ -24,17 +24,20 @@ CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-LIBS =		../../../lib/dns/libdns.@A@ \
-		../../../lib/tests/libt_api.@A@ \
-		../../../lib/isc/libisc.@A@ \
+DEPLIBS =	../../../lib/dns/libdns.@A@ \
+		../../../lib/isc/libisc.@A@ 
+
+LIBS =		${DEPLIBS} \
 		@LIBS@
 
+TLIB =		../../../lib/tests/libt_api.@A@
+
 TARGETS =	t_db
 
 @BIND9_MAKE_RULES@
 
-t_db: t_db.@O@
-	${LIBTOOL} ${CC} -o $@ t_db.@O@ ${LIBS}
+t_db: t_db.@O@ ${DEPLIBS} ${TLIB}
+	${LIBTOOL} ${CC} -o $@ t_db.@O@ ${TLIB}${LIBS}
 
 test:
 	-@./t_db -c @top_srcdir@/t_config -b @srcdir@ -a
diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in
index 4b08a8dcbb..f7a37df417 100644
--- a/bin/tests/master/Makefile.in
+++ b/bin/tests/master/Makefile.in
@@ -25,25 +25,28 @@ CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
-LIBS =		../../../lib/dns/libdns.@A@ \
-		../../../lib/tests/libt_api.@A@ \
-		../../../lib/isc/libisc.@A@ \
+DEPLIBS =	../../../lib/dns/libdns.@A@ \
+		../../../lib/isc/libisc.@A@
+
+LIBS =		${DEPLIBS} \
 		@LIBS@
 
+TLIB =		../../../lib/tests/libt_api.@A@
+
 TARGETS =	t_master
 
 SRCS =		t_master.c
 
 @BIND9_MAKE_RULES@
 
-t_master: t_master.@O@
-	${LIBTOOL} ${CC} -o $@ t_master.@O@ ${LIBS}
+t_master: t_master.@O@ ${DEPLIBS} ${TLIB}
+	${LIBTOOL} ${CC} -o $@ t_master.@O@ ${TLIB} ${LIBS}
 
 test:
 	-@ ./t_master -c @top_srcdir@/t_config -b @srcdir@ -a
 
 testhelp:
-	@./t_master -h
+	@ ./t_master -h
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in
index 444dd9d8cf..857768e27d 100644
--- a/bin/tests/names/Makefile.in
+++ b/bin/tests/names/Makefile.in
@@ -25,19 +25,22 @@ CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
-LIBS =		../../../lib/dns/libdns.@A@ \
-		../../../lib/tests/libt_api.@A@ \
-		../../../lib/isc/libisc.@A@ \
+DEPLIBS =	../../../lib/dns/libdns.@A@ \
+		../../../lib/isc/libisc.@A@
+
+LIBS =		${DEPLIBS} \
 		@LIBS@
 
+TLIB =		../../../lib/tests/libt_api.@A@
+
 TARGETS =	t_names
 
 SRCS =		t_names.c
 
 @BIND9_MAKE_RULES@
 
-t_names: t_names.@O@
-	${LIBTOOL} ${CC} -o $@ t_names.@O@ ${LIBS}
+t_names: t_names.@O@ ${DEPLIBS} ${TLIB}
+	${LIBTOOL} ${CC} -o $@ t_names.@O@ ${TLIB} ${LIBS}
 
 test:
 	-@./t_names -c @top_srcdir@/t_config -b @srcdir@ -a
diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in
index 3f6746b555..ed68cdb182 100644
--- a/bin/tests/rbt/Makefile.in
+++ b/bin/tests/rbt/Makefile.in
@@ -25,19 +25,22 @@ CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
-LIBS =		../../../lib/dns/libdns.@A@ \
-		../../../lib/tests/libt_api.@A@ \
-		../../../lib/isc/libisc.@A@ \
+DEPLIBS =	../../../lib/dns/libdns.@A@ \
+		../../../lib/isc/libisc.@A@
+
+LIBS =		${DEPLIBS} \
 		@LIBS@
 
+TLIB =		../../../lib/tests/libt_api.@A@
+
 TARGETS =	t_rbt
 
 SRCS =		t_rbt.c
 
 @BIND9_MAKE_RULES@
 
-t_rbt: t_rbt.@O@
-	${LIBTOOL} ${CC} -o $@ t_rbt.@O@ ${LIBS}
+t_rbt: t_rbt.@O@ ${DEPLIBS} ${TLIB}
+	${LIBTOOL} ${CC} -o $@ t_rbt.@O@ ${TLIB} ${LIBS}
 
 test:
 	-@./t_rbt -c @top_srcdir@/t_config -b @srcdir@ -a
diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in
index 1e82bfc275..7171a2143c 100644
--- a/bin/tests/timers/Makefile.in
+++ b/bin/tests/timers/Makefile.in
@@ -24,17 +24,20 @@ CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-LIBS =		../../../lib/dns/libdns.@A@ \
-		../../../lib/tests/libt_api.@A@ \
-		../../../lib/isc/libisc.@A@ \
+DEPLIBS =	../../../lib/dns/libdns.@A@ \
+		../../../lib/isc/libisc.@A@
+
+LIBS =		${DEPLIBS} \
 		@LIBS@
 
+TLIB =		../../../lib/tests/libt_api.@A@
+
 TARGETS =	t_timers
 
 @BIND9_MAKE_RULES@
 
-t_timers: t_timers.@O@
-	${LIBTOOL} ${CC} -o $@ t_timers.@O@ ${LIBS}
+t_timers: t_timers.@O@ ${DEPLIBS} ${TLIB}
+	${LIBTOOL} ${CC} -o $@ t_timers.@O@ ${TLIB} ${LIBS}
 
 test:
 	-@./t_timers -c @top_srcdir@/t_config -b @srcdir@ -q 60 -a