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
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
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)
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