summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Routhier <sar@isc.com>2012-08-23 17:53:41 +0000
committerShawn Routhier <sar@isc.com>2012-08-23 17:53:41 +0000
commitb8ee38f1a50299e35c37a0eeadce30051dda7696 (patch)
treefe376bdacf977a56b17b7dbc7d5c7a7f9fd3a0ae
parent681ab1a7bf36d85a9ce521d63fef6ba1b6eb7e21 (diff)
downloadisc-dhcp-4_1_esv_r7.tar.gz
Add common/tests/Atffile and server/tests/Atffile tov4_1_esv_r7
the distribution and update the auto generated files
-rw-r--r--common/tests/Makefile.am2
-rw-r--r--common/tests/Makefile.in1
-rw-r--r--server/tests/Makefile.am4
-rw-r--r--server/tests/Makefile.in1
4 files changed, 7 insertions, 1 deletions
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index 66c9681d..d943a4e3 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = .
AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -I$(top_srcdir)/includes
+EXTRA_DIST = Atffile
+
ATF_TESTS =
if HAVE_ATF
diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in
index 0f0293f7..35f77adb 100644
--- a/common/tests/Makefile.in
+++ b/common/tests/Makefile.in
@@ -167,6 +167,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = .
AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -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 \
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index dbf6c55f..45db34d8 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
AM_CPPFLAGS += -std=c99 -I$(top_srcdir)/bind/include -I$(top_srcdir)
AM_CPPFLAGS += -DLOCALSTATEDIR='"."' -Wno-unused-function -Wno-error=unused-variable
+EXTRA_DIST = Atffile
+
# for autotools debugging only
info:
@echo "ATF_CFLAGS=$(ATF_CFLAGS)"
@@ -46,4 +48,4 @@ legacy_unittests_LDADD = $(DHCPLIBS) $(ATF_LDFLAGS)
endif
-check_PROGRAMS = $(ATF_TESTS) $(TESTS) \ No newline at end of file
+check_PROGRAMS = $(ATF_TESTS) $(TESTS)
diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in
index b2ef2cba..4e2dd738 100644
--- a/server/tests/Makefile.in
+++ b/server/tests/Makefile.in
@@ -203,6 +203,7 @@ AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \
-std=c99 -I$(top_srcdir)/bind/include -I$(top_srcdir) \
-DLOCALSTATEDIR='"."' -Wno-unused-function \
-Wno-error=unused-variable
+EXTRA_DIST = Atffile
DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \
../failover.c ../omapi.c ../mdb.c ../stables.c ../salloc.c \
../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \