|
 |
8173a68 |
diff -up dhcp-4.3.4/client/Makefile.am.sharedlib dhcp-4.3.4/client/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/client/Makefile.am.sharedlib 2016-04-29 11:48:30.389923087 +0200
|
|
|
8173a68 |
+++ dhcp-4.3.4/client/Makefile.am 2016-04-29 11:48:30.393923084 +0200
|
|
|
8173a68 |
@@ -13,7 +13,7 @@ dhclient_SOURCES = clparse.c dhclient.c
|
|
|
34b6412 |
scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
|
|
|
34b6412 |
scripts/netbsd scripts/nextstep scripts/openbsd \
|
|
Adam Tkac |
81227ae |
scripts/solaris scripts/openwrt
|
|
Adam Tkac |
81227ae |
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
Adam Tkac |
81227ae |
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
|
 |
cccec22 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
34b6412 |
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
|
|
|
34b6412 |
EXTRA_DIST = $(man_MANS)
|
|
|
8173a68 |
diff -up dhcp-4.3.4/common/tests/Makefile.am.sharedlib dhcp-4.3.4/common/tests/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/common/tests/Makefile.am.sharedlib 2016-04-29 11:48:30.394923084 +0200
|
|
|
8173a68 |
+++ dhcp-4.3.4/common/tests/Makefile.am 2016-04-29 11:54:16.890716651 +0200
|
|
|
5ca2db2 |
@@ -13,25 +13,25 @@ ATF_TESTS += alloc_unittest dns_unittest
|
|
|
c72a792 |
alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
c72a792 |
alloc_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
c72a792 |
alloc_unittest_LDADD += ../libdhcp.a \
|
|
|
c72a792 |
- ../../omapip/libomapi.a \
|
|
|
c72a792 |
+ ../../omapip/libomapi.la \
|
|
|
cccec22 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
c72a792 |
|
|
|
e83fb19 |
dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
e83fb19 |
dns_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
8173a68 |
dns_unittest_LDADD += ../libdhcp.a \
|
|
|
5ca2db2 |
- ../../omapip/libomapi.a \
|
|
|
5ca2db2 |
+ ../../omapip/libomapi.la \
|
|
|
cccec22 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
7b69e54 |
|
|
|
5ca2db2 |
misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
5ca2db2 |
misc_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
5ca2db2 |
misc_unittest_LDADD += ../libdhcp.a \
|
|
|
8173a68 |
- ../../omapip/libomapi.a \
|
|
|
8173a68 |
+ ../../omapip/libomapi.la \
|
|
|
8173a68 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
5ca2db2 |
|
|
|
9568cf3 |
ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
9568cf3 |
ns_name_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
9568cf3 |
ns_name_unittest_LDADD += ../libdhcp.a \
|
|
|
e83fb19 |
- ../../omapip/libomapi.a \
|
|
|
e83fb19 |
+ ../../omapip/libomapi.la \
|
|
|
cccec22 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
5ca2db2 |
|
|
|
c72a792 |
check: $(ATF_TESTS)
|
|
|
8173a68 |
diff -up dhcp-4.3.4/configure.ac.sharedlib dhcp-4.3.4/configure.ac
|
|
|
8173a68 |
--- dhcp-4.3.4/configure.ac.sharedlib 2016-04-29 11:48:30.394923084 +0200
|
|
|
8173a68 |
+++ dhcp-4.3.4/configure.ac 2016-04-29 11:55:22.729691668 +0200
|
|
|
8173a68 |
@@ -47,7 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$c
|
|
Adam Tkac |
81227ae |
# Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
|
|
Adam Tkac |
81227ae |
AC_USE_SYSTEM_EXTENSIONS
|
|
Adam Tkac |
81227ae |
|
|
Adam Tkac |
81227ae |
-AC_PROG_RANLIB
|
|
Adam Tkac |
81227ae |
+# Use libtool to simplify building of shared libraries
|
|
Adam Tkac |
81227ae |
+AC_PROG_LIBTOOL
|
|
Adam Tkac |
81227ae |
|
|
|
8173a68 |
AC_PATH_PROG(AR, ar)
|
|
|
8173a68 |
AC_SUBST(AR)
|
|
|
8173a68 |
diff -up dhcp-4.3.4/dhcpctl/Makefile.am.sharedlib dhcp-4.3.4/dhcpctl/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/dhcpctl/Makefile.am.sharedlib 2016-04-29 11:48:30.394923084 +0200
|
|
|
8173a68 |
+++ dhcp-4.3.4/dhcpctl/Makefile.am 2016-04-29 11:56:18.390670546 +0200
|
|
|
8173a68 |
@@ -1,15 +1,15 @@
|
|
Adam Tkac |
81227ae |
bin_PROGRAMS = omshell
|
|
Adam Tkac |
81227ae |
-lib_LIBRARIES = libdhcpctl.a
|
|
Adam Tkac |
81227ae |
+lib_LTLIBRARIES = libdhcpctl.la
|
|
Adam Tkac |
81227ae |
noinst_PROGRAMS = cltest
|
|
Adam Tkac |
81227ae |
man_MANS = omshell.1 dhcpctl.3
|
|
Adam Tkac |
81227ae |
EXTRA_DIST = $(man_MANS)
|
|
Adam Tkac |
81227ae |
|
|
Adam Tkac |
81227ae |
omshell_SOURCES = omshell.c
|
|
Adam Tkac |
81227ae |
-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
Adam Tkac |
81227ae |
+omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
|
|
|
cccec22 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
8173a68 |
|
|
Adam Tkac |
81227ae |
-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
|
|
Adam Tkac |
81227ae |
+libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
|
|
Adam Tkac |
81227ae |
|
|
Adam Tkac |
81227ae |
cltest_SOURCES = cltest.c
|
|
Adam Tkac |
81227ae |
-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
Adam Tkac |
81227ae |
+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
|
|
|
cccec22 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
8173a68 |
diff -up dhcp-4.3.4/omapip/Makefile.am.sharedlib dhcp-4.3.4/omapip/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/omapip/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200
|
|
|
8173a68 |
+++ dhcp-4.3.4/omapip/Makefile.am 2016-04-29 11:57:33.709641969 +0200
|
|
|
34b6412 |
@@ -1,7 +1,7 @@
|
|
Adam Tkac |
81227ae |
-lib_LIBRARIES = libomapi.a
|
|
Adam Tkac |
81227ae |
+lib_LTLIBRARIES = libomapi.la
|
|
Adam Tkac |
81227ae |
noinst_PROGRAMS = svtest
|
|
Adam Tkac |
81227ae |
|
|
Adam Tkac |
81227ae |
-libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
|
|
Adam Tkac |
81227ae |
+libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
|
|
Adam Tkac |
81227ae |
errwarn.c listener.c dispatch.c generic.c support.c \
|
|
Adam Tkac |
81227ae |
handle.c message.c convert.c hash.c auth.c inet_addr.c \
|
|
Adam Tkac |
81227ae |
array.c trace.c toisc.c iscprint.c isclib.c
|
|
|
8173a68 |
@@ -10,6 +10,6 @@ man_MANS = omapi.3
|
|
|
34b6412 |
EXTRA_DIST = $(man_MANS)
|
|
Adam Tkac |
81227ae |
|
|
Adam Tkac |
81227ae |
svtest_SOURCES = test.c
|
|
|
e83fb19 |
-svtest_LDADD = libomapi.a \
|
|
|
e83fb19 |
+svtest_LDADD = libomapi.la \
|
|
|
cccec22 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
8173a68 |
|
|
|
8173a68 |
diff -up dhcp-4.3.4/relay/Makefile.am.sharedlib dhcp-4.3.4/relay/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/relay/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200
|
|
|
8173a68 |
+++ dhcp-4.3.4/relay/Makefile.am 2016-04-29 11:48:30.395923083 +0200
|
|
|
34b6412 |
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
|
|
|
34b6412 |
|
|
Adam Tkac |
81227ae |
sbin_PROGRAMS = dhcrelay
|
|
Adam Tkac |
81227ae |
dhcrelay_SOURCES = dhcrelay.c
|
|
Adam Tkac |
81227ae |
-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
Adam Tkac |
81227ae |
+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
|
|
cccec22 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
34b6412 |
man_MANS = dhcrelay.8
|
|
|
34b6412 |
EXTRA_DIST = $(man_MANS)
|
|
|
8173a68 |
diff -up dhcp-4.3.4/server/Makefile.am.sharedlib dhcp-4.3.4/server/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/server/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200
|
|
|
8173a68 |
+++ dhcp-4.3.4/server/Makefile.am 2016-04-29 11:48:30.395923083 +0200
|
|
|
e83fb19 |
@@ -13,7 +13,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
|
|
|
7406750 |
dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c
|
|
Adam Tkac |
81227ae |
|
|
|
34b6412 |
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
|
|
e83fb19 |
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \
|
|
|
e83fb19 |
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dhcpctl/libdhcpctl.la \
|
|
|
7406750 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \
|
|
|
7406750 |
$(LDAP_LIBS)
|
|
|
7406750 |
|
|
|
8173a68 |
diff -up dhcp-4.3.4/server/tests/Makefile.am.sharedlib dhcp-4.3.4/server/tests/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/server/tests/Makefile.am.sharedlib 2016-04-29 11:48:30.395923083 +0200
|
|
|
8173a68 |
+++ dhcp-4.3.4/server/tests/Makefile.am 2016-04-29 11:59:13.414604130 +0200
|
|
|
c72a792 |
@@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
|
|
|
c72a792 |
../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \
|
|
|
7406750 |
../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c
|
|
|
c72a792 |
|
|
|
8173a68 |
-DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
|
|
|
8173a68 |
- $(top_builddir)/dhcpctl/libdhcpctl.a \
|
|
|
8173a68 |
+DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
|
|
|
8173a68 |
+ $(top_builddir)/dhcpctl/libdhcpctl.la \
|
|
|
8173a68 |
$(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
c72a792 |
|
|
|
c72a792 |
ATF_TESTS =
|