diff options
| author | Thomas Markwalder <tmark@isc.org> | 2019-12-20 12:10:17 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2019-12-20 12:10:17 -0500 |
| commit | 69a045e90953a33f15f7060e7f526356752fc23a (patch) | |
| tree | 2ecc8ac004b2d04b9c640d31dcde92a16e30c982 | |
| parent | a61884c380ba84d584dbff72af89c40494e1f3c1 (diff) | |
| download | isc-dhcp-69a045e90953a33f15f7060e7f526356752fc23a.tar.gz | |
[#71] Rework relay/tests Makefile.am
configure.ac
- added relay/tests/Makefile.am
relay/tests/Makefile.am
- reworked it for v4_1_esv
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | relay/tests/Makefile.am | 15 |
2 files changed, 6 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 92723a2f..901b7765 100644 --- 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 0da6e292..1c9f8162 100644 --- 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 |