]>
Commit | Line | Data |
---|---|---|
78ab9b04 MT |
1 | diff -up dhcp-4.2.2/client/Makefile.am.sharedlib dhcp-4.2.2/client/Makefile.am |
2 | --- dhcp-4.2.2/client/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200 | |
3 | +++ dhcp-4.2.2/client/Makefile.am 2011-09-09 16:36:29.849007951 +0200 | |
4 | @@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c | |
5 | scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ | |
6 | scripts/netbsd scripts/nextstep scripts/openbsd \ | |
7 | scripts/solaris scripts/openwrt | |
8 | -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | |
9 | +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ | |
10 | $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD) | |
11 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 | |
12 | EXTRA_DIST = $(man_MANS) | |
13 | diff -up dhcp-4.2.2/configure.ac.sharedlib dhcp-4.2.2/configure.ac | |
14 | --- dhcp-4.2.2/configure.ac.sharedlib 2011-09-09 16:35:56.097000001 +0200 | |
15 | +++ dhcp-4.2.2/configure.ac 2011-09-09 16:35:56.383000000 +0200 | |
16 | @@ -30,7 +30,8 @@ fi | |
17 | # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. | |
18 | AC_USE_SYSTEM_EXTENSIONS | |
19 | ||
20 | -AC_PROG_RANLIB | |
21 | +# Use libtool to simplify building of shared libraries | |
22 | +AC_PROG_LIBTOOL | |
23 | AC_CONFIG_HEADERS([includes/config.h]) | |
24 | ||
25 | # we sometimes need to know byte order for building packets | |
26 | diff -up dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib dhcp-4.2.2/dhcpctl/Makefile.am | |
27 | --- dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib 2011-09-09 16:35:55.459000001 +0200 | |
28 | +++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-09-09 16:35:56.384000000 +0200 | |
29 | @@ -1,15 +1,15 @@ | |
30 | bin_PROGRAMS = omshell | |
31 | -lib_LIBRARIES = libdhcpctl.a | |
32 | +lib_LTLIBRARIES = libdhcpctl.la | |
33 | noinst_PROGRAMS = cltest | |
34 | man_MANS = omshell.1 dhcpctl.3 | |
35 | EXTRA_DIST = $(man_MANS) | |
36 | ||
37 | omshell_SOURCES = omshell.c | |
38 | -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ | |
39 | +omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ | |
40 | $(BIND9_LIBDIR) -ldns-export -lisc-export | |
41 | ||
42 | -libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c | |
43 | +libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c | |
44 | ||
45 | cltest_SOURCES = cltest.c | |
46 | -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ | |
47 | +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ | |
48 | $(BIND9_LIBDIR) -ldns-export -lisc-export | |
49 | diff -up dhcp-4.2.2/dst/base64.c.sharedlib dhcp-4.2.2/dst/base64.c | |
50 | --- dhcp-4.2.2/dst/base64.c.sharedlib 2009-11-20 02:49:01.000000000 +0100 | |
51 | +++ dhcp-4.2.2/dst/base64.c 2011-09-09 16:35:56.385000000 +0200 | |
52 | @@ -64,6 +64,7 @@ static const char rcsid[] = "$Id: base64 | |
53 | ||
54 | #include <sys/socket.h> | |
55 | ||
56 | +#include "dst_internal.h" | |
57 | #include "cdefs.h" | |
58 | #include "osdep.h" | |
59 | #include "arpa/nameser.h" | |
60 | diff -up dhcp-4.2.2/dst/Makefile.am.sharedlib dhcp-4.2.2/dst/Makefile.am | |
61 | --- dhcp-4.2.2/dst/Makefile.am.sharedlib 2007-05-29 18:32:10.000000000 +0200 | |
62 | +++ dhcp-4.2.2/dst/Makefile.am 2011-09-09 16:35:56.386000000 +0200 | |
63 | @@ -1,8 +1,8 @@ | |
64 | AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 | |
65 | ||
66 | -lib_LIBRARIES = libdst.a | |
67 | +lib_LTLIBRARIES = libdst.la | |
68 | ||
69 | -libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ | |
70 | +libdst_la_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ | |
71 | base64.c prandom.c | |
72 | ||
73 | EXTRA_DIST = dst_internal.h md5.h md5_locl.h | |
74 | diff -up dhcp-4.2.2/omapip/Makefile.am.sharedlib dhcp-4.2.2/omapip/Makefile.am | |
75 | --- dhcp-4.2.2/omapip/Makefile.am.sharedlib 2011-09-09 16:35:55.000000000 +0200 | |
76 | +++ dhcp-4.2.2/omapip/Makefile.am 2011-09-09 16:37:36.734000324 +0200 | |
77 | @@ -1,7 +1,7 @@ | |
78 | -lib_LIBRARIES = libomapi.a | |
79 | +lib_LTLIBRARIES = libomapi.la | |
80 | noinst_PROGRAMS = svtest | |
81 | ||
82 | -libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ | |
83 | +libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ | |
84 | errwarn.c listener.c dispatch.c generic.c support.c \ | |
85 | handle.c message.c convert.c hash.c auth.c inet_addr.c \ | |
86 | array.c trace.c toisc.c iscprint.c isclib.c | |
87 | @@ -10,5 +10,5 @@ man_MANS = omapi.3 | |
88 | EXTRA_DIST = $(man_MANS) | |
89 | ||
90 | svtest_SOURCES = test.c | |
91 | -svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export | |
92 | +svtest_LDADD = libomapi.la $(BIND9_LIBDIR) -ldns-export -lisc-export | |
93 | ||
94 | diff -up dhcp-4.2.2/relay/Makefile.am.sharedlib dhcp-4.2.2/relay/Makefile.am | |
95 | --- dhcp-4.2.2/relay/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200 | |
96 | +++ dhcp-4.2.2/relay/Makefile.am 2011-09-09 16:37:57.058019749 +0200 | |
97 | @@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst | |
98 | ||
99 | sbin_PROGRAMS = dhcrelay | |
100 | dhcrelay_SOURCES = dhcrelay.c | |
101 | -dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | |
102 | +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ | |
103 | $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD) | |
104 | man_MANS = dhcrelay.8 | |
105 | EXTRA_DIST = $(man_MANS) | |
106 | diff -up dhcp-4.2.2/server/Makefile.am.sharedlib dhcp-4.2.2/server/Makefile.am | |
107 | --- dhcp-4.2.2/server/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200 | |
108 | +++ dhcp-4.2.2/server/Makefile.am 2011-09-09 16:38:56.291004599 +0200 | |
109 | @@ -7,8 +7,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c | |
110 | dhcpv6.c mdb6.c ldap.c ldap_casa.c | |
111 | ||
112 | dhcpd_CFLAGS = $(LDAP_CFLAGS) | |
113 | -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | |
114 | - ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export \ | |
115 | +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ | |
116 | + ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export \ | |
117 | $(CAPNG_LDADD) | |
118 | ||
119 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |