[#2702] fixed link order

diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am
index 68c8b31b1b7e207a8c49d04898e4a4fcf74f5e18..efd316de244c720d524ee264062009579c6af653 100644 (file)
--- a/src/lib/asiodns/Makefile.am
+++ b/src/lib/asiodns/Makefile.am
@@ -23,8 +23,8 @@ libkea_asiodns_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_asiodns_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_asiodns_la_LIBADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_asiodns_la_LIBADD += $(BOOST_LIBS)

diff --git a/src/lib/dhcpsrv/testutils/Makefile.am b/src/lib/dhcpsrv/testutils/Makefile.am
index 9e530c2ef141ec39750242b9718eb38d85898df7..8a84acffb890a87b388c281dacbae33b93108807 100644 (file)
--- a/src/lib/dhcpsrv/testutils/Makefile.am
+++ b/src/lib/dhcpsrv/testutils/Makefile.am
@@ -30,7 +30,6 @@ libdhcpsrvtest_la_SOURCES += test_config_backend_dhcp6.cc test_config_backend_dh
 if HAVE_MYSQL
 libdhcpsrvtest_la_SOURCES += mysql_generic_backend_unittest.cc mysql_generic_backend_unittest.h
 endif
-
 if HAVE_PGSQL
 libdhcpsrvtest_la_SOURCES += pgsql_generic_backend_unittest.cc pgsql_generic_backend_unittest.h
 endif
@@ -40,14 +39,14 @@ libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 
 libdhcpsrvtest_la_LIBADD =
 
-if HAVE_MYSQL
-libdhcpsrvtest_la_CPPFLAGS += $(MYSQL_CPPFLAGS)
-libdhcpsrvtest_la_LIBADD  += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-endif
 if HAVE_PGSQL
 libdhcpsrvtest_la_CPPFLAGS += $(PGSQL_CPPFLAGS)
 libdhcpsrvtest_la_LIBADD  += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
 endif
+if HAVE_MYSQL
+libdhcpsrvtest_la_CPPFLAGS += $(MYSQL_CPPFLAGS)
+libdhcpsrvtest_la_LIBADD  += $(top_builddir)/src/lib/mysql/libkea-mysql.la
+endif
 
 libdhcpsrvtest_la_LDFLAGS  = $(AM_LDFLAGS)
 if HAVE_MYSQL

diff --git a/src/lib/util/unittests/Makefile.am b/src/lib/util/unittests/Makefile.am
index fc339a4882706b4f414e6d6c432f6394f7234344..2d6523cb7755dd46e442e39e54c35f666fec2d39 100644 (file)
--- a/src/lib/util/unittests/Makefile.am
+++ b/src/lib/util/unittests/Makefile.am
@@ -23,8 +23,7 @@ libutil_unittests_la_CPPFLAGS += $(GTEST_INCLUDES)
 endif
 
 libutil_unittests_la_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
-libutil_unittests_la_LIBADD  = # $(top_builddir)/src/lib/util/io/libkea-util-io.la
-libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/libkea-util.la
 libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 if HAVE_GTEST
 libutil_unittests_la_LIBADD += $(GTEST_LDADD)