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

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9661b8d8a3f10b8bf34d8b7251318814a93a3ed4..d1385822a67020099bc3f16d678ef5f9412681b1 100644 (file)
--- 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 fb5dee48fbc922741ad6b2784bf7bcd34dcef308..391ce5cacbf7042d7af9999bdb744df288ac097d 100644 (file)
--- 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