diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-11-17 14:55:09 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-11-17 14:55:09 +0100 |
| commit | a555d1ab9ff099e4bf278ba416188b7491f51f7f (patch) | |
| tree | a96633bd93e868f56dc99e5ef729716713191363 /dhcpctl | |
| parent | ce29e695745f3a660f0a0cd9e43b4b1c41bb8276 (diff) | |
| parent | 2830c4005906378b3f14bcb8c146a156268bc3dc (diff) | |
| download | isc-dhcp-a555d1ab9ff099e4bf278ba416188b7491f51f7f.tar.gz | |
Finished merge of rt39210 (--with-libbind fixes) (regen required)
Diffstat (limited to 'dhcpctl')
| -rw-r--r-- | dhcpctl/Makefile.am | 10 | ||||
| -rw-r--r-- | dhcpctl/Makefile.in | 20 |
2 files changed, 18 insertions, 12 deletions
diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am index dfa47095..ceb0de12 100644 --- a/dhcpctl/Makefile.am +++ b/dhcpctl/Makefile.am @@ -1,3 +1,5 @@ +BINDLIBDIR = @BINDDIR@/lib + bin_PROGRAMS = omshell lib_LIBRARIES = libdhcpctl.a noinst_PROGRAMS = cltest @@ -6,12 +8,12 @@ EXTRA_DIST = $(man_MANS) omshell_SOURCES = omshell.c omshell_LDADD = libdhcpctl.a ../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 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c cltest_LDADD = libdhcpctl.a ../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 diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in index 4fc4f08d..96725abd 100644 --- a/dhcpctl/Makefile.in +++ b/dhcpctl/Makefile.in @@ -146,13 +146,15 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_cltest_OBJECTS = cltest.$(OBJEXT) cltest_OBJECTS = $(am_cltest_OBJECTS) cltest_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \ - ../omapip/libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a am_omshell_OBJECTS = omshell.$(OBJEXT) omshell_OBJECTS = $(am_omshell_OBJECTS) omshell_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \ - ../omapip/libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + ../omapip/libomapi.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 @@ -225,6 +227,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -319,19 +322,20 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +BINDLIBDIR = @BINDDIR@/lib lib_LIBRARIES = libdhcpctl.a man_MANS = omshell.1 dhcpctl.3 EXTRA_DIST = $(man_MANS) omshell_SOURCES = omshell.c omshell_LDADD = libdhcpctl.a ../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 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c cltest_LDADD = libdhcpctl.a ../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 all: all-am |