[rt25901_atf] tests subdirs are now unconditionally listed in SUBDIRS

diff --git a/common/Makefile.am b/common/Makefile.am
index 8bd27f7ea4015724bfea07c66e3f01c148f04b6e..7199d4b987d2e746f143acd0dd6ca82b74f6e266 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -10,8 +10,4 @@ libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
 man_MANS = dhcp-eval.5 dhcp-options.5
 EXTRA_DIST = $(man_MANS)
 
-SUBDIRS = .
-
-if HAVE_ATF
-  SUBDIRS += tests
-endif
+SUBDIRS = . tests

diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index eeba8dbb3a5a412d37a894c0d9f5b7c67f110ac1..a389c4137c1c116a822f93cc4f37f0edf535a144 100644 (file)
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -2,9 +2,11 @@ SUBDIRS = .
 
 AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -I$(top_srcdir)/includes
 
-ATF_TESTS = alloc_unittest
+ATF_TESTS =
 
-check_PROGRAMS = $(ATF_TESTS)
+if HAVE_ATF
+
+ATF_TESTS += alloc_unittest
 
 alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
 alloc_unittest_LDADD = $(ATF_LDFLAGS)
@@ -12,5 +14,9 @@ alloc_unittest_LDADD += ../libdhcp.a  \
        ../../omapip/libomapi.a ../../bind/lib/libdns.a \
         ../../bind/lib/libisc.a
 
+endif
+
 check: $(ATF_TESTS)
        atf-run | atf-report
+
+check_PROGRAMS = $(ATF_TESTS)

diff --git a/server/Makefile.am b/server/Makefile.am
index 1330619b29cf3759b553926dd6f21a5488a4e944..3c2bba7128b1688034dab1d187db807b45bcfe76 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,11 +1,7 @@
-SUBDIRS = .
+SUBDIRS = . tests
 
 AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
 
-if HAVE_ATF
-  SUBDIRS += tests
-endif
-
 dist_sysconf_DATA = dhcpd.conf
 sbin_PROGRAMS = dhcpd
 dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \