diff options
author | Francis Dupont <fdupont@isc.org> | 2015-04-17 14:53:46 +0200 |
---|---|---|
committer | Francis Dupont <fdupont@isc.org> | 2015-04-17 14:53:46 +0200 |
commit | 0fb9c8a1a27f0ae78da3e475e5c4f1eac46e3f24 (patch) | |
tree | 1cc219603db3149684d30c466a8e8da5cd3e649f /client | |
parent | 1756c86936a99a34acbc6fcf28e05dff771c373b (diff) | |
download | isc-dhcp-0fb9c8a1a27f0ae78da3e475e5c4f1eac46e3f24.tar.gz |
regen
Diffstat (limited to 'client')
-rw-r--r-- | client/Makefile.in | 10 | ||||
-rw-r--r-- | client/tests/Makefile.in | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/client/Makefile.in b/client/Makefile.in index 72fce7c8..248185a8 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -98,8 +98,8 @@ am_dhclient_OBJECTS = clparse.$(OBJEXT) dhclient.$(OBJEXT) \ dhc6.$(OBJEXT) dhclient_OBJECTS = $(am_dhclient_OBJECTS) dhclient_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -240,6 +240,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -339,14 +340,15 @@ top_srcdir = @top_srcdir@ # directory. That eliminates any discrepancies between tested code and # production code. Sadly, we are not there yet. SUBDIRS = . tests +BINDLIBDIR = @BINDDIR@/lib dist_sysconf_DATA = dhclient.conf.example dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ scripts/netbsd scripts/nextstep scripts/openbsd \ scripts/solaris scripts/openwrt -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) diff --git a/client/tests/Makefile.in b/client/tests/Makefile.in index 303eb130..cab19812 100644 --- a/client/tests/Makefile.in +++ b/client/tests/Makefile.in @@ -213,6 +213,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -307,15 +308,16 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . +BINDLIBDIR = @BINDDIR@/lib AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \ -I$(top_srcdir)/bind/include -I$(top_srcdir) \ -DLOCALSTATEDIR='"."' -DCLIENT_PATH='"."' EXTRA_DIST = Atffile duid0_test.txt duid1_test.txt duid2_test.txt duid3_test.txt DHCPSRC = ../clparse.c ../dhc6.c ../dhclient.c DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ - $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \ - $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \ - $(top_builddir)/bind/lib/libisc.a + $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a ATF_TESTS = $(am__append_1) @HAVE_ATF_TRUE@duid_unittests_SOURCES = $(DHCPSRC) duid_unittest.c |