diff options
| author | Razvan Becheriu <razvan@isc.org> | 2023-02-10 10:48:07 +0100 |
|---|---|---|
| committer | Razvan Becheriu <razvan@isc.org> | 2023-02-10 10:48:35 +0100 |
| commit | d9c4174dff6dd3ff7ed2c3f7d0526d4571ec13a6 (patch) | |
| tree | 94a5dda27a9414409c6edb204f9fbbff19dc389e | |
| parent | [#2702] addressed review comments (diff) | |
| download | kea-d9c4174dff6dd3ff7ed2c3f7d0526d4571ec13a6.tar.xz kea-d9c4174dff6dd3ff7ed2c3f7d0526d4571ec13a6.zip | |
[#2702] fixed link order
| -rw-r--r-- | src/lib/asiodns/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/testutils/Makefile.am | 9 | ||||
| -rw-r--r-- | src/lib/util/unittests/Makefile.am | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am index 68c8b31b1b..efd316de24 100644 --- 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 9e530c2ef1..8a84acffb8 100644 --- 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 fc339a4882..2d6523cb77 100644 --- 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) |