[#2702] fix static linking with libcfgrpt.la multiple times

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index 9d9f342566526e13aa5fbc7e410cc8511b7fc370..3ebee7648c4be9d8b92d5f6ca64060c320458bd4 100644 (file)
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -40,23 +40,23 @@ sbin_PROGRAMS = kea-ctrl-agent
 kea_ctrl_agent_SOURCES = main.cc
 
 kea_ctrl_agent_LDADD  = libagent.la
-kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 kea_ctrl_agent_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 
 kea_ctrl_agent_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)

diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am
index 9c279d71c865aedfcd8c9b34e6dacf2fc8fc108d..0deb4b4c726d58b77c33316283b02c6537c5498c 100644 (file)
--- a/src/bin/agent/tests/Makefile.am
+++ b/src/bin/agent/tests/Makefile.am
@@ -57,24 +57,24 @@ ca_unittests_SOURCES += get_config_unittest.cc
 ca_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 ca_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 
-ca_unittests_LDADD = $(top_builddir)/src/bin/agent/libagent.la
+ca_unittests_LDADD  = $(top_builddir)/src/bin/agent/libagent.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la
-ca_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/asiolink/testutils/libasiolinktest.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-ca_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-ca_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-ca_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 ca_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 ca_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)

diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 53282977f71c8aea2ddb086d3b1609dfb3d7c1a1..8fd4fe40ec15f0203299fc5a9fcde8df8793d86e 100644 (file)
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -46,9 +46,9 @@ sbin_PROGRAMS = kea-dhcp-ddns
 kea_dhcp_ddns_SOURCES  = main.cc
 
 kea_dhcp_ddns_LDADD  = libd2.la
-kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/d2srv/libkea-d2srv.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
@@ -56,12 +56,12 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am
index 09ef42efedd90c8c7981cf8894a858d7cec783e0..25ca36343c79d76cb853b1b92076458d1cb23df7 100644 (file)
--- a/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@ -73,21 +73,21 @@ d2_unittests_LDADD  = $(top_builddir)/src/bin/d2/libd2.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/d2srv/testutils/libd2srvtest.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/d2srv/libkea-d2srv.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-d2_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index f53e75c91be2347f1b8ecde6a8189218715f79ff..58b3c97f9b55e7e02ec70069ed01cf8fd883e981 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -45,14 +45,16 @@ sbin_PROGRAMS = kea-dhcp4
 kea_dhcp4_SOURCES  = main.cc
 
 kea_dhcp4_LDADD  = libdhcp4.la
-kea_dhcp4_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 if HAVE_MYSQL
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
@@ -62,12 +64,10 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 endif
 
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-kea_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-kea_dhcp4_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index 9b662d7c406f2d417e50e4aeacdf32f7cd7f7ce9..155cebf3b783bcac47e5c8dc8922977053dbdcdd 100644 (file)
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -118,9 +118,9 @@ dhcp4_unittests_LDFLAGS += $(PGSQL_LIBS)
 endif
 dhcp4_unittests_LDFLAGS += $(GTEST_LDFLAGS)
 
-dhcp4_unittests_LDADD = $(top_builddir)/src/bin/dhcp4/libdhcp4.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+dhcp4_unittests_LDADD  = $(top_builddir)/src/bin/dhcp4/libdhcp4.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
@@ -144,14 +144,10 @@ endif
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/database/testutils/libdatabasetest.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
-
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 283b0e6b492e82957e4e71fe7cd7016ea1cca6e2..e0cc5090cade526731c32a7942bd42f596803678 100644 (file)
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -43,14 +43,16 @@ sbin_PROGRAMS = kea-dhcp6
 kea_dhcp6_SOURCES  = main.cc
 
 kea_dhcp6_LDADD  = libdhcp6.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 if HAVE_MYSQL
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
@@ -60,13 +62,10 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 endif
 
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 3970fd9eaf7f486a6b4c11614284a540145995da..d3fe96d12d941765c4258f0f2f1cb94e4b4c24e2 100644 (file)
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -122,19 +122,19 @@ dhcp6_unittests_LDFLAGS += $(PGSQL_LIBS)
 endif
 dhcp6_unittests_LDFLAGS += $(GTEST_LDFLAGS)
 
-dhcp6_unittests_LDADD = $(top_builddir)/src/bin/dhcp6/libdhcp6.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+dhcp6_unittests_LDADD  = $(top_builddir)/src/bin/dhcp6/libdhcp6.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 if HAVE_MYSQL
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
@@ -147,11 +147,11 @@ endif
 
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/database/testutils/libdatabasetest.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am
index bb7f96fa2d5b32cd7ec9f3a62db3d37e98ad8025..c83779a1dd83329377ee070ebc1c139f56d939f5 100644 (file)
--- a/src/bin/lfc/Makefile.am
+++ b/src/bin/lfc/Makefile.am
@@ -27,15 +27,16 @@ sbin_PROGRAMS = kea-lfc
 kea_lfc_SOURCES  = main.cc
 
 kea_lfc_LDADD  = liblfc.la
-kea_lfc_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
-kea_lfc_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+kea_lfc_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+kea_lfc_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+kea_lfc_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 if HAVE_MYSQL
 kea_lfc_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
@@ -45,12 +46,10 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 endif
 
 kea_lfc_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-
-kea_lfc_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+kea_lfc_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-kea_lfc_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/bin/lfc/tests/Makefile.am b/src/bin/lfc/tests/Makefile.am
index e2d31f65cb284a9515b5e45f7d97c1cebe317808..0b5425d325b03481f3474a92baf8ffc266caa0a4 100644 (file)
--- a/src/bin/lfc/tests/Makefile.am
+++ b/src/bin/lfc/tests/Makefile.am
@@ -34,16 +34,17 @@ lfc_unittests_LDFLAGS += $(PGSQL_LIBS)
 endif
 lfc_unittests_LDFLAGS += $(GTEST_LDFLAGS)
 
-lfc_unittests_LDADD = $(top_builddir)/src/bin/lfc/liblfc.la
-lfc_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+lfc_unittests_LDADD  = $(top_builddir)/src/bin/lfc/liblfc.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+lfc_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+lfc_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-lfc_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+lfc_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 if HAVE_MYSQL
 lfc_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
@@ -53,11 +54,10 @@ lfc_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 endif
 
 lfc_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-lfc_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+lfc_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-lfc_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 lfc_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 859d567ec03283131a3a1f3facfb408213171650..afac8f27ea48b3b766035e127590bcf3fdfe948e 100644 (file)
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -54,8 +54,8 @@ sbin_PROGRAMS = kea-netconf
 kea_netconf_SOURCES  = main.cc
 
 kea_netconf_LDADD  = libnetconf.la
-kea_netconf_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+kea_netconf_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/yang/libkea-yang.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/http/libkea-http.la

diff --git a/src/bin/netconf/tests/Makefile.am b/src/bin/netconf/tests/Makefile.am
index 629cf85c42664570aa67755079b770caa83834a3..2f784a370c28c0c0405e152b4f6887e18321fa68 100644 (file)
--- a/src/bin/netconf/tests/Makefile.am
+++ b/src/bin/netconf/tests/Makefile.am
@@ -52,20 +52,14 @@ netconf_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 netconf_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 
 
-netconf_unittests_LDADD = $(top_builddir)/src/bin/netconf/libnetconf.la
+netconf_unittests_LDADD  = $(top_builddir)/src/bin/netconf/libnetconf.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
-#netconf_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-#netconf_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
-#netconf_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
-#netconf_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/yang/testutils/libyangtest.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/yang/libkea-yang.la
-#netconf_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-#netconf_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 netconf_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la

diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am
index f07e84b9de50a92c470e706a8c75c615196af35c..1203d6c99895c7578b3487dde636b662898f0da4 100644 (file)
--- a/src/bin/perfdhcp/Makefile.am
+++ b/src/bin/perfdhcp/Makefile.am
@@ -37,16 +37,17 @@ perfdhcp_SOURCES = main.cc
 
 perfdhcp_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 
-perfdhcp_LDADD = libperfdhcp.la
+perfdhcp_LDADD  = libperfdhcp.la
+perfdhcp_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 perfdhcp_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 perfdhcp_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+perfdhcp_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+perfdhcp_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 perfdhcp_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 perfdhcp_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 perfdhcp_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-perfdhcp_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 perfdhcp_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 perfdhcp_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-perfdhcp_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 perfdhcp_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 perfdhcp_LDADD += $(CRYPTO_LIBS)
 perfdhcp_LDADD += $(BOOST_LIBS)

diff --git a/src/bin/perfdhcp/tests/Makefile.am b/src/bin/perfdhcp/tests/Makefile.am
index 5c47ef68e379c2244a64315a4e8061ebfa981a44..7e3e8a0dbc45f7ec20c45f2376be85c7fc6ea301 100644 (file)
--- a/src/bin/perfdhcp/tests/Makefile.am
+++ b/src/bin/perfdhcp/tests/Makefile.am
@@ -41,16 +41,17 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 
 run_unittests_LDADD  = $(top_builddir)/src/bin/perfdhcp/libperfdhcp.la
+run_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+run_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 run_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.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/util/libkea-util.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 run_unittests_LDADD += $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
 endif

diff --git a/src/hooks/dhcp/bootp/Makefile.am b/src/hooks/dhcp/bootp/Makefile.am
index 2644664ff2548ae60eeafa680d761b17e24e8cc9..268da06e231d773dbf82a1f81fed7accd068249a 100644 (file)
--- a/src/hooks/dhcp/bootp/Makefile.am
+++ b/src/hooks/dhcp/bootp/Makefile.am
@@ -29,8 +29,9 @@ lib_hooks_LTLIBRARIES = libdhcp_bootp.la
 libdhcp_bootp_la_SOURCES  =
 libdhcp_bootp_la_LDFLAGS  = $(AM_LDFLAGS)
 libdhcp_bootp_la_LDFLAGS  += -avoid-version -export-dynamic -module
-libdhcp_bootp_la_LIBADD = libbootp.la
+libdhcp_bootp_la_LIBADD  = libbootp.la
 libdhcp_bootp_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcp_bootp_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libdhcp_bootp_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_bootp_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 libdhcp_bootp_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la

diff --git a/src/hooks/dhcp/bootp/libloadtests/Makefile.am b/src/hooks/dhcp/bootp/libloadtests/Makefile.am
index 9ae55fb77bb28e52ef0c48d334c478844219289e..bdaef5c3744f9b1c87281631a43e3ab864dc2d5e 100644 (file)
--- a/src/hooks/dhcp/bootp/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/bootp/libloadtests/Makefile.am
@@ -28,23 +28,24 @@ hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCL
 hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-hook_load_unittests_LDADD   = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/process/libkea-process.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/http/libkea-http.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/database/libkea-database.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/log/libkea-log.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/util/libkea-util.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+hook_load_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 hook_load_unittests_LDADD += $(LOG4CPLUS_LIBS)
 hook_load_unittests_LDADD += $(CRYPTO_LIBS)
 hook_load_unittests_LDADD += $(BOOST_LIBS)

diff --git a/src/hooks/dhcp/bootp/tests/Makefile.am b/src/hooks/dhcp/bootp/tests/Makefile.am
index 311c6fa5d60a8b090db1f8d756781b983d6c01f3..a0412c75cd381d0fb8f5fcec0e8c022047121ea4 100644 (file)
--- a/src/hooks/dhcp/bootp/tests/Makefile.am
+++ b/src/hooks/dhcp/bootp/tests/Makefile.am
@@ -37,6 +37,7 @@ bootp_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 bootp_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/bootp/libbootp.la
 bootp_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+bootp_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 bootp_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 bootp_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 bootp_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la

diff --git a/src/hooks/dhcp/flex_option/Makefile.am b/src/hooks/dhcp/flex_option/Makefile.am
index 526baaed976daf90d7b14ed71bd1e60da0bebc4b..ad1f26bf01e0c791de599f5fd43a39f86a8d9e71 100644 (file)
--- a/src/hooks/dhcp/flex_option/Makefile.am
+++ b/src/hooks/dhcp/flex_option/Makefile.am
@@ -30,9 +30,10 @@ lib_hooks_LTLIBRARIES = libdhcp_flex_option.la
 libdhcp_flex_option_la_SOURCES  =
 libdhcp_flex_option_la_LDFLAGS  = $(AM_LDFLAGS)
 libdhcp_flex_option_la_LDFLAGS  += -avoid-version -export-dynamic -module
-libdhcp_flex_option_la_LIBADD = libflex_option.la
+libdhcp_flex_option_la_LIBADD  = libflex_option.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/flex_option/libloadtests/Makefile.am b/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
index 8b23b0b0c6ea6bfeefbfb29bd7d1c16bf9a162ae..e100619c236e35586368c9e60c287d70ce585660 100644 (file)
--- a/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
@@ -38,6 +38,7 @@ flex_option_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 flex_option_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/flex_option/tests/Makefile.am b/src/hooks/dhcp/flex_option/tests/Makefile.am
index 508912598d6726dbf78ec81e97e21b6c880e9d58..d6c6ceb1512ddb6860a639572f1f326f0948f64b 100644 (file)
--- a/src/hooks/dhcp/flex_option/tests/Makefile.am
+++ b/src/hooks/dhcp/flex_option/tests/Makefile.am
@@ -40,6 +40,7 @@ flex_option_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 flex_option_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/flex_option/libflex_option.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/high_availability/Makefile.am b/src/hooks/dhcp/high_availability/Makefile.am
index 5d7a2689e904554d2bfc8eb9600e19482cafd8b1..114ee67db3a651a075fbc0c1690deba950fdcff2 100644 (file)
--- a/src/hooks/dhcp/high_availability/Makefile.am
+++ b/src/hooks/dhcp/high_availability/Makefile.am
@@ -43,6 +43,7 @@ libdhcp_ha_la_LDFLAGS  += -avoid-version -export-dynamic -module
 libdhcp_ha_la_LIBADD  = libha.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/high_availability/libloadtests/Makefile.am b/src/hooks/dhcp/high_availability/libloadtests/Makefile.am
index a80c7fab3f9bba3245de2409eb7faefd1206e09e..b05d8d7a8c957cde968e9d6422d932ef20e4813a 100644 (file)
--- a/src/hooks/dhcp/high_availability/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/high_availability/libloadtests/Makefile.am
@@ -36,8 +36,9 @@ ha_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 
 ha_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
-ha_unittests_LDADD = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+ha_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+ha_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/high_availability/tests/Makefile.am b/src/hooks/dhcp/high_availability/tests/Makefile.am
index 838a6946c2db5761777662a787c86f3b0d20c014..9b64a971cd73d75edf50de1935b5af6fdebd062d 100644 (file)
--- a/src/hooks/dhcp/high_availability/tests/Makefile.am
+++ b/src/hooks/dhcp/high_availability/tests/Makefile.am
@@ -47,6 +47,7 @@ ha_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 ha_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/high_availability/libha.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+ha_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
@@ -56,8 +57,8 @@ ha_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-ha_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+ha_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 ha_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la

diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am
index c46ad116e9951965ea91d4df468a11d72a3ee881..0b3063188bbe0aa8e995faaa97d307aff1d2da4a 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/Makefile.am
@@ -33,26 +33,27 @@ libdhcp_lease_cmds_la_SOURCES  =
 libdhcp_lease_cmds_la_LDFLAGS  = $(AM_LDFLAGS)
 libdhcp_lease_cmds_la_LDFLAGS  += -avoid-version -export-dynamic -module
 libdhcp_lease_cmds_la_LIBADD  = liblease_cmds.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/process/libkea-process.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/http/libkea-http.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/database/libkea-database.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
-libdhcp_lease_cmds_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libdhcp_lease_cmds_la_LIBADD  += $(LOG4CPLUS_LIBS)
-libdhcp_lease_cmds_la_LIBADD  += $(CRYPTO_LIBS)
-libdhcp_lease_cmds_la_LIBADD  += $(BOOST_LIBS)
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libdhcp_lease_cmds_la_LIBADD += $(LOG4CPLUS_LIBS)
+libdhcp_lease_cmds_la_LIBADD += $(CRYPTO_LIBS)
+libdhcp_lease_cmds_la_LIBADD += $(BOOST_LIBS)
 
 # If we want to get rid of all generated messages files, we need to use
 # make maintainer-clean. The proper way to introduce custom commands for

diff --git a/src/hooks/dhcp/lease_cmds/libloadtests/Makefile.am b/src/hooks/dhcp/lease_cmds/libloadtests/Makefile.am
index d038405fb9831f05756c7aeef0b6cb36c0b29a92..746f1e7a4c159dbd79b9bd2a114578042418ae20 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/libloadtests/Makefile.am
@@ -28,23 +28,24 @@ hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCL
 hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-hook_load_unittests_LDADD   = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/process/libkea-process.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/http/libkea-http.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/database/libkea-database.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/log/libkea-log.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/util/libkea-util.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+hook_load_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 hook_load_unittests_LDADD += $(LOG4CPLUS_LIBS)
 hook_load_unittests_LDADD += $(CRYPTO_LIBS)
 hook_load_unittests_LDADD += $(BOOST_LIBS)

diff --git a/src/hooks/dhcp/lease_cmds/tests/Makefile.am b/src/hooks/dhcp/lease_cmds/tests/Makefile.am
index f8ab706e4e4a148ec9f1468e2fd71f75cea7db74..be7f09d09c0fbaf64fd308992e3a90e06426de09 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/tests/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/tests/Makefile.am
@@ -39,6 +39,7 @@ lease_cmds_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 lease_cmds_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
@@ -49,7 +50,6 @@ lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la

diff --git a/src/hooks/dhcp/mysql_cb/Makefile.am b/src/hooks/dhcp/mysql_cb/Makefile.am
index fe805f6fc6ee2697880dcbebc60d39ddbaaac616..e850daa2be615885eb68c5e9c5b7df036e2d623a 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/Makefile.am
+++ b/src/hooks/dhcp/mysql_cb/Makefile.am
@@ -35,20 +35,21 @@ libdhcp_mysql_cb_la_LDFLAGS  += -avoid-version -export-dynamic -module
 
 libdhcp_mysql_cb_la_LIBADD  = libmysqlcb.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
-libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/hooks/dhcp/mysql_cb/libloadtests/Makefile.am b/src/hooks/dhcp/mysql_cb/libloadtests/Makefile.am
index f24bea913b545a04513b3a8632e68e5fcf73e20a..7beeba975d8a33afbb9520e747049edd3657b8a8 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/mysql_cb/libloadtests/Makefile.am
@@ -28,24 +28,25 @@ hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCL
 hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-hook_load_unittests_LDADD   = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/process/libkea-process.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/http/libkea-http.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/database/libkea-database.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/log/libkea-log.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/util/libkea-util.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+hook_load_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 hook_load_unittests_LDADD += $(LOG4CPLUS_LIBS)
 hook_load_unittests_LDADD += $(CRYPTO_LIBS)
 hook_load_unittests_LDADD += $(BOOST_LIBS)

diff --git a/src/hooks/dhcp/mysql_cb/tests/Makefile.am b/src/hooks/dhcp/mysql_cb/tests/Makefile.am
index e45f37feede1edb914ce6107a2e511852e98929c..8dfd4cfbf2178ea97d803c0f799f206a40fe9831 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/tests/Makefile.am
+++ b/src/hooks/dhcp/mysql_cb/tests/Makefile.am
@@ -35,24 +35,25 @@ mysql_cb_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 
 mysql_cb_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
-mysql_cb_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
-mysql_cb_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_cb/libmysqlcb.la
+mysql_cb_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/mysql_cb/libmysqlcb.la
+mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/hooks/dhcp/pgsql_cb/Makefile.am b/src/hooks/dhcp/pgsql_cb/Makefile.am
index 1e8635acc5c0b181f45df8a49eacdc7a51fca195..b65fdaf56b914fcf8ec3a907884740f6a568d489 100644 (file)
--- a/src/hooks/dhcp/pgsql_cb/Makefile.am
+++ b/src/hooks/dhcp/pgsql_cb/Makefile.am
@@ -40,20 +40,21 @@ libdhcp_pgsql_cb_la_LDFLAGS  += -avoid-version -export-dynamic -module
 
 libdhcp_pgsql_cb_la_LIBADD  = libpgsqlcb.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
-libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libdhcp_pgsql_cb_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/hooks/dhcp/pgsql_cb/libloadtests/Makefile.am b/src/hooks/dhcp/pgsql_cb/libloadtests/Makefile.am
index e68199a2b72f432bc3fe7d6c8c1d1a98f5775826..71ace0ce9b70b1b65c56eeec67b0607c6cf23124 100644 (file)
--- a/src/hooks/dhcp/pgsql_cb/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/pgsql_cb/libloadtests/Makefile.am
@@ -28,24 +28,25 @@ hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCL
 hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-hook_load_unittests_LDADD   = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/process/libkea-process.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/http/libkea-http.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/database/libkea-database.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/log/libkea-log.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/util/libkea-util.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+hook_load_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 hook_load_unittests_LDADD += $(LOG4CPLUS_LIBS)
 hook_load_unittests_LDADD += $(CRYPTO_LIBS)
 hook_load_unittests_LDADD += $(BOOST_LIBS)

diff --git a/src/hooks/dhcp/pgsql_cb/tests/Makefile.am b/src/hooks/dhcp/pgsql_cb/tests/Makefile.am
index 81341543c8f9127fd2273e209156d5f2b3e6ace3..10ab9ff2f7175ee045edcd6112b98bbb3011d772 100644 (file)
--- a/src/hooks/dhcp/pgsql_cb/tests/Makefile.am
+++ b/src/hooks/dhcp/pgsql_cb/tests/Makefile.am
@@ -38,21 +38,22 @@ pgsql_cb_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 pgsql_cb_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_cb/libpgsqlcb.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 pgsql_cb_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/hooks/dhcp/run_script/Makefile.am b/src/hooks/dhcp/run_script/Makefile.am
index 310ac9ba3135db9f9a6337a0aa844aca8160f9c9..abccf572cc57cb2a4138f0f513b1210c7b65a1f4 100644 (file)
--- a/src/hooks/dhcp/run_script/Makefile.am
+++ b/src/hooks/dhcp/run_script/Makefile.am
@@ -33,6 +33,7 @@ libdhcp_run_script_la_LDFLAGS  += -avoid-version -export-dynamic -module
 libdhcp_run_script_la_LIBADD  = librun_script.la
 libdhcp_run_script_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 libdhcp_run_script_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcp_run_script_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libdhcp_run_script_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_run_script_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcp_run_script_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/run_script/libloadtests/Makefile.am b/src/hooks/dhcp/run_script/libloadtests/Makefile.am
index 97fd7bb78f2b7bbb1a362f6f2da80b9783f6c4b3..78915bd74b13b99861a4d144c67db547dd6541cd 100644 (file)
--- a/src/hooks/dhcp/run_script/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/run_script/libloadtests/Makefile.am
@@ -38,6 +38,7 @@ run_script_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 run_script_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+run_script_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/run_script/tests/Makefile.am b/src/hooks/dhcp/run_script/tests/Makefile.am
index 730e4a029ca4bf8685146ccacb01a94ed17deb97..bc20b5524557e7988ef825828b7a5021315b6568 100644 (file)
--- a/src/hooks/dhcp/run_script/tests/Makefile.am
+++ b/src/hooks/dhcp/run_script/tests/Makefile.am
@@ -46,6 +46,7 @@ run_script_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 run_script_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/run_script/librun_script.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+run_script_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 run_script_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/stat_cmds/Makefile.am b/src/hooks/dhcp/stat_cmds/Makefile.am
index eea1f8a253304decdd9e272b6b730328d83ff0c4..cf7682530762da6ac2a9b913001fa3ecf606bc05 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/Makefile.am
+++ b/src/hooks/dhcp/stat_cmds/Makefile.am
@@ -27,30 +27,31 @@ libstat_cmds_la_CPPFLAGS = $(AM_CPPFLAGS)
 lib_hooksdir = $(libdir)/kea/hooks
 lib_hooks_LTLIBRARIES = libdhcp_stat_cmds.la
 
-libdhcp_stat_cmds_la_SOURCES  =
+libdhcp_stat_cmds_la_SOURCES =
 libdhcp_stat_cmds_la_LDFLAGS  = $(AM_LDFLAGS)
-libdhcp_stat_cmds_la_LDFLAGS  += -avoid-version -export-dynamic -module
+libdhcp_stat_cmds_la_LDFLAGS += -avoid-version -export-dynamic -module
 libdhcp_stat_cmds_la_LIBADD  = libstat_cmds.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/process/libkea-process.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/http/libkea-http.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/database/libkea-database.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
-libdhcp_stat_cmds_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libdhcp_stat_cmds_la_LIBADD  += $(LOG4CPLUS_LIBS)
-libdhcp_stat_cmds_la_LIBADD  += $(CRYPTO_LIBS)
-libdhcp_stat_cmds_la_LIBADD  += $(BOOST_LIBS)
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libdhcp_stat_cmds_la_LIBADD += $(LOG4CPLUS_LIBS)
+libdhcp_stat_cmds_la_LIBADD += $(CRYPTO_LIBS)
+libdhcp_stat_cmds_la_LIBADD += $(BOOST_LIBS)
 
 # If we want to get rid of all generated messages files, we need to use
 # make maintainer-clean. The proper way to introduce custom commands for

diff --git a/src/hooks/dhcp/stat_cmds/libloadtests/Makefile.am b/src/hooks/dhcp/stat_cmds/libloadtests/Makefile.am
index e102ece5be6f4001e439a5d28f511f1c26ce8816..5815752749c8b1e9724cc4b45c4774b0809b3c5f 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/stat_cmds/libloadtests/Makefile.am
@@ -28,23 +28,24 @@ hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCL
 hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-hook_load_unittests_LDADD   = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/process/libkea-process.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/http/libkea-http.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/database/libkea-database.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/log/libkea-log.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/util/libkea-util.la
-hook_load_unittests_LDADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+hook_load_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+hook_load_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 hook_load_unittests_LDADD += $(LOG4CPLUS_LIBS)
 hook_load_unittests_LDADD += $(CRYPTO_LIBS)
 hook_load_unittests_LDADD += $(BOOST_LIBS)

diff --git a/src/hooks/dhcp/stat_cmds/tests/Makefile.am b/src/hooks/dhcp/stat_cmds/tests/Makefile.am
index 5dfb8e0c0f3c9dd7ecfe94f5f5184bf716ad3d24..91a80d547e988f7453058b32ddca463029008971 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/tests/Makefile.am
+++ b/src/hooks/dhcp/stat_cmds/tests/Makefile.am
@@ -42,8 +42,9 @@ stat_cmds_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 
 stat_cmds_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
-stat_cmds_unittests_LDADD = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+stat_cmds_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/hooks/dhcp/user_chk/Makefile.am b/src/hooks/dhcp/user_chk/Makefile.am
index a88fb628ec0e30646ca889c10b2773a7d26efb58..91de3f23382e17cf91b8b84a279e7cba6732d5fb 100644 (file)
--- a/src/hooks/dhcp/user_chk/Makefile.am
+++ b/src/hooks/dhcp/user_chk/Makefile.am
@@ -40,11 +40,11 @@ libdhcp_user_chk_la_LDFLAGS  += -avoid-version -export-dynamic -module
 # convenience archive, resulting in shared modules
 libdhcp_user_chk_la_LDFLAGS  += -rpath /nowhere
 libdhcp_user_chk_la_LIBADD  = libduc.la
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
-libdhcp_user_chk_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libdhcp_user_chk_la_LIBADD  += $(LOG4CPLUS_LIBS)
+libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libdhcp_user_chk_la_LIBADD += $(LOG4CPLUS_LIBS)
 
 # If we want to get rid of all generated messages files, we need to use
 # make maintainer-clean. The proper way to introduce custom commands for

diff --git a/src/hooks/dhcp/user_chk/tests/Makefile.am b/src/hooks/dhcp/user_chk/tests/Makefile.am
index c37c28ee792cdac8bf72b4987bbd69efc1905c5f..83a9f008ec497f02506427ace116dc66f9ac2403 100644 (file)
--- a/src/hooks/dhcp/user_chk/tests/Makefile.am
+++ b/src/hooks/dhcp/user_chk/tests/Makefile.am
@@ -39,13 +39,13 @@ libdhcp_user_chk_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LD
 
 libdhcp_user_chk_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
-libdhcp_user_chk_unittests_LDADD = $(top_builddir)/src/hooks/dhcp/user_chk/libduc.la
+libdhcp_user_chk_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/user_chk/libduc.la
 libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 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 += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index 017217f161835f3da033e2810ac30508b8e846bb..f4e8b333a70d8478a59b95e8aa018adf75331eef 100644 (file)
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -60,7 +60,7 @@ endif
 # KEA_CXXFLAGS)
 libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_asiolink_la_LIBADD = $(top_builddir)/src/lib/util/libkea-util.la
+libkea_asiolink_la_LIBADD  = $(top_builddir)/src/lib/util/libkea-util.la
 libkea_asiolink_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_asiolink_la_LIBADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
 

diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am
index c1e0a6b0a1fdb68d963009fe03f33e3a86eda6c9..38f6e7abef988dcb4ae60dea4fe41869a1588af1 100644 (file)
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@ -27,7 +27,7 @@ run_unittests_SOURCES += run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-run_unittests_LDADD =  $(top_builddir)/src/lib/cc/libkea-cc.la
+run_unittests_LDADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
 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

diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
index 746c7c8b153084fa9368234513d72af0e2823dca..12bed81a9a73e0c0b5cfc74765f37cecff91cb3e 100644 (file)
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -18,13 +18,13 @@ libkea_cfgclient_la_SOURCES += cmd_http_listener.cc cmd_http_listener.h
 libkea_cfgclient_la_SOURCES += cmd_response_creator.cc cmd_response_creator.h
 libkea_cfgclient_la_SOURCES += cmd_response_creator_factory.h
 
-libkea_cfgclient_la_LIBADD = $(top_builddir)/src/lib/http/libkea-http.la
+libkea_cfgclient_la_LIBADD  = $(top_builddir)/src/lib/http/libkea-http.la
 libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.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

diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index 8b4fdd82cc55bc46296149ab486953458442763d..546c35748ad1fd97354c68409086b2de0bedc282 100644 (file)
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -29,15 +29,15 @@ run_unittests_SOURCES += cmd_response_creator_factory_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 
-run_unittests_LDADD  = $(top_builddir)/src/lib/asiolink/testutils/libasiolinktest.la
-run_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+run_unittests_LDADD  = $(top_builddir)/src/lib/config/libkea-cfgclient.la
 run_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/testutils/libasiolinktest.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 run_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.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/util/libkea-util.la

diff --git a/src/lib/d2srv/Makefile.am b/src/lib/d2srv/Makefile.am
index 7414315e6a495cd8d6fd1feea2437300621848be..0aeebdb5190e9a98dbf06cf2bf54e8b9871530cc 100644 (file)
--- a/src/lib/d2srv/Makefile.am
+++ b/src/lib/d2srv/Makefile.am
@@ -29,7 +29,6 @@ libkea_d2srv_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libkea_d2srv_la_LIBADD  =
 libkea_d2srv_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
-libkea_d2srv_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libkea_d2srv_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libkea_d2srv_la_LIBADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
 libkea_d2srv_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/lib/d2srv/tests/Makefile.am b/src/lib/d2srv/tests/Makefile.am
index b1fffe820d4520b6fd2f4bc5900271de3f607915..f8b9e6b2f1d2bdbe1993875ce8b7a3ad6de3a974 100644 (file)
--- a/src/lib/d2srv/tests/Makefile.am
+++ b/src/lib/d2srv/tests/Makefile.am
@@ -27,9 +27,10 @@ libd2srv_unittests_SOURCES += nc_trans_unittests.cc
 libd2srv_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 libd2srv_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-libd2srv_unittests_LDADD  = $(top_builddir)/src/lib/d2srv/libkea-d2srv.la
-libd2srv_unittests_LDADD += $(top_builddir)/src/lib/d2srv/testutils/libd2srvtest.la
+libd2srv_unittests_LDADD  = $(top_builddir)/src/lib/d2srv/testutils/libd2srvtest.la
+libd2srv_unittests_LDADD += $(top_builddir)/src/lib/d2srv/libkea-d2srv.la
 libd2srv_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+libd2srv_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libd2srv_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libd2srv_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
 libd2srv_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index 5857d3305e5f244c4284f7e7c9234301168467c5..43ea452dad21e6ea73bb55b14f851ba12384c392 100644 (file)
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -74,16 +74,16 @@ libkea_dhcp___la_SOURCES += std_option_defs.h
 
 libkea_dhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_dhcp___la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_dhcp___la_LIBADD   = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-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/hooks/libkea-hooks.la
-libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
-libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
-libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.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_LIBADD  = $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+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/log/libkea-log.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 68:0:0
 libkea_dhcp___la_LDFLAGS += $(CRYPTO_LDFLAGS)
 

diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am
index a140fc0a126384134c3d3594a77c7c2cbefd46bb..259ddff03fef899e51a9ed6d09ecc2fa7aef9193 100644 (file)
--- a/src/lib/dhcp/tests/Makefile.am
+++ b/src/lib/dhcp/tests/Makefile.am
@@ -69,7 +69,7 @@ libdhcp___unittests_SOURCES += option_space_unittest.cc
 libdhcp___unittests_SOURCES += option_string_unittest.cc
 libdhcp___unittests_SOURCES += option_vendor_unittest.cc
 libdhcp___unittests_SOURCES += option_vendor_class_unittest.cc
-libdhcp___unittests_SOURCES  += pkt_captures4.cc pkt_captures6.cc pkt_captures.h
+libdhcp___unittests_SOURCES += pkt_captures4.cc pkt_captures6.cc pkt_captures.h
 libdhcp___unittests_SOURCES += packet_queue4_unittest.cc
 libdhcp___unittests_SOURCES += packet_queue6_unittest.cc
 libdhcp___unittests_SOURCES += packet_queue_mgr4_unittest.cc
@@ -106,15 +106,15 @@ libdhcp___unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 libdhcp___unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 libdhcp___unittests_LDADD  = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp___unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libdhcp___unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 libdhcp___unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
 libdhcp___unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 endif

diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
index 013839efa4b18cd7d714b8268e56ededda4da595..9cff2d7b6c206bb403d9f07660b95f7d64df9fc4 100644 (file)
--- a/src/lib/dhcp_ddns/Makefile.am
+++ b/src/lib/dhcp_ddns/Makefile.am
@@ -23,14 +23,13 @@ libkea_dhcp_ddns_la_LDFLAGS  = $(AM_LDFLAGS)
 libkea_dhcp_ddns_la_LDFLAGS += $(CRYPTO_LDFLAGS)
 libkea_dhcp_ddns_la_LDFLAGS += -no-undefined -version-info 40:0:0
 
-libkea_dhcp_ddns_la_LIBADD  =
-libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+libkea_dhcp_ddns_la_LIBADD  = $(top_builddir)/src/lib/stats/libkea-stats.la
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.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

diff --git a/src/lib/dhcp_ddns/tests/Makefile.am b/src/lib/dhcp_ddns/tests/Makefile.am
index c504ca977059b86a774be428d7ff15c191f38b75..68ae6baabe0c00dc1932796ac78702f90a1ce0f7 100644 (file)
--- a/src/lib/dhcp_ddns/tests/Makefile.am
+++ b/src/lib/dhcp_ddns/tests/Makefile.am
@@ -30,14 +30,14 @@ libdhcp_ddns_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 libdhcp_ddns_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
 
-libdhcp_ddns_unittests_LDADD = $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libdhcp_ddns_unittests_LDADD  = $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index 89c52cb2d11a598f70c991f656c77e397977d4c4..eb9501fd8356423564451ee7317b97dd94622af3 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -196,31 +196,31 @@ endif
 
 libkea_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_dhcpsrv_la_LIBADD  = $(top_builddir)/src/lib/eval/libkea-eval.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/process/libkea-process.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/http/libkea-http.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libkea_dhcpsrv_la_LIBADD  = $(top_builddir)/src/lib/process/libkea-process.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 if HAVE_MYSQL
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/mysql/libkea-mysql.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
 endif
 if HAVE_PGSQL
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 endif
 
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/database/libkea-database.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.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) $(BOOST_LIBS)
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.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) $(BOOST_LIBS)
 
 libkea_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 84:0:0
 libkea_dhcpsrv_la_LDFLAGS += $(CRYPTO_LDFLAGS)

diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index ea2d29b5f9df2a56770e8a0898642cb3c007acbc..7016b51c50f90f55cf0a09aedb8b7e52bb68e150 100644 (file)
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -155,9 +155,9 @@ libdhcpsrv_unittests_LDFLAGS  += $(PGSQL_LIBS)
 endif
 
 libdhcpsrv_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
-
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la

diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index fac4ff25191bbb873976b718febd722f2cb79997..c7f45cc72c39d8d22e82ce6e4f6a95a0a8220ad8 100644 (file)
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -156,7 +156,7 @@ libkea_dns___la_SOURCES += rdata/generic/detail/txt_like.h
 libkea_dns___la_SOURCES += rdata/generic/detail/ds_like.h
 
 libkea_dns___la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_dns___la_LIBADD = $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_dns___la_LIBADD  = $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 libkea_dns___la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_dns___la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_dns___la_LIBADD += $(CRYPTO_LIBS)

diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am
index bf0ab4195de8652c93dfb24b48c64b92791719da..c89c3db48b45ddd3478c7fb8c57b89e2c71baeb4 100644 (file)
--- a/src/lib/dns/tests/Makefile.am
+++ b/src/lib/dns/tests/Makefile.am
@@ -83,7 +83,7 @@ run_unittests_SOURCES += zone_checker_unittest.cc
 run_unittests_SOURCES += run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
-run_unittests_LDADD = $(top_builddir)/src/lib/dns/libkea-dns++.la
+run_unittests_LDADD  = $(top_builddir)/src/lib/dns/libkea-dns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.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/eval/Makefile.am b/src/lib/eval/Makefile.am
index 56c0ffa6d9279680c8783ea8b716d849613d297b..666e00d1cb10fe4b54d9b578fa8df40a7c81aa79 100644 (file)
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -26,15 +26,15 @@ libkea_eval_la_SOURCES += eval_messages.h eval_messages.cc
 
 libkea_eval_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_eval_la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_eval_la_LIBADD   = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libkea_eval_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libkea_eval_la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libkea_eval_la_LIBADD  += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libkea_eval_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libkea_eval_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.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) $(BOOST_LIBS)
+libkea_eval_la_LIBADD  = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libkea_eval_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libkea_eval_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_eval_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libkea_eval_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_eval_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.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) $(BOOST_LIBS)
 
 libkea_eval_la_LDFLAGS  = -no-undefined -version-info 49:0:0
 libkea_eval_la_LDFLAGS += $(CRYPTO_LDFLAGS)

diff --git a/src/lib/eval/tests/Makefile.am b/src/lib/eval/tests/Makefile.am
index 5a33f32e3fa7dec572f91a71cc447bb4feb8c4f3..13ba09715b1a6ec1c80230bad3e0f53d40d561c6 100644 (file)
--- a/src/lib/eval/tests/Makefile.am
+++ b/src/lib/eval/tests/Makefile.am
@@ -28,19 +28,19 @@ libeval_unittests_SOURCES += run_unittests.cc
 libeval_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 libeval_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 libeval_unittests_LDFLAGS  = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
-libeval_unittests_LDADD    = $(top_builddir)/src/lib/eval/libkea-eval.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/cc/libkea-cc.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/log/libkea-log.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/util/libkea-util.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libeval_unittests_LDADD   += $(top_builddir)/src/lib/testutils/libkea-testutils.la
-libeval_unittests_LDADD   += $(CRYPTO_LIBS) $(LOG4CPLUS_LIBS)
-libeval_unittests_LDADD   += $(BOOST_LIBS) $(GTEST_LDADD)
+libeval_unittests_LDADD  = $(top_builddir)/src/lib/eval/libkea-eval.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+libeval_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libeval_unittests_LDADD += $(CRYPTO_LIBS) $(LOG4CPLUS_LIBS)
+libeval_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 endif
 
 noinst_PROGRAMS = $(TESTS)

diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am
index 75667443b14844637e68e684582aa9aa0f86a0df..efdca9a9e5f0f0f2f4aaed030a1cce728096d5d7 100644 (file)
--- a/src/lib/hooks/Makefile.am
+++ b/src/lib/hooks/Makefile.am
@@ -39,8 +39,7 @@ libkea_hooks_la_SOURCES += hooks_messages.cc hooks_messages.h
 libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_hooks_la_LDFLAGS  = $(AM_LDFLAGS) -no-undefined -version-info 72:0:0
-libkea_hooks_la_LIBADD  =
-libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_hooks_la_LIBADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la

diff --git a/src/lib/hooks/tests/Makefile.am b/src/lib/hooks/tests/Makefile.am
index f0f5b048f5375b478d55b5d6ef8f0d773536788a..8cbe4138fa6a187bc40a255d99b4403b97a41286 100644 (file)
--- a/src/lib/hooks/tests/Makefile.am
+++ b/src/lib/hooks/tests/Makefile.am
@@ -129,12 +129,12 @@ if USE_STATIC_LINK
 run_unittests_LDFLAGS  += -static -export-dynamic
 endif
 
-run_unittests_LDADD     = $(AM_LDADD)
-run_unittests_LDADD    += $(ALL_LIBS)
-run_unittests_LDADD    += $(top_builddir)/src/lib/cc/libkea-cc.la
-run_unittests_LDADD    += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-run_unittests_LDADD    += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD    += $(GTEST_LDADD) $(LOG4CPLUS_LIBS) $(BOOST_LIBS)
+run_unittests_LDADD  = $(AM_LDADD)
+run_unittests_LDADD += $(ALL_LIBS)
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(GTEST_LDADD) $(LOG4CPLUS_LIBS) $(BOOST_LIBS)
 # As noted in configure.ac, libtool doesn't work perfectly with Darwin: it
 # embeds the final install path in dynamic libraries and loadable modules refer
 # to that path even if its loaded within the source tree, so preventing tests

diff --git a/src/lib/http/Makefile.am b/src/lib/http/Makefile.am
index 38dbaa38de7c5bcede21cea101d708bf9941dedf..4c912d1d07596ed48a6fc7820d7817e3c8c1cdb0 100644 (file)
--- a/src/lib/http/Makefile.am
+++ b/src/lib/http/Makefile.am
@@ -49,10 +49,9 @@ libkea_http_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_http_la_LDFLAGS  = $(AM_LDFLAGS)
 libkea_http_la_LDFLAGS += -no-undefined -version-info 53:0:0
 
-libkea_http_la_LIBADD  =
-libkea_http_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libkea_http_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_http_la_LIBADD  = $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libkea_http_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_http_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_http_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_http_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_http_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index 15bea1ce5a7d1e4e670360aeb2139a943cb04efe..b7150e3d8a652fceddf121fce55ffd72f6306f33 100644 (file)
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -44,10 +44,10 @@ if USE_GXX
 libkea_log_la_CXXFLAGS += -Wno-unused-parameter -Wno-deprecated-declarations
 endif
 libkea_log_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libkea_log_la_LIBADD   = $(top_builddir)/src/lib/log/interprocess/libkea-log_interprocess.la
-libkea_log_la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
-libkea_log_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_log_la_LIBADD  += $(LOG4CPLUS_LIBS)
+libkea_log_la_LIBADD  = $(top_builddir)/src/lib/log/interprocess/libkea-log_interprocess.la
+libkea_log_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_log_la_LIBADD += $(LOG4CPLUS_LIBS)
 libkea_log_la_LDFLAGS = -no-undefined -version-info 48:0:0
 
 # Specify the headers for copying into the installation directory tree.

diff --git a/src/lib/pgsql/tests/Makefile.am b/src/lib/pgsql/tests/Makefile.am
index 1250a52d030d39bb7a6c25b2bbab01b736d2cb0a..425eea085bf6d3b94e6efa298a25e1e54df2f75e 100644 (file)
--- a/src/lib/pgsql/tests/Makefile.am
+++ b/src/lib/pgsql/tests/Makefile.am
@@ -25,14 +25,14 @@ libpgsql_unittests_SOURCES += run_unittests.cc
 libpgsql_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 libpgsql_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(PGSQL_LIBS)
 
-libpgsql_unittests_LDADD  = $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
+libpgsql_unittests_LDADD  = $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
+libpgsql_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 libpgsql_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 libpgsql_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libpgsql_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libpgsql_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libpgsql_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 libpgsql_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libpgsql_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
 libpgsql_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
 
 endif

diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am
index 9a379097aba3d4c308ae42a430c2af8a30ca72d1..84592e38f87a54cd2f65398fdc6e04bb946949ad 100644 (file)
--- a/src/lib/process/Makefile.am
+++ b/src/lib/process/Makefile.am
@@ -36,14 +36,13 @@ libkea_process_la_LDFLAGS  = $(AM_LDFLAGS)
 libkea_process_la_LDFLAGS += -no-undefined -version-info 53:0:0
 
 libkea_process_la_LIBADD  =
-libkea_process_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libkea_process_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
-libkea_process_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libkea_process_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libkea_process_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_process_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/lib/process/tests/Makefile.am b/src/lib/process/tests/Makefile.am
index 7c1a43059a640f496bf6dfc23a66711d2a2c154b..7c20e6e4760558fc5e9ed252f828958fa9cc624d 100644 (file)
--- a/src/lib/process/tests/Makefile.am
+++ b/src/lib/process/tests/Makefile.am
@@ -40,13 +40,13 @@ libprocess_unittests_LDFLAGS  = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 libprocess_unittests_LDADD  = $(top_builddir)/src/lib/process/testutils/libprocesstest.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
-libprocess_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libprocess_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libprocess_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libprocess_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
+libprocess_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libprocess_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 libprocess_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/lib/process/testutils/Makefile.am b/src/lib/process/testutils/Makefile.am
index 42ed4dac5b3e6bb21836fdc32859927ebbaa6150..147957ef23a6ce6c8e6f00466360b347611cb782 100644 (file)
--- a/src/lib/process/testutils/Makefile.am
+++ b/src/lib/process/testutils/Makefile.am
@@ -18,10 +18,10 @@ libprocesstest_la_CXXFLAGS = $(AM_CXXFLAGS)
 libprocesstest_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 libprocesstest_la_LDFLAGS  = $(AM_LDFLAGS)
 
-libprocesstest_la_LIBADD   = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libprocesstest_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
-libprocesstest_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
-libprocesstest_la_LIBADD  += $(top_builddir)/src/lib/process/libkea-process.la
-libprocesstest_la_LIBADD  += $(LOG4CPLUS_LIBS) $(BOOST_LIBS)
+libprocesstest_la_LIBADD  = $(top_builddir)/src/lib/process/libkea-process.la
+libprocesstest_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libprocesstest_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libprocesstest_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libprocesstest_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS)
 
 endif

diff --git a/src/lib/tcp/Makefile.am b/src/lib/tcp/Makefile.am
index d17d7111f650370670f82b0c50e68ccce1dfb468..e7c35912ae6fd67d65fa96b1128cf722809bcd0e 100644 (file)
--- a/src/lib/tcp/Makefile.am
+++ b/src/lib/tcp/Makefile.am
@@ -26,10 +26,9 @@ libkea_tcp_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_tcp_la_LDFLAGS  = $(AM_LDFLAGS)
 libkea_tcp_la_LDFLAGS += -no-undefined -version-info 2:0:0
 
-libkea_tcp_la_LIBADD  =
-libkea_tcp_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libkea_tcp_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_tcp_la_LIBADD  = $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libkea_tcp_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_tcp_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_tcp_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_tcp_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_tcp_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/lib/tcp/tests/Makefile.am b/src/lib/tcp/tests/Makefile.am
index 41ac0fcb5caf330976275f7ef30ba271f71ed947..fd06ef4f218fbd3bf2cb859d5cbfec9f0ae91cf3 100644 (file)
--- a/src/lib/tcp/tests/Makefile.am
+++ b/src/lib/tcp/tests/Makefile.am
@@ -33,9 +33,9 @@ endif
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 
-run_unittests_LDADD = $(top_builddir)/src/lib/tcp/libkea-tcp.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/testutils/libasiolinktest.la
+run_unittests_LDADD  = $(top_builddir)/src/lib/tcp/libkea-tcp.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/testutils/libasiolinktest.la
 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

diff --git a/src/lib/yang/Makefile.am b/src/lib/yang/Makefile.am
index 0d1477bb948f280959dd30c018b565dd6d835266..1f7e5c6a2d9779610650e6ca41626028eb88af9f 100644 (file)
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@ -39,8 +39,8 @@ libkea_yang_la_SOURCES += translator_shared_network.h
 libkea_yang_la_SOURCES += translator_config.cc translator_config.h
 libkea_yang_la_SOURCES += yang_models.h yang_revisions.h
 
-libkea_yang_la_LIBADD =  $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_yang_la_LIBADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_yang_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_yang_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_yang_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_yang_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la

diff --git a/src/lib/yang/tests/Makefile.am b/src/lib/yang/tests/Makefile.am
index c3635ed65f17fe0a055db8151421941eae9644ee..028f3d9f0bff58aa10748c80a4f842e3df3b8e4f 100644 (file)
--- a/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@ -50,7 +50,7 @@ run_unittests_SOURCES += run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-run_unittests_LDADD =  $(top_builddir)/src/lib/yang/testutils/libyangtest.la
+run_unittests_LDADD  = $(top_builddir)/src/lib/yang/testutils/libyangtest.la
 run_unittests_LDADD += $(top_builddir)/src/lib/yang/libkea-yang.la
 run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la

diff --git a/src/lib/yang/testutils/Makefile.am b/src/lib/yang/testutils/Makefile.am
index 881130137766e19615b4774a74ec4117739713ec..408d555d4396c9e1cec0f7faaeccf63489c4386b 100644 (file)
--- a/src/lib/yang/testutils/Makefile.am
+++ b/src/lib/yang/testutils/Makefile.am
@@ -24,7 +24,7 @@ libyangtest_la_CXXFLAGS = $(AM_CXXFLAGS)
 libyangtest_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 libyangtest_la_LDFLAGS  = $(AM_LDFLAGS)
 
-libyangtest_la_LIBADD   = $(top_builddir)/src/lib/yang/libkea-yang.la
-libyangtest_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
+libyangtest_la_LIBADD  = $(top_builddir)/src/lib/yang/libkea-yang.la
+libyangtest_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 
 endif