From: Evan Hunt <each@isc.org>
Date: Wed, 15 Jan 2014 19:46:17 +0000 (-0800)
Subject: [master] try again, ensuring atf tests build...
X-Git-Tag: v9.10.0a2~84
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0a3fafde842a97cb872b87c2850e635e8be6014e;p=thirdparty%2Fbind9.git

[master] try again, ensuring atf tests build...
---

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9661b8d8a3f..d1385822a67 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
 # Attempt to disable parallel processing.
 .NOTPARALLEL:
 .NO_PARALLEL:
-SUBDIRS =	isc iscpk11 isccc dns isccfg bind9 lwres irs tests samples
+SUBDIRS =	iscpk11 isc isccc dns isccfg bind9 lwres irs tests samples
 TARGETS =
 
 @BIND9_MAKE_RULES@
diff --git a/lib/iscpk11/Makefile.in b/lib/iscpk11/Makefile.in
index fb5dee48fbc..391ce5cacbf 100644
--- a/lib/iscpk11/Makefile.in
+++ b/lib/iscpk11/Makefile.in
@@ -31,11 +31,9 @@ CINCLUDES =	-I. ${ISC_INCLUDES} ${DNS_INCLUDES} ${ISCPK11_INCLUDES}
 CDEFINES =	@CRYPTO@ @USE_PKCS11@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
 CWARNINGS =
 
-ISCLIBS =	../../lib/isc/libisc.@A@
 ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = libiscpk11.@A@
 
 LIBS =		@LIBS@
 
@@ -70,7 +68,7 @@ libiscpk11.la: ${OBJS}
 	${LIBTOOL_MODE_LINK} \
 		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libiscpk11.la -rpath ${libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-		${OBJS} ${ISCLIBS} ${LIBS}
+		${OBJS} ${LIBS}
 
 timestamp: libiscpk11.@A@
 	touch timestamp