From: Mukund Sivaraman Date: Thu, 2 Aug 2012 04:17:43 +0000 (+0530) Subject: [2071] Add b10 prefix to libtestutils.la X-Git-Tag: trac2351_base~141^2~13 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd33333c8cebc1f669896c114c1fa00ef9b219ac;p=thirdparty%2Fkea.git [2071] Add b10 prefix to libtestutils.la --- diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am index 245d252898..c3070af010 100644 --- a/src/bin/auth/tests/Makefile.am +++ b/src/bin/auth/tests/Makefile.am @@ -64,7 +64,7 @@ nodist_run_unittests_SOURCES = ../auth_messages.h ../auth_messages.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) -run_unittests_LDADD = $(top_builddir)/src/lib/testutils/libtestutils.la +run_unittests_LDADD = $(top_builddir)/src/lib/testutils/libb10-testutils.la run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am index e4d428181b..a4bfcba13b 100644 --- a/src/bin/resolver/tests/Makefile.am +++ b/src/bin/resolver/tests/Makefile.am @@ -37,7 +37,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDADD = $(GTEST_LDADD) -run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libtestutils.la +run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libb10-testutils.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am index b7675799fe..8de9bc1fad 100644 --- a/src/lib/datasrc/tests/Makefile.am +++ b/src/lib/datasrc/tests/Makefile.am @@ -40,7 +40,7 @@ common_ldadd += $(top_builddir)/src/lib/util/libb10-util.la common_ldadd += $(top_builddir)/src/lib/log/libb10-log.la common_ldadd += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la common_ldadd += $(top_builddir)/src/lib/cc/libb10-cc.la -common_ldadd += $(top_builddir)/src/lib/testutils/libtestutils.la +common_ldadd += $(top_builddir)/src/lib/testutils/libb10-testutils.la common_ldadd += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la common_ldadd += $(GTEST_LDADD) $(SQLITE_LIBS) diff --git a/src/lib/testutils/Makefile.am b/src/lib/testutils/Makefile.am index d4b07ad023..2281b6d700 100644 --- a/src/lib/testutils/Makefile.am +++ b/src/lib/testutils/Makefile.am @@ -5,13 +5,13 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CXXFLAGS=$(B10_CXXFLAGS) if HAVE_GTEST -noinst_LTLIBRARIES = libtestutils.la +noinst_LTLIBRARIES = libb10-testutils.la -libtestutils_la_SOURCES = srv_test.h srv_test.cc -libtestutils_la_SOURCES += dnsmessage_test.h dnsmessage_test.cc -libtestutils_la_SOURCES += mockups.h -libtestutils_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) -libtestutils_la_LIBADD = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la +libb10_testutils_la_SOURCES = srv_test.h srv_test.cc +libb10_testutils_la_SOURCES += dnsmessage_test.h dnsmessage_test.cc +libb10_testutils_la_SOURCES += mockups.h +libb10_testutils_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) +libb10_testutils_la_LIBADD = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la endif EXTRA_DIST = portconfig.h socket_request.h