diff options
| -rw-r--r-- | common/Makefile.in | 5 | ||||
| -rw-r--r-- | common/tests/Makefile.in | 29 | ||||
| -rw-r--r-- | server/Makefile.in | 5 |
3 files changed, 21 insertions, 18 deletions
diff --git a/common/Makefile.in b/common/Makefile.in index 42136e03..d705b22e 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -30,7 +30,6 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -@HAVE_ATF_TRUE@am__append_1 = tests subdir = common DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -79,7 +78,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = . tests +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -185,7 +184,7 @@ 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 = . $(am__append_1) +SUBDIRS = . tests all: all-recursive .SUFFIXES: diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in index 36851998..afba2024 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -29,7 +29,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -check_PROGRAMS = $(am__EXEEXT_1) +@HAVE_ATF_TRUE@am__append_1 = alloc_unittest +check_PROGRAMS = $(am__EXEEXT_2) subdir = common/tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -39,13 +40,17 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/includes/config.h CONFIG_CLEAN_FILES = -am__EXEEXT_1 = alloc_unittest$(EXEEXT) -am_alloc_unittest_OBJECTS = test_alloc.$(OBJEXT) t_api_dhcp.$(OBJEXT) +@HAVE_ATF_TRUE@am__EXEEXT_1 = alloc_unittest$(EXEEXT) +am__EXEEXT_2 = $(am__EXEEXT_1) +am__alloc_unittest_SOURCES_DIST = test_alloc.c \ + $(top_srcdir)/tests/t_api_dhcp.c +@HAVE_ATF_TRUE@am_alloc_unittest_OBJECTS = test_alloc.$(OBJEXT) \ +@HAVE_ATF_TRUE@ t_api_dhcp.$(OBJEXT) alloc_unittest_OBJECTS = $(am_alloc_unittest_OBJECTS) am__DEPENDENCIES_1 = -alloc_unittest_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libdhcp.a \ - ../../omapip/libomapi.a ../../bind/lib/libdns.a \ - ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@alloc_unittest_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@HAVE_ATF_TRUE@ ../libdhcp.a ../../omapip/libomapi.a \ +@HAVE_ATF_TRUE@ ../../bind/lib/libdns.a ../../bind/lib/libisc.a DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -54,7 +59,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(alloc_unittest_SOURCES) -DIST_SOURCES = $(alloc_unittest_SOURCES) +DIST_SOURCES = $(am__alloc_unittest_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -163,11 +168,11 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -I$(top_srcdir)/includes -ATF_TESTS = alloc_unittest -alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c -alloc_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.a \ - ../../omapip/libomapi.a ../../bind/lib/libdns.a \ - ../../bind/lib/libisc.a +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/libdns.a \ +@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a all: all-recursive .SUFFIXES: diff --git a/server/Makefile.in b/server/Makefile.in index f840da2b..3743b1b8 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -31,7 +31,6 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -@HAVE_ATF_TRUE@am__append_1 = tests sbin_PROGRAMS = dhcpd$(EXEEXT) subdir = server DIST_COMMON = $(dist_sysconf_DATA) $(srcdir)/Makefile.am \ @@ -94,7 +93,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = . tests +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -189,7 +188,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = . $(am__append_1) +SUBDIRS = . tests AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' dist_sysconf_DATA = dhcpd.conf dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ |