From: Marcin Siodelski Date: Thu, 30 Aug 2018 12:34:54 +0000 (+0200) Subject: [#92,!13] Reordered database specific libraries linking. X-Git-Tag: gitlab116_base~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82ea16f7e007601841677fe3011d261b5cb0261f;p=thirdparty%2Fkea.git [#92,!13] Reordered database specific libraries linking. --- diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am index 2cea3a7232..e2b71a4618 100644 --- a/src/bin/d2/Makefile.am +++ b/src/bin/d2/Makefile.am @@ -96,7 +96,6 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la 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/dhcp/libkea-dhcp++.la -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la if HAVE_MYSQL kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -109,6 +108,7 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la endif 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/dns/libkea-dns++.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am index ac2962469e..3738801ff6 100644 --- a/src/bin/d2/tests/Makefile.am +++ b/src/bin/d2/tests/Makefile.am @@ -84,7 +84,6 @@ 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/dhcp/libkea-dhcp++.la -d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la if HAVE_MYSQL d2_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -97,6 +96,7 @@ d2_unittests_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la endif 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/cc/libkea-cc.la d2_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la d2_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am index c975976aa4..c5b1ece1b2 100644 --- a/src/bin/dhcp4/Makefile.am +++ b/src/bin/dhcp4/Makefile.am @@ -79,11 +79,6 @@ 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/dhcp/libkea-dhcp++.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/dns/libkea-dns++.la -kea_dhcp4_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.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 @@ -96,6 +91,11 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.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/dns/libkea-dns++.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/threads/libkea-threads.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am index c236143438..9cad3a6986 100644 --- a/src/bin/dhcp4/tests/Makefile.am +++ b/src/bin/dhcp4/tests/Makefile.am @@ -130,7 +130,6 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la if HAVE_MYSQL dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -143,6 +142,7 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la endif dhcp4_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am index e752b93b54..68652f3335 100644 --- a/src/bin/dhcp6/Makefile.am +++ b/src/bin/dhcp6/Makefile.am @@ -79,11 +79,6 @@ 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/dhcp/libkea-dhcp++.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/dns/libkea-dns++.la -kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.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 @@ -96,6 +91,12 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.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/dns/libkea-dns++.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/threads/libkea-threads.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am index e6af5b61f6..0686764695 100644 --- a/src/bin/dhcp6/tests/Makefile.am +++ b/src/bin/dhcp6/tests/Makefile.am @@ -130,11 +130,6 @@ 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/dhcp/libkea-dhcp++.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.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 if HAVE_MYSQL dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -147,6 +142,12 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la endif 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/cc/libkea-cc.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/threads/libkea-threads.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am index 463c7be8c2..bc34383568 100644 --- a/src/bin/lfc/Makefile.am +++ b/src/bin/lfc/Makefile.am @@ -60,7 +60,6 @@ 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/dhcp/libkea-dhcp++.la -kea_lfc_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la if HAVE_MYSQL kea_lfc_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -73,6 +72,8 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.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/dns/libkea-dns++.la kea_lfc_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la diff --git a/src/bin/lfc/tests/Makefile.am b/src/bin/lfc/tests/Makefile.am index 59b7465b6f..6ab0269e80 100644 --- a/src/bin/lfc/tests/Makefile.am +++ b/src/bin/lfc/tests/Makefile.am @@ -60,7 +60,6 @@ lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.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/dhcp/libkea-dhcp++.la -lfc_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la if HAVE_MYSQL lfc_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -72,8 +71,8 @@ if HAVE_CQL lfc_unittests_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.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/dns/libkea-dns++.la lfc_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index d9a6961a93..b6f42d97bf 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -204,11 +204,6 @@ libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns. 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/dhcp/libkea-dhcp++.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 if HAVE_MYSQL libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -221,6 +216,11 @@ libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/cql/libkea-cql.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/threads/libkea-threads.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am index a37c27bae9..f652a8ee30 100644 --- a/src/lib/dhcpsrv/tests/Makefile.am +++ b/src/lib/dhcpsrv/tests/Makefile.am @@ -163,11 +163,6 @@ libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la if HAVE_MYSQL libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -175,8 +170,16 @@ endif if HAVE_PGSQL libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la endif +if HAVE_CQL +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la +endif libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la +libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la diff --git a/src/lib/dhcpsrv/testutils/Makefile.am b/src/lib/dhcpsrv/testutils/Makefile.am index 8c156a29a8..02f446e2c5 100644 --- a/src/lib/dhcpsrv/testutils/Makefile.am +++ b/src/lib/dhcpsrv/testutils/Makefile.am @@ -46,6 +46,7 @@ libdhcpsrvtest_la_LIBADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la endif if HAVE_CQL libdhcpsrvtest_la_CPPFLAGS += $(CQL_CPPFLAGS) +libdhcpsrvtest_la_LIBADD += $(top_builddir)/src/lib/cql/libkea-cql.la endif libdhcpsrvtest_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am index d65fbb66d6..c5846de440 100644 --- a/src/lib/process/Makefile.am +++ b/src/lib/process/Makefile.am @@ -54,7 +54,6 @@ libkea_process_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la libkea_process_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la libkea_process_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la libkea_process_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la -libkea_process_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la if HAVE_MYSQL libkea_process_la_LIBADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la @@ -67,6 +66,7 @@ libkea_process_la_LIBADD += $(top_builddir)/src/lib/cql/libkea-cql.la endif 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/log/libkea-log.la