[#71] Rework relay/tests Makefile.am

configure.ac
    - added relay/tests/Makefile.am

relay/tests/Makefile.am
    - reworked it for v4_1_esv

diff --git a/configure.ac b/configure.ac
index 92723a2f13fb03478771dcde7ea82aa75c7be5f5..901b77658c8f2d06d80dcf78e7cbb9260a38d1fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -659,6 +659,7 @@ AC_OUTPUT([
   minires/Makefile
   omapip/Makefile
   relay/Makefile
+  relay/tests/Makefile
   server/Makefile
   tests/Makefile
   tests/unittest.sh

diff --git a/relay/tests/Makefile.am b/relay/tests/Makefile.am
index 0da6e292ac3d128250813cd666e3d3da61418fb6..1c9f816226f85afe8b9ff3e768ef5771c993287d 100644 (file)
--- a/relay/tests/Makefile.am
+++ b/relay/tests/Makefile.am
@@ -1,10 +1,9 @@
 SUBDIRS = .
 
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
-AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
 AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
 
-EXTRA_DIST = Atffile Kyuafile
+EXTRA_DIST = Atffile
 
 # for autotools debugging only
 info:
@@ -14,12 +13,9 @@ info:
 
 DHCPSRC = ../dhcrelay.c
 
-DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \
-         $(top_builddir)/omapip/libomapi.@A@    \
-         @BINDLIBIRSDIR@/libirs.@A@ \
-         @BINDLIBDNSDIR@/libdns.@A@ \
-         @BINDLIBISCCFGDIR@/libisccfg.@A@ \
-         @BINDLIBISCDIR@/libisc.@A@
+DHCPLIBS = $(top_builddir)/common/libdhcp.a \
+         $(top_builddir)/omapip/libomapi.a \
+         $(top_builddir)/dst/libdst.a
 
 ATF_TESTS =
 if HAVE_ATF
@@ -35,13 +31,12 @@ relay_unittests_LDADD += $(DHCPLIBS)
 check: $(ATF_TESTS)
        @if test $(top_srcdir) != ${top_builddir}; then \
                cp $(top_srcdir)/relay/tests/Atffile Atffile; \
-               cp $(top_srcdir)/relay/tests/Kyuafile Kyuafile; \
        fi
        sh ${top_builddir}/tests/unittest.sh
 
 distclean-local:
        @if test $(top_srcdir) != ${top_builddir}; then \
-               rm -f Atffile Kyuafile;
+               rm -f Atffile;
        fi
 
 endif