diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/Makefile.in | 1 | ||||
-rw-r--r-- | common/tests/Makefile.am | 18 | ||||
-rw-r--r-- | common/tests/Makefile.in | 58 |
3 files changed, 41 insertions, 36 deletions
diff --git a/common/Makefile.in b/common/Makefile.in index ed6b44ee..7c49bed2 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -257,6 +257,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am index 32e055c1..34748fea 100644 --- a/common/tests/Makefile.am +++ b/common/tests/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = . +BINDLIBDIR = @BINDDIR@/lib + AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes EXTRA_DIST = Atffile @@ -13,26 +15,26 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest 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 + ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/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/libirs.a \ - ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a + ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c misc_unittest_LDADD = $(ATF_LDFLAGS) misc_unittest_LDADD += ../libdhcp.a \ - ../../omapip/libomapi.a ../../bind/lib/libirs.a \ - ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a + ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c ns_name_unittest_LDADD = $(ATF_LDFLAGS) ns_name_unittest_LDADD += ../libdhcp.a \ - ../../omapip/libomapi.a ../../bind/lib/libirs.a \ - ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a + ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a check: $(ATF_TESTS) sh ${top_srcdir}/tests/unittest.sh diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in index 2ed8f532..7b648a4b 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -111,9 +111,9 @@ alloc_unittest_OBJECTS = $(am_alloc_unittest_OBJECTS) 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 \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/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) \ @@ -121,9 +121,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/libirs.a ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a am__misc_unittest_SOURCES_DIST = misc_unittest.c \ $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@am_misc_unittest_OBJECTS = misc_unittest.$(OBJEXT) \ @@ -131,9 +131,9 @@ am__misc_unittest_SOURCES_DIST = misc_unittest.c \ misc_unittest_OBJECTS = $(am_misc_unittest_OBJECTS) @HAVE_ATF_TRUE@misc_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 \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a am__ns_name_unittest_SOURCES_DIST = ns_name_test.c \ $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@am_ns_name_unittest_OBJECTS = ns_name_test.$(OBJEXT) \ @@ -141,9 +141,9 @@ am__ns_name_unittest_SOURCES_DIST = ns_name_test.c \ ns_name_unittest_OBJECTS = $(am_ns_name_unittest_OBJECTS) @HAVE_ATF_TRUE@ns_name_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 \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -261,6 +261,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -356,33 +357,34 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . +BINDLIBDIR = @BINDDIR@/lib AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes EXTRA_DIST = Atffile 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 \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/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/libirs.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@ ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a @HAVE_ATF_TRUE@misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@misc_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.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 +@HAVE_ATF_TRUE@ ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a @HAVE_ATF_TRUE@ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@ns_name_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.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 +@HAVE_ATF_TRUE@ ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a all: all-recursive .SUFFIXES: |