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 /omapip | |
| parent | ce29e695745f3a660f0a0cd9e43b4b1c41bb8276 (diff) | |
| parent | 2830c4005906378b3f14bcb8c146a156268bc3dc (diff) | |
| download | isc-dhcp-a555d1ab9ff099e4bf278ba416188b7491f51f7f.tar.gz | |
Finished merge of rt39210 (--with-libbind fixes) (regen required)
Diffstat (limited to 'omapip')
| -rw-r--r-- | omapip/Makefile.am | 6 | ||||
| -rw-r--r-- | omapip/Makefile.in | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/omapip/Makefile.am b/omapip/Makefile.am index 8237de0e..446a5941 100644 --- a/omapip/Makefile.am +++ b/omapip/Makefile.am @@ -1,3 +1,5 @@ +BINDLIBDIR = @BINDDIR@/lib + lib_LIBRARIES = libomapi.a noinst_PROGRAMS = svtest @@ -10,6 +12,6 @@ man_MANS = omapi.3 EXTRA_DIST = $(man_MANS) svtest_SOURCES = test.c -svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a +svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a diff --git a/omapip/Makefile.in b/omapip/Makefile.in index daa0fced..b3cdff84 100644 --- a/omapip/Makefile.in +++ b/omapip/Makefile.in @@ -149,9 +149,9 @@ libomapi_a_OBJECTS = $(am_libomapi_a_OBJECTS) PROGRAMS = $(noinst_PROGRAMS) am_svtest_OBJECTS = test.$(OBJEXT) svtest_OBJECTS = $(am_svtest_OBJECTS) -svtest_DEPENDENCIES = libomapi.a ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a \ - ../bind/lib/libisc.a +svtest_DEPENDENCIES = 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 @@ -222,6 +222,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -316,6 +317,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +BINDLIBDIR = @BINDDIR@/lib lib_LIBRARIES = libomapi.a libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ errwarn.c listener.c dispatch.c generic.c support.c \ @@ -325,8 +327,8 @@ libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ man_MANS = omapi.3 EXTRA_DIST = $(man_MANS) svtest_SOURCES = test.c -svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a +svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a all: all-am |