From: Thomas Markwalder Date: Thu, 28 Sep 2017 17:39:37 +0000 (-0400) Subject: [master] Added BOOST_LIBS to library Makefiles X-Git-Tag: trac5210_base X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdfbc19538f4104e307f24ce2b46887573148ebd;p=thirdparty%2Fkea.git [master] Added BOOST_LIBS to library Makefiles Several libraries depend on boost_system lib according to otool, but lacked linking to $(BOOST_LIBS) in their Makefile.am. This has been corrected: src/lib/asiodns/Makefile.am src/lib/config/Makefile.am src/lib/dhcp/Makefile.am src/lib/dhcp_ddns/Makefile.am src/lib/dhcpsrv/Makefile.am src/lib/eval/Makefile.am src/lib/stats/Makefile.am --- diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am index 24dfe05c30..a9a18e8fab 100644 --- a/src/lib/asiodns/Makefile.am +++ b/src/lib/asiodns/Makefile.am @@ -33,4 +33,5 @@ libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la +libkea_asiodns_la_LIBADD += $(BOOST_LIBS) libkea_asiodns_la_LIBADD += $(LOG4CPLUS_LIBS) diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am index 4b36b78c0c..dc15eea801 100644 --- a/src/lib/config/Makefile.am +++ b/src/lib/config/Makefile.am @@ -32,7 +32,7 @@ libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libkea_cfgclient_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) +libkea_cfgclient_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 3:0:0 libkea_cfgclient_la_LDFLAGS += $(CRYPTO_LDFLAGS) diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am index 12c3ebf844..5dde6bd042 100644 --- a/src/lib/dhcp/Makefile.am +++ b/src/lib/dhcp/Makefile.am @@ -71,6 +71,7 @@ libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la +libkea_dhcp___la_LIBADD += $(BOOST_LIBS) libkea_dhcp___la_LIBADD += $(CRYPTO_LIBS) libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 5:0:0 libkea_dhcp___la_LDFLAGS += $(CRYPTO_LDFLAGS) diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am index 99c84c4caa..6ebb2d751f 100644 --- a/src/lib/dhcp_ddns/Makefile.am +++ b/src/lib/dhcp_ddns/Makefile.am @@ -47,7 +47,7 @@ libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) +libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) # Specify the headers for copying into the installation directory tree. libkea_dhcp_ddns_includedir = $(pkgincludedir)/dhcp_ddns diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index 32a6532cd9..1604a16b4f 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -211,7 +211,7 @@ libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libkea_dhcpsrv_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) +libkea_dhcpsrv_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 7:0:0 libkea_dhcpsrv_la_LDFLAGS += $(CRYPTO_LDFLAGS) diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am index fd6eca48d1..b6fc5e02af 100644 --- a/src/lib/eval/Makefile.am +++ b/src/lib/eval/Makefile.am @@ -34,7 +34,7 @@ libkea_eval_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libkea_eval_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) +libkea_eval_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) libkea_eval_la_LDFLAGS = -no-undefined -version-info 5:0:0 libkea_eval_la_LDFLAGS += $(CRYPTO_LDFLAGS) diff --git a/src/lib/stats/Makefile.am b/src/lib/stats/Makefile.am index e3c14f0013..5534898ae0 100644 --- a/src/lib/stats/Makefile.am +++ b/src/lib/stats/Makefile.am @@ -15,6 +15,7 @@ libkea_stats_la_LDFLAGS = -no-undefined -version-info 1:0:0 libkea_stats_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_stats_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la +libkea_stats_la_LIBADD += $(BOOST_LIBS) libkea_stats_includedir = $(pkgincludedir)/stats libkea_stats_include_HEADERS = stats_mgr.h