summaryrefslogtreecommitdiff
path: root/client/Makefile.in
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2016-09-28 16:36:21 +0200
committerFrancis Dupont <fdupont@isc.org>2016-09-28 16:36:21 +0200
commite94e7f2380bc96bfe237b347e97aa85d0722bf61 (patch)
tree63edcb41af41e78b3199161cd9724662ee511a04 /client/Makefile.in
parentb13b616bb7a1e71e330abbd52e61efd0b98bcd8f (diff)
downloadisc-dhcp-e94e7f2380bc96bfe237b347e97aa85d0722bf61.tar.gz
Finished rebased
Diffstat (limited to 'client/Makefile.in')
-rw-r--r--client/Makefile.in21
1 files changed, 14 insertions, 7 deletions
diff --git a/client/Makefile.in b/client/Makefile.in
index 59597f0f..88c09844 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -108,8 +108,8 @@ am_dhclient_OBJECTS = clparse.$(OBJEXT) dhclient.$(OBJEXT) \
dhc6.$(OBJEXT)
dhclient_OBJECTS = $(am_dhclient_OBJECTS)
dhclient_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \
- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+ @BINDLIBIRSDIR@/libirs.a @BINDLIBDNSDIR@/libdns.a \
+ @BINDLIBISCCFGDIR@/libisccfg.a @BINDLIBISCDIR@/libisc.a
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -253,7 +253,13 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BINDCONFIG = @BINDCONFIG@
BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -356,18 +362,19 @@ 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
AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
- -DLOCALSTATEDIR='"$(localstatedir)"'
-
+ -DLOCALSTATEDIR='"$(localstatedir)"'
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 $(BINDLIBDIR)/libirs.a \
- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+ @BINDLIBIRSDIR@/libirs.a \
+ @BINDLIBDNSDIR@/libdns.a \
+ @BINDLIBISCCFGDIR@/libisccfg.a \
+ @BINDLIBISCDIR@/libisc.a
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)