From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 2 Feb 2023 11:44:22 +0000 (+0200)
Subject: [#2702] fix static linking with libcfgrpt.la multiple times
X-Git-Tag: Kea-2.3.5~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9cee553410b050705a5e29cf8b1effbfdaf63e6;p=thirdparty%2Fkea.git

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

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index 9d9f342566..3ebee7648c 100644
--- 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 9c279d71c8..0deb4b4c72 100644
--- 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 53282977f7..8fd4fe40ec 100644
--- 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 09ef42efed..25ca36343c 100644
--- 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 f53e75c91b..58b3c97f9b 100644
--- 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 9b662d7c40..155cebf3b7 100644
--- 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 283b0e6b49..e0cc5090ca 100644
--- 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 3970fd9eaf..d3fe96d12d 100644
--- 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 bb7f96fa2d..c83779a1dd 100644
--- 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 e2d31f65cb..0b5425d325 100644
--- 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 859d567ec0..afac8f27ea 100644
--- 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 629cf85c42..2f784a370c 100644
--- 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 f07e84b9de..1203d6c998 100644
--- 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 5c47ef68e3..7e3e8a0dbc 100644
--- 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 2644664ff2..268da06e23 100644
--- 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 9ae55fb77b..bdaef5c374 100644
--- 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 311c6fa5d6..a0412c75cd 100644
--- 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 526baaed97..ad1f26bf01 100644
--- 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 8b23b0b0c6..e100619c23 100644
--- 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 508912598d..d6c6ceb151 100644
--- 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 5d7a2689e9..114ee67db3 100644
--- 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 a80c7fab3f..b05d8d7a8c 100644
--- 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 838a6946c2..9b64a971cd 100644
--- 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 c46ad116e9..0b3063188b 100644
--- 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 d038405fb9..746f1e7a4c 100644
--- 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 f8ab706e4e..be7f09d09c 100644
--- 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 fe805f6fc6..e850daa2be 100644
--- 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 f24bea913b..7beeba975d 100644
--- 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 e45f37feed..8dfd4cfbf2 100644
--- 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 1e8635acc5..b65fdaf56b 100644
--- 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 e68199a2b7..71ace0ce9b 100644
--- 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 81341543c8..10ab9ff2f7 100644
--- 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 310ac9ba31..abccf572cc 100644
--- 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 97fd7bb78f..78915bd74b 100644
--- 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 730e4a029c..bc20b55245 100644
--- 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 eea1f8a253..cf76825307 100644
--- 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 e102ece5be..5815752749 100644
--- 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 5dfb8e0c0f..91a80d547e 100644
--- 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 a88fb628ec..91de3f2338 100644
--- 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 c37c28ee79..83a9f008ec 100644
--- 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 017217f161..f4e8b333a7 100644
--- 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 c1e0a6b0a1..38f6e7abef 100644
--- 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 746c7c8b15..12bed81a9a 100644
--- 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 8b4fdd82cc..546c35748a 100644
--- 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 7414315e6a..0aeebdb519 100644
--- 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 b1fffe820d..f8b9e6b2f1 100644
--- 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 5857d3305e..43ea452dad 100644
--- 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 a140fc0a12..259ddff03f 100644
--- 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 013839efa4..9cff2d7b6c 100644
--- 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 c504ca9770..68ae6baabe 100644
--- 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 89c52cb2d1..eb9501fd83 100644
--- 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 ea2d29b5f9..7016b51c50 100644
--- 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 fac4ff2519..c7f45cc72c 100644
--- 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 bf0ab4195d..c89c3db48b 100644
--- 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 56c0ffa6d9..666e00d1cb 100644
--- 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 5a33f32e3f..13ba09715b 100644
--- 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 75667443b1..efdca9a9e5 100644
--- 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 f0f5b048f5..8cbe4138fa 100644
--- 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 38dbaa38de..4c912d1d07 100644
--- 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 15bea1ce5a..b7150e3d8a 100644
--- 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 1250a52d03..425eea085b 100644
--- 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 9a379097ab..84592e38f8 100644
--- 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 7c1a43059a..7c20e6e476 100644
--- 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 42ed4dac5b..147957ef23 100644
--- 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 d17d7111f6..e7c35912ae 100644
--- 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 41ac0fcb5c..fd06ef4f21 100644
--- 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 0d1477bb94..1f7e5c6a2d 100644
--- 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 c3635ed65f..028f3d9f0b 100644
--- 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 8811301377..408d555d43 100644
--- 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