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