author | Ben Chang <Benjamin.Chang@Oracle.COM> |
Fri, 13 Jan 2017 13:04:10 -0800 | |
branch | s11u3-sru |
changeset 7574 | fb557863edc8 |
permissions | -rw-r--r-- |
7574
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
1 |
# HG changeset patch |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
2 |
# User Praveen Kumar Muthuswamy <[email protected]> |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
3 |
# Date 1428520414 25200 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
4 |
# Wed Apr 08 12:13:34 2015 -0700 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
5 |
# Node ID 045f212982ea4578a9dafb925ad62cf366802dc6 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
6 |
# Parent 6470d3cc3ce1677a8283cdf15257c2b8c0ab43c9 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
7 |
/* |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
8 |
* This patch file (dhcp-dynamiclibraries.patch) was developed in-house to |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
9 |
* allow isc-dhcp to build and package shared objects for libomapi, libdhcpctl, |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
10 |
* and libdst. Upstream (ISC) has been made aware of this requirement and the |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
11 |
* the patch through a service ticket and they are actively working on |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
12 |
* developing the patch. |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
13 |
*/ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
14 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
15 |
diff --git a/client/Makefile.am b/client/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
16 |
--- a/client/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
17 |
+++ b/client/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -5,7 +5,7 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
19 |
scripts/netbsd scripts/nextstep scripts/openbsd \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
20 |
scripts/solaris scripts/openwrt |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
21 |
dhclient_LDADD = ../common/libdhcp.a ../minires/libres.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
22 |
- ../omapip/libomapi.a ../dst/libdst.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
23 |
+ ../omapip/libomapi.la ../dst/libdst.la |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
24 |
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
25 |
EXTRA_DIST = $(man_MANS) |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
26 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
27 |
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
28 |
--- a/common/tests/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
29 |
+++ b/common/tests/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
30 |
@@ -13,7 +13,7 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
31 |
alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
32 |
alloc_unittest_LDADD = $(ATF_LDFLAGS) |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
33 |
alloc_unittest_LDADD += ../libdhcp.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
34 |
- ../../omapip/libomapi.a ../../dst/libdst.a ../../minires/libres.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
35 |
+ ../../omapip/libomapi.la ../../dst/libdst.la ../../minires/libres.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
36 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
37 |
check: $(ATF_TESTS) |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
38 |
atf-run | atf-report |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
39 |
diff --git a/configure.ac b/configure.ac |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
40 |
--- a/configure.ac |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
41 |
+++ b/configure.ac |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
42 |
@@ -37,7 +37,7 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
43 |
# Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
44 |
AC_USE_SYSTEM_EXTENSIONS |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
45 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
46 |
-AC_PROG_RANLIB |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
47 |
+AC_PROG_LIBTOOL |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
48 |
AC_CONFIG_HEADERS([includes/config.h]) |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
49 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
50 |
# we sometimes need to know byte order for building packets |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
51 |
diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
52 |
--- a/dhcpctl/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
53 |
+++ b/dhcpctl/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
54 |
@@ -1,15 +1,16 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
55 |
bin_PROGRAMS = omshell |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
56 |
-lib_LIBRARIES = libdhcpctl.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
57 |
+lib_LTLIBRARIES = libdhcpctl.la |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
58 |
+libdhcpctl_la_LDFLAGS = -version-info 1 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
59 |
noinst_PROGRAMS = cltest |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
60 |
man_MANS = omshell.1 dhcpctl.3 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
61 |
EXTRA_DIST = $(man_MANS) |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
62 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
63 |
omshell_SOURCES = omshell.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
64 |
-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../minires/libres.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
65 |
- ../omapip/libomapi.a ../dst/libdst.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
66 |
+omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../minires/libres.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
67 |
+ ../omapip/libomapi.la ../dst/libdst.la |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
68 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
69 |
-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
70 |
+libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
71 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
72 |
cltest_SOURCES = cltest.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
73 |
-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../minires/libres.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
74 |
- ../omapip/libomapi.a ../dst/libdst.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
75 |
+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../minires/libres.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
76 |
+ ../omapip/libomapi.la ../dst/libdst.la |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
77 |
diff --git a/dst/Makefile.am b/dst/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
78 |
--- a/dst/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
79 |
+++ b/dst/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
80 |
@@ -1,8 +1,9 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
81 |
AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
82 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
83 |
-lib_LIBRARIES = libdst.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
84 |
+lib_LTLIBRARIES = libdst.la |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
85 |
+libdst_la_LDFLAGS = -version-info 1 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
86 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
87 |
-libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
88 |
+libdst_la_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
89 |
base64.c prandom.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
90 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
91 |
EXTRA_DIST = dst_internal.h md5.h md5_locl.h |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
92 |
diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
93 |
--- a/omapip/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
94 |
+++ b/omapip/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
95 |
@@ -1,7 +1,8 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
96 |
-lib_LIBRARIES = libomapi.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
97 |
+lib_LTLIBRARIES = libomapi.la |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
98 |
+libomapi_la_LDFLAGS = -version-info 1 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
99 |
noinst_PROGRAMS = svtest |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
100 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
101 |
-libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
102 |
+libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
103 |
errwarn.c listener.c dispatch.c generic.c support.c \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
104 |
handle.c message.c convert.c hash.c auth.c inet_addr.c \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
105 |
array.c trace.c mrtrace.c toisc.c iscprint.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
106 |
@@ -9,5 +10,5 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
107 |
EXTRA_DIST = $(man_MANS) |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
108 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
109 |
svtest_SOURCES = test.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
110 |
-svtest_LDADD = libomapi.a ../dst/libdst.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
111 |
+svtest_LDADD = libomapi.la ../dst/libdst.la |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
112 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
113 |
diff --git a/relay/Makefile.am b/relay/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
114 |
--- a/relay/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
115 |
+++ b/relay/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
116 |
@@ -2,7 +2,7 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
117 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
118 |
sbin_PROGRAMS = dhcrelay |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
119 |
dhcrelay_SOURCES = dhcrelay.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
120 |
-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a ../minires/libres.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
121 |
+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dst/libdst.la ../minires/libres.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
122 |
man_MANS = dhcrelay.8 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
123 |
EXTRA_DIST = $(man_MANS) |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
124 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
125 |
diff --git a/server/Makefile.am b/server/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
126 |
--- a/server/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
127 |
+++ b/server/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
128 |
@@ -13,9 +13,9 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
129 |
dhcpv6.c mdb6.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
130 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
131 |
# libomapi.a this is here twice to handle circular library dependencies :( |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
132 |
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
133 |
- ../dhcpctl/libdhcpctl.a ../minires/libres.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
134 |
- ../omapip/libomapi.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
135 |
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dst/libdst.la \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
136 |
+ ../dhcpctl/libdhcpctl.la ../minires/libres.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
137 |
+ ../omapip/libomapi.la |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
138 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
139 |
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
140 |
EXTRA_DIST = $(man_MANS) |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
141 |
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
142 |
--- a/server/tests/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
143 |
+++ b/server/tests/Makefile.am |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
144 |
@@ -17,8 +17,8 @@ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
145 |
../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
146 |
../dhcpd.c |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
147 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
148 |
-DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
149 |
- $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/dst/libdst.a \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
150 |
+DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
151 |
+ $(top_builddir)/dhcpctl/libdhcpctl.la $(top_builddir)/dst/libdst.la \ |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
152 |
$(top_builddir)/minires/libres.a |
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
153 |
|
fb557863edc8
PSARC 2015/160 ISC libomapi, libdst, and libdhcpctl
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
154 |
ATF_TESTS = |