|
 |
45d60a |
diff -up dhcp-4.2.5b1/client/Makefile.am.sharedlib dhcp-4.2.5b1/client/Makefile.am
|
|
|
45d60a |
--- dhcp-4.2.5b1/client/Makefile.am.sharedlib 2012-12-17 16:26:53.350623790 +0100
|
|
|
45d60a |
+++ dhcp-4.2.5b1/client/Makefile.am 2012-12-17 16:26:53.384623342 +0100
|
|
|
45d60a |
@@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c
|
|
|
45d60a |
scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
|
|
|
45d60a |
scripts/netbsd scripts/nextstep scripts/openbsd \
|
|
|
45d60a |
scripts/solaris scripts/openwrt
|
|
|
45d60a |
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
45d60a |
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
|
|
45d60a |
$(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
|
|
|
45d60a |
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
|
|
|
45d60a |
EXTRA_DIST = $(man_MANS)
|
|
|
45d60a |
diff -up dhcp-4.2.5b1/common/tests/Makefile.am.sharedlib dhcp-4.2.5b1/common/tests/Makefile.am
|
|
|
45d60a |
--- dhcp-4.2.5b1/common/tests/Makefile.am.sharedlib 2012-12-17 16:26:53.271624835 +0100
|
|
|
45d60a |
+++ dhcp-4.2.5b1/common/tests/Makefile.am 2012-12-17 16:26:53.384623342 +0100
|
|
|
45d60a |
@@ -13,7 +13,7 @@ ATF_TESTS += alloc_unittest
|
|
|
45d60a |
alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
45d60a |
alloc_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
45d60a |
alloc_unittest_LDADD += ../libdhcp.a \
|
|
|
45d60a |
- ../../omapip/libomapi.a \
|
|
|
45d60a |
+ ../../omapip/libomapi.la \
|
|
|
45d60a |
$(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
|
|
|
45d60a |
check: $(ATF_TESTS)
|
|
|
45d60a |
diff -up dhcp-4.2.5b1/configure.ac.sharedlib dhcp-4.2.5b1/configure.ac
|
|
|
45d60a |
--- dhcp-4.2.5b1/configure.ac.sharedlib 2012-12-17 16:26:53.350623790 +0100
|
|
|
45d60a |
+++ dhcp-4.2.5b1/configure.ac 2012-12-17 16:26:53.384623342 +0100
|
|
|
45d60a |
@@ -37,7 +37,8 @@ fi
|
|
|
45d60a |
# Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
|
|
|
45d60a |
AC_USE_SYSTEM_EXTENSIONS
|
|
|
45d60a |
|
|
|
45d60a |
-AC_PROG_RANLIB
|
|
|
45d60a |
+# Use libtool to simplify building of shared libraries
|
|
|
45d60a |
+AC_PROG_LIBTOOL
|
|
|
45d60a |
AC_CONFIG_HEADERS([includes/config.h])
|
|
|
45d60a |
|
|
|
45d60a |
# we sometimes need to know byte order for building packets
|
|
|
45d60a |
diff -up dhcp-4.2.5b1/dhcpctl/Makefile.am.sharedlib dhcp-4.2.5b1/dhcpctl/Makefile.am
|
|
|
45d60a |
--- dhcp-4.2.5b1/dhcpctl/Makefile.am.sharedlib 2012-12-17 16:26:53.271624835 +0100
|
|
|
45d60a |
+++ dhcp-4.2.5b1/dhcpctl/Makefile.am 2012-12-17 16:26:53.385623329 +0100
|
|
|
45d60a |
@@ -1,15 +1,15 @@
|
|
|
45d60a |
bin_PROGRAMS = omshell
|
|
|
45d60a |
-lib_LIBRARIES = libdhcpctl.a
|
|
|
45d60a |
+lib_LTLIBRARIES = libdhcpctl.la
|
|
|
45d60a |
noinst_PROGRAMS = cltest
|
|
|
45d60a |
man_MANS = omshell.1 dhcpctl.3
|
|
|
45d60a |
EXTRA_DIST = $(man_MANS)
|
|
|
45d60a |
|
|
|
45d60a |
omshell_SOURCES = omshell.c
|
|
|
45d60a |
-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
45d60a |
+omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
|
|
|
45d60a |
$(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
|
|
|
45d60a |
-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
|
|
|
45d60a |
+libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
|
|
|
45d60a |
|
|
|
45d60a |
cltest_SOURCES = cltest.c
|
|
|
45d60a |
-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
45d60a |
+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
|
|
|
45d60a |
$(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
diff -up dhcp-4.2.5b1/omapip/Makefile.am.sharedlib dhcp-4.2.5b1/omapip/Makefile.am
|
|
|
45d60a |
--- dhcp-4.2.5b1/omapip/Makefile.am.sharedlib 2012-12-17 16:26:53.272624822 +0100
|
|
|
45d60a |
+++ dhcp-4.2.5b1/omapip/Makefile.am 2012-12-17 16:26:53.385623329 +0100
|
|
|
45d60a |
@@ -1,7 +1,7 @@
|
|
|
45d60a |
-lib_LIBRARIES = libomapi.a
|
|
|
45d60a |
+lib_LTLIBRARIES = libomapi.la
|
|
|
45d60a |
noinst_PROGRAMS = svtest
|
|
|
45d60a |
|
|
|
45d60a |
-libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
|
|
|
45d60a |
+libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
|
|
|
45d60a |
errwarn.c listener.c dispatch.c generic.c support.c \
|
|
|
45d60a |
handle.c message.c convert.c hash.c auth.c inet_addr.c \
|
|
|
45d60a |
array.c trace.c toisc.c iscprint.c isclib.c
|
|
|
45d60a |
@@ -10,5 +10,5 @@ man_MANS = omapi.3
|
|
|
45d60a |
EXTRA_DIST = $(man_MANS)
|
|
|
45d60a |
|
|
|
45d60a |
svtest_SOURCES = test.c
|
|
|
45d60a |
-svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
+svtest_LDADD = libomapi.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
|
|
|
45d60a |
diff -up dhcp-4.2.5b1/relay/Makefile.am.sharedlib dhcp-4.2.5b1/relay/Makefile.am
|
|
|
45d60a |
--- dhcp-4.2.5b1/relay/Makefile.am.sharedlib 2012-12-17 16:26:53.351623777 +0100
|
|
|
45d60a |
+++ dhcp-4.2.5b1/relay/Makefile.am 2012-12-17 16:26:53.385623329 +0100
|
|
|
45d60a |
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
|
|
|
45d60a |
|
|
|
45d60a |
sbin_PROGRAMS = dhcrelay
|
|
|
45d60a |
dhcrelay_SOURCES = dhcrelay.c
|
|
|
45d60a |
-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
45d60a |
+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
|
|
45d60a |
$(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
|
|
|
45d60a |
man_MANS = dhcrelay.8
|
|
|
45d60a |
EXTRA_DIST = $(man_MANS)
|
|
|
45d60a |
diff -up dhcp-4.2.5b1/server/Makefile.am.sharedlib dhcp-4.2.5b1/server/Makefile.am
|
|
|
45d60a |
--- dhcp-4.2.5b1/server/Makefile.am.sharedlib 2012-12-17 16:26:53.272624822 +0100
|
|
|
45d60a |
+++ dhcp-4.2.5b1/server/Makefile.am 2012-12-17 16:26:53.385623329 +0100
|
|
|
45d60a |
@@ -13,8 +13,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
|
|
|
45d60a |
dhcpv6.c mdb6.c ldap.c ldap_casa.c
|
|
|
45d60a |
|
|
|
45d60a |
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
|
|
45d60a |
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
45d60a |
- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
|
|
45d60a |
+ ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
|
|
|
45d60a |
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
|
|
|
45d60a |
EXTRA_DIST = $(man_MANS)
|
|
|
45d60a |
diff -up dhcp-4.2.5b1/server/tests/Makefile.am.sharedlib dhcp-4.2.5b1/server/tests/Makefile.am
|
|
|
45d60a |
--- dhcp-4.2.5b1/server/tests/Makefile.am.sharedlib 2012-12-17 16:26:53.000000000 +0100
|
|
|
45d60a |
+++ dhcp-4.2.5b1/server/tests/Makefile.am 2012-12-17 16:28:25.898349545 +0100
|
|
|
45d60a |
@@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
|
|
|
45d60a |
../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \
|
|
|
45d60a |
../ldap.c ../ldap_casa.c ../dhcpd.c
|
|
|
45d60a |
|
|
|
45d60a |
-DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
|
|
|
45d60a |
- $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
+DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
|
|
|
45d60a |
+ $(top_builddir)/dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
|
45d60a |
|
|
|
45d60a |
ATF_TESTS =
|
|
|
45d60a |
TESTS =
|