[master] Update test makefiles to use the correct libraries

diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in
index 467a0545c30e00c311067f1ea5c2a48b7889ea0c..76b0ac8afe3ae510ff7939059c91a5cc6d054071 100644 (file)
--- a/common/tests/Makefile.in
+++ b/common/tests/Makefile.in
@@ -102,7 +102,8 @@ am__DEPENDENCIES_1 =
 @HAVE_ATF_TRUE@alloc_unittest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 @HAVE_ATF_TRUE@        ../libdhcp.a ../../omapip/libomapi.a \
 @HAVE_ATF_TRUE@        ../../bind/lib/libirs.a ../../bind/lib/libdns.a \
-@HAVE_ATF_TRUE@        ../bind/lib/libisccfg.a ../../bind/lib/libisc.a
+@HAVE_ATF_TRUE@        ../../bind/lib/libisccfg.a \
+@HAVE_ATF_TRUE@        ../../bind/lib/libisc.a
 am__dns_unittest_SOURCES_DIST = dns_unittest.c \
        $(top_srcdir)/tests/t_api_dhcp.c
 @HAVE_ATF_TRUE@am_dns_unittest_OBJECTS = dns_unittest.$(OBJEXT) \
@@ -110,7 +111,9 @@ am__dns_unittest_SOURCES_DIST = dns_unittest.c \
 dns_unittest_OBJECTS = $(am_dns_unittest_OBJECTS)
 @HAVE_ATF_TRUE@dns_unittest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 @HAVE_ATF_TRUE@        ../libdhcp.a ../../omapip/libomapi.a \
-@HAVE_ATF_TRUE@        ../../bind/lib/libdns.a ../../bind/lib/libisc.a
+@HAVE_ATF_TRUE@        ../../bind/lib/libirs.a ../../bind/lib/libdns.a \
+@HAVE_ATF_TRUE@        ../../bind/lib/libisccfg.a \
+@HAVE_ATF_TRUE@        ../../bind/lib/libisc.a
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -322,11 +325,14 @@ ATF_TESTS = $(am__append_1)
 @HAVE_ATF_TRUE@alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
 @HAVE_ATF_TRUE@alloc_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.a \
 @HAVE_ATF_TRUE@        ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-@HAVE_ATF_TRUE@        ../../bind/lib/libdns.a ../bind/lib/libisccfg.a \
+@HAVE_ATF_TRUE@        ../../bind/lib/libdns.a \
+@HAVE_ATF_TRUE@        ../../bind/lib/libisccfg.a \
 @HAVE_ATF_TRUE@        ../../bind/lib/libisc.a
 @HAVE_ATF_TRUE@dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
 @HAVE_ATF_TRUE@dns_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.a \
-@HAVE_ATF_TRUE@        ../../omapip/libomapi.a ../../bind/lib/libdns.a \
+@HAVE_ATF_TRUE@        ../../omapip/libomapi.a ../../bind/lib/libirs.a \
+@HAVE_ATF_TRUE@        ../../bind/lib/libdns.a \
+@HAVE_ATF_TRUE@        ../../bind/lib/libisccfg.a \
 @HAVE_ATF_TRUE@        ../../bind/lib/libisc.a
 all: all-recursive
 

diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in
index 5c100a336f01d25cc97027358cd59da443c84866..4f8ae73e98103495270910879b46078574b7f234 100644 (file)
--- a/server/tests/Makefile.in
+++ b/server/tests/Makefile.in
@@ -566,7 +566,7 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c      \
 
 DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a    \
           $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \
-         $(top_builddir)/bind/lib/libdns.a $(top_builddir/bind/lib/libisccfg.a \
+         $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \
          $(top_builddir)/bind/lib/libisc.a
 
 ATF_TESTS = $(am__append_1)