[master] Correct some makefile issues in the test directories

diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index ddb2e9da3139afc3769d6120c56246d0efd06019..18456be85db8adcea604982ed94a63a28f8caa37 100644 (file)
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -14,13 +14,13 @@ alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
 alloc_unittest_LDADD = $(ATF_LDFLAGS)
 alloc_unittest_LDADD += ../libdhcp.a  \
        ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-       ../../bind/lib/libdns.a ../bind/lib/libisccfg.a  ../../bind/lib/libisc.a
+       ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a  ../../bind/lib/libisc.a
 
 dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
 dns_unittest_LDADD = $(ATF_LDFLAGS)
 dns_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a ../../bind/lib/libdns.a \
-        ../../bind/lib/libisc.a
+       ../../omapip/libomapi.a ../../bind/lib/libirs.a \
+       ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a  ../../bind/lib/libisc.a
 
 check: $(ATF_TESTS)
        atf-run | atf-report

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 1b257462ee1a1a2342507b6740608568eaa85490..984881bb10b90df0eac03ad6033a980c0ab03327 100644 (file)
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -19,7 +19,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 =