From 0 Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Fri, 7 Dec 2018 20:17:44 +0300 Subject: [PATCH 34] Build libdhcp as static library It uses symbols from executable files, so just make it static library. diff --git a/dhcp/client/Makefile.am b/dhcp/client/Makefile.am index defaced..defaced 100644 --- a/dhcp/client/Makefile.am +++ b/dhcp/client/Makefile.am @@ -14,7 +14,7 @@ dhclient_SOURCES = client_tables.c clparse.c dhclient.c dhc6.c \ scripts/netbsd scripts/nextstep scripts/openbsd \ scripts/solaris scripts/openwrt dhclient_LDFLAGS = -pie -dhclient_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) diff --git a/dhcp/client/tests/Makefile.am b/dhcp/client/tests/Makefile.am index defaced..defaced 100644 --- a/dhcp/client/tests/Makefile.am +++ b/dhcp/client/tests/Makefile.am @@ -16,7 +16,7 @@ info: DHCPSRC = ../clparse.c ../dhc6.c ../dhclient.c -DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \ +DHCPLIBS = $(top_builddir)/common/libdhcp.a \ $(top_builddir)/omapip/libomapi.@A@ \ $(top_builddir)/dhcpctl/libdhcpctl.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export diff --git a/dhcp/common/Makefile.am.in b/dhcp/common/Makefile.am.in index defaced..defaced 100644 --- a/dhcp/common/Makefile.am.in +++ b/dhcp/common/Makefile.am.in @@ -1,8 +1,8 @@ AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@Q@localstatedir@Q@"' AM_CFLAGS = $(LDAP_CFLAGS) -lib_@DHLIBS@ = libdhcp.@A@ -libdhcp_@A@_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c dhcp4o6.c \ +lib_LIBRARIES = libdhcp.a +libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c dhcp4o6.c \ discover.c dispatch.c dlpi.c dns.c ethernet.c execute.c \ fddi.c icmp.c inet.c lpf.c memory.c nit.c ns_name.c \ options.c packet.c parse.c print.c raw.c resolv.c \ diff --git a/dhcp/common/tests/Makefile.am b/dhcp/common/tests/Makefile.am index defaced..defaced 100644 --- a/dhcp/common/tests/Makefile.am +++ b/dhcp/common/tests/Makefile.am @@ -13,27 +13,27 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_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@ \ +alloc_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c dns_unittest_LDADD = $(ATF_LDFLAGS) -dns_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \ +dns_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c misc_unittest_LDADD = $(ATF_LDFLAGS) -misc_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \ +misc_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c ns_name_unittest_LDADD = $(ATF_LDFLAGS) -ns_name_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \ +ns_name_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export option_unittest_SOURCES = option_unittest.c $(top_srcdir)/tests/t_api_dhcp.c option_unittest_LDADD = $(ATF_LDFLAGS) -option_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \ +option_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export domain_name_unittest_SOURCES = domain_name_test.c \ diff --git a/dhcp/dhcpctl/Makefile.am.in b/dhcp/dhcpctl/Makefile.am.in index defaced..defaced 100644 --- a/dhcp/dhcpctl/Makefile.am.in +++ b/dhcp/dhcpctl/Makefile.am.in @@ -5,7 +5,7 @@ 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.@A@ ../common/libdhcp.a ../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export libdhcpctl_@A@_SOURCES = dhcpctl.c callback.c remote.c @@ -13,9 +13,9 @@ libdhcpctl_@A@_SOURCES = dhcpctl.c callback.c remote.c libdhcpctl_@A@_LIBADD = ../omapip/libomapi.@A@ cltest_SOURCES = cltest.c -cltest_LDADD = libdhcpctl.@A@ ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ +cltest_LDADD = libdhcpctl.@A@ ../common/libdhcp.a ../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export cltest2_SOURCES = cltest2.c -cltest2_LDADD = libdhcpctl.@A@ ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ +cltest2_LDADD = libdhcpctl.@A@ ../common/libdhcp.a ../omapip/libomapi.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export diff --git a/dhcp/relay/Makefile.am b/dhcp/relay/Makefile.am index defaced..defaced 100644 --- a/dhcp/relay/Makefile.am +++ b/dhcp/relay/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDFLAGS = -pie -dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.@A@ \ -lcap \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export man_MANS = dhcrelay.8 diff --git a/dhcp/server/Makefile.am b/dhcp/server/Makefile.am index defaced..defaced 100644 --- a/dhcp/server/Makefile.am +++ b/dhcp/server/Makefile.am @@ -14,7 +14,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ dhcpd_CFLAGS = $(LDAP_CFLAGS) dhcpd_LDFLAGS = -pie -dhcpd_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.@A@ \ ../dhcpctl/libdhcpctl.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \ -lcap \ diff --git a/dhcp/server/tests/Makefile.am b/dhcp/server/tests/Makefile.am index defaced..defaced 100644 --- a/dhcp/server/tests/Makefile.am +++ b/dhcp/server/tests/Makefile.am @@ -17,7 +17,7 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c -DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \ +DHCPLIBS = $(top_builddir)/common/libdhcp.a \ $(top_builddir)/omapip/libomapi.@A@ \ $(top_builddir)/dhcpctl/libdhcpctl.@A@ \ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export