From: Francis Dupont Date: Fri, 4 Sep 2015 09:44:52 +0000 (+0200) Subject: [4009] Added some $(BOOST_LIBS) libtool fails to manage X-Git-Tag: trac4060_base~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a8fd01132be56f1006f82c7a49c9cbeb79f763f;p=thirdparty%2Fkea.git [4009] Added some $(BOOST_LIBS) libtool fails to manage --- diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am index 6f541ae6f7..5059d106a8 100644 --- a/src/bin/d2/Makefile.am +++ b/src/bin/d2/Makefile.am @@ -107,6 +107,7 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la +kea_dhcp_ddns_LDADD += $(BOOST_LIBS) kea_dhcp_ddnsdir = $(pkgdatadir) kea_dhcp_ddns_DATA = dhcp-ddns.spec diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am index 72373b7cc6..0a9c5a9f2d 100644 --- a/src/bin/d2/tests/Makefile.am +++ b/src/bin/d2/tests/Makefile.am @@ -71,7 +71,7 @@ d2_unittests_SOURCES += d_controller_unittests.cc d2_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) d2_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) -d2_unittests_LDADD = $(GTEST_LDADD) +d2_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD) d2_unittests_LDADD += $(top_builddir)/src/bin/d2/libd2.la d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la d2_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am index f7f6e008f9..acc53e6c83 100644 --- a/src/bin/dhcp4/Makefile.am +++ b/src/bin/dhcp4/Makefile.am @@ -86,6 +86,7 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la +kea_dhcp4_LDADD += $(BOOST_LIBS) kea_dhcp4dir = $(pkgdatadir) kea_dhcp4_DATA = dhcp4.spec diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am index 75533d0037..c0f638114b 100644 --- a/src/bin/dhcp4/tests/Makefile.am +++ b/src/bin/dhcp4/tests/Makefile.am @@ -92,7 +92,7 @@ nodist_dhcp4_unittests_SOURCES = marker_file.h test_libraries.h dhcp4_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) dhcp4_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) -dhcp4_unittests_LDADD = $(GTEST_LDADD) +dhcp4_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD) dhcp4_unittests_LDADD += $(top_builddir)/src/bin/dhcp4/libdhcp4.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am index b7fe65abf0..96096b0f58 100644 --- a/src/bin/dhcp6/Makefile.am +++ b/src/bin/dhcp6/Makefile.am @@ -87,6 +87,7 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la +kea_dhcp6_LDADD += $(BOOST_LIBS) kea_dhcp6dir = $(pkgdatadir) kea_dhcp6_DATA = dhcp6.spec diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am index 173605219e..904ad56276 100644 --- a/src/bin/dhcp6/tests/Makefile.am +++ b/src/bin/dhcp6/tests/Makefile.am @@ -94,7 +94,7 @@ nodist_dhcp6_unittests_SOURCES = marker_file.h test_libraries.h dhcp6_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) dhcp6_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) -dhcp6_unittests_LDADD = $(GTEST_LDADD) +dhcp6_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD) dhcp6_unittests_LDADD += $(top_builddir)/src/bin/dhcp6/libdhcp6.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am index 97814197b6..3d80082fd0 100644 --- a/src/bin/lfc/Makefile.am +++ b/src/bin/lfc/Makefile.am @@ -66,5 +66,6 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la kea_lfc_LDADD += $(top_builddir)/src/lib/util/libkea-util.la kea_lfc_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la kea_lfc_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la +kea_lfc_LDADD += $(BOOST_LIBS) kea_lfcdir = $(pkgdatadir) diff --git a/src/bin/lfc/tests/Makefile.am b/src/bin/lfc/tests/Makefile.am index 6aa15585e0..ee40e060fe 100644 --- a/src/bin/lfc/tests/Makefile.am +++ b/src/bin/lfc/tests/Makefile.am @@ -48,8 +48,7 @@ lfc_unittests_SOURCES += lfc_controller_unittests.cc lfc_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) lfc_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) -lfc_unittests_LDADD = $(GTEST_LDADD) -lfc_unittests_LDADD += $(top_builddir)/src/bin/lfc/liblfc.la +lfc_unittests_LDADD = $(top_builddir)/src/bin/lfc/liblfc.la lfc_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la lfc_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la lfc_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la @@ -58,6 +57,7 @@ lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la lfc_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la lfc_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la lfc_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la +lfc_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) endif diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am index a8667d4075..db6f47ad48 100644 --- a/src/bin/perfdhcp/Makefile.am +++ b/src/bin/perfdhcp/Makefile.am @@ -49,6 +49,7 @@ perfdhcp_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la perfdhcp_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la perfdhcp_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la perfdhcp_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la +perfdhcp_LDADD += $(BOOST_LIBS) # ... and the documentation EXTRA_DIST = perfdhcp_internals.dox diff --git a/src/bin/perfdhcp/tests/Makefile.am b/src/bin/perfdhcp/tests/Makefile.am index e90d6b1b2e..39ba81ece3 100644 --- a/src/bin/perfdhcp/tests/Makefile.am +++ b/src/bin/perfdhcp/tests/Makefile.am @@ -48,7 +48,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la -run_unittests_LDADD += $(GTEST_LDADD) +run_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) endif noinst_PROGRAMS = $(TESTS) diff --git a/src/hooks/dhcp/user_chk/tests/Makefile.am b/src/hooks/dhcp/user_chk/tests/Makefile.am index e1383eef9c..79ca932217 100644 --- a/src/hooks/dhcp/user_chk/tests/Makefile.am +++ b/src/hooks/dhcp/user_chk/tests/Makefile.am @@ -60,6 +60,6 @@ libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-ex libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libdhcp_user_chk_unittests_LDADD += ${CRYPTO_LIBS} ${CRYPTO_RPATH} -libdhcp_user_chk_unittests_LDADD += $(GTEST_LDADD) +libdhcp_user_chk_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am index c0f65e200f..8d1c867a2b 100644 --- a/src/lib/asiodns/tests/Makefile.am +++ b/src/lib/asiodns/tests/Makefile.am @@ -20,7 +20,7 @@ run_unittests_SOURCES += io_fetch_unittest.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) -run_unittests_LDADD = $(GTEST_LDADD) +run_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD) run_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am index 90752f5ca8..82083b0579 100644 --- a/src/lib/asiolink/tests/Makefile.am +++ b/src/lib/asiolink/tests/Makefile.am @@ -42,7 +42,7 @@ run_unittests_LDADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -run_unittests_LDADD += $(GTEST_LDADD) +run_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am index 5f8d0c6ecf..f4453fdd71 100644 --- a/src/lib/cc/tests/Makefile.am +++ b/src/lib/cc/tests/Makefile.am @@ -32,7 +32,7 @@ run_unittests_LDADD = $(top_builddir)/src/lib/cc/libkea-cc.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -run_unittests_LDADD += $(GTEST_LDADD) +run_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) endif diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am index 65ce125403..8c186511ee 100644 --- a/src/lib/config/tests/Makefile.am +++ b/src/lib/config/tests/Makefile.am @@ -25,7 +25,7 @@ run_unittests_SOURCES += command_mgr_unittests.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) -run_unittests_LDADD = $(GTEST_LDADD) +run_unittests_LDADD = $(BOOST_LIBS) $(GTEST_LDADD) run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am index aa26e46b32..6472cb4aa7 100644 --- a/src/lib/dhcp/tests/Makefile.am +++ b/src/lib/dhcp/tests/Makefile.am @@ -112,7 +112,7 @@ libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp___unittests_LDADD += $(GTEST_LDADD) +libdhcp___unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/dhcp_ddns/tests/Makefile.am b/src/lib/dhcp_ddns/tests/Makefile.am index 3e6f0bd43e..abf8cd9b0b 100644 --- a/src/lib/dhcp_ddns/tests/Makefile.am +++ b/src/lib/dhcp_ddns/tests/Makefile.am @@ -54,7 +54,7 @@ libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-except libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libdhcp_ddns_unittests_LDADD += ${CRYPTO_LIBS} ${CRYPTO_RPATH} -libdhcp_ddns_unittests_LDADD += $(GTEST_LDADD) +libdhcp_ddns_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am index a4c9f2217f..feefcda5ff 100644 --- a/src/lib/dhcpsrv/tests/Makefile.am +++ b/src/lib/dhcpsrv/tests/Makefile.am @@ -141,7 +141,7 @@ libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libdhcpsrv_unittests_LDADD += $(GTEST_LDADD) +libdhcpsrv_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) endif noinst_PROGRAMS = $(TESTS)