From: Mukund Sivaraman Date: Thu, 2 Aug 2012 04:01:41 +0000 (+0530) Subject: [2071] Add b10 prefix to libdns++.la X-Git-Tag: trac2351_base~141^2~24 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b240f1cb3365191263cfef6d656d345dfeaa8f9;p=thirdparty%2Fkea.git [2071] Add b10 prefix to libdns++.la --- diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am index 227a1a3250..45ac902952 100644 --- a/src/bin/auth/Makefile.am +++ b/src/bin/auth/Makefile.am @@ -61,7 +61,7 @@ nodist_b10_auth_SOURCES = auth_messages.h auth_messages.cc EXTRA_DIST += auth_messages.mes b10_auth_LDADD = $(top_builddir)/src/lib/datasrc/libdatasrc.la -b10_auth_LDADD += $(top_builddir)/src/lib/dns/libdns++.la +b10_auth_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la b10_auth_LDADD += $(top_builddir)/src/lib/util/libb10-util.la b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am index 61098b4502..a7933bae8a 100644 --- a/src/bin/auth/benchmarks/Makefile.am +++ b/src/bin/auth/benchmarks/Makefile.am @@ -26,7 +26,7 @@ query_bench_SOURCES += ${top_srcdir}/src/lib/datasrc/memory_datasrc.cc nodist_query_bench_SOURCES = ../auth_messages.h ../auth_messages.cc -query_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la +query_bench_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la query_bench_LDADD += $(top_builddir)/src/lib/util/libb10-util.la query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la query_bench_LDADD += $(top_builddir)/src/lib/bench/libbench.la diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am index 93066d6e9f..694cd09730 100644 --- a/src/bin/auth/tests/Makefile.am +++ b/src/bin/auth/tests/Makefile.am @@ -66,7 +66,7 @@ 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/datasrc/libdatasrc.la -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.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_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am index caa62e25b4..22fba652bc 100644 --- a/src/bin/host/Makefile.am +++ b/src/bin/host/Makefile.am @@ -12,7 +12,7 @@ CLEANFILES = *.gcno *.gcda bin_PROGRAMS = b10-host b10_host_SOURCES = host.cc -b10_host_LDADD = $(top_builddir)/src/lib/dns/libdns++.la +b10_host_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la b10_host_LDADD += $(top_builddir)/src/lib/util/libb10-util.la b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am index 929d5e2168..18ba8ef4ce 100644 --- a/src/bin/resolver/Makefile.am +++ b/src/bin/resolver/Makefile.am @@ -56,7 +56,7 @@ b10_resolver_SOURCES += common.cc common.h nodist_b10_resolver_SOURCES = resolver_messages.cc resolver_messages.h -b10_resolver_LDADD = $(top_builddir)/src/lib/dns/libdns++.la +b10_resolver_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la b10_resolver_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la b10_resolver_LDADD += $(top_builddir)/src/lib/cc/libcc.la b10_resolver_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 5672d954f2..bd15e00203 100644 --- a/src/bin/resolver/tests/Makefile.am +++ b/src/bin/resolver/tests/Makefile.am @@ -38,7 +38,7 @@ 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/dns/libdns++.la +run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la diff --git a/src/lib/acl/Makefile.am b/src/lib/acl/Makefile.am index b569fda257..acd1efe551 100644 --- a/src/lib/acl/Makefile.am +++ b/src/lib/acl/Makefile.am @@ -22,6 +22,6 @@ lib_LTLIBRARIES += libdnsacl.la libdnsacl_la_SOURCES = dns.h dns.cc dnsname_check.h libdnsacl_la_LIBADD = libacl.la -libdnsacl_la_LIBADD += $(top_builddir)/src/lib/dns/libdns++.la +libdnsacl_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la CLEANFILES = *.gcno *.gcda diff --git a/src/lib/acl/tests/Makefile.am b/src/lib/acl/tests/Makefile.am index 68fd1cde87..55ac21af2b 100644 --- a/src/lib/acl/tests/Makefile.am +++ b/src/lib/acl/tests/Makefile.am @@ -34,7 +34,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests. run_unittests_LDADD += $(top_builddir)/src/lib/acl/libacl.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la +run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am index a074690b8e..a1240790bb 100644 --- a/src/lib/asiodns/tests/Makefile.am +++ b/src/lib/asiodns/tests/Makefile.am @@ -28,7 +28,7 @@ run_unittests_SOURCES += io_fetch_unittest.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDADD = $(GTEST_LDADD) -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la +run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la diff --git a/src/lib/bench/tests/Makefile.am b/src/lib/bench/tests/Makefile.am index a5b7ee2353..d39d021566 100644 --- a/src/lib/bench/tests/Makefile.am +++ b/src/lib/bench/tests/Makefile.am @@ -18,7 +18,7 @@ run_unittests_SOURCES += loadquery_unittest.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDADD = $(top_builddir)/src/lib/bench/libbench.la -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.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_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la diff --git a/src/lib/cache/tests/Makefile.am b/src/lib/cache/tests/Makefile.am index c533a6463d..69ff1e8d88 100644 --- a/src/lib/cache/tests/Makefile.am +++ b/src/lib/cache/tests/Makefile.am @@ -53,7 +53,7 @@ run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.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_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am index 666859575e..37d44c5e97 100644 --- a/src/lib/datasrc/Makefile.am +++ b/src/lib/datasrc/Makefile.am @@ -61,7 +61,7 @@ static_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la static_ds_la_LIBADD += libdatasrc.la libdatasrc_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la -libdatasrc_la_LIBADD += $(top_builddir)/src/lib/dns/libdns++.la +libdatasrc_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la libdatasrc_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la libdatasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la libdatasrc_la_LIBADD += memory/libdatasrc_memory.la # convenience library diff --git a/src/lib/datasrc/memory/tests/Makefile.am b/src/lib/datasrc/memory/tests/Makefile.am index 37b7879ff4..73e9ebf884 100644 --- a/src/lib/datasrc/memory/tests/Makefile.am +++ b/src/lib/datasrc/memory/tests/Makefile.am @@ -24,7 +24,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDADD = $(builddir)/../libdatasrc_memory.la -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la +run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(GTEST_LDADD) diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am index ab677e8310..2f4590750e 100644 --- a/src/lib/datasrc/tests/Makefile.am +++ b/src/lib/datasrc/tests/Makefile.am @@ -35,7 +35,7 @@ common_sources += $(top_srcdir)/src/lib/dns/tests/unittest_util.h common_sources += $(top_srcdir)/src/lib/dns/tests/unittest_util.cc common_ldadd = $(top_builddir)/src/lib/datasrc/libdatasrc.la -common_ldadd += $(top_builddir)/src/lib/dns/libdns++.la +common_ldadd += $(top_builddir)/src/lib/dns/libb10-dns++.la 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 diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am index 88f946ac35..38809e0921 100644 --- a/src/lib/dns/Makefile.am +++ b/src/lib/dns/Makefile.am @@ -86,53 +86,53 @@ EXTRA_DIST += rdata/in_1/srv_33.h BUILT_SOURCES = rrclass.h rrtype.h rrparamregistry.cc BUILT_SOURCES += rdataclass.h rdataclass.cc -lib_LTLIBRARIES = libdns++.la +lib_LTLIBRARIES = libb10-dns++.la -libdns___la_LDFLAGS = -no-undefined -version-info 2:0:0 +libb10_dns___la_LDFLAGS = -no-undefined -version-info 2:0:0 -libdns___la_SOURCES = -libdns___la_SOURCES += edns.h edns.cc -libdns___la_SOURCES += exceptions.h exceptions.cc -libdns___la_SOURCES += labelsequence.h labelsequence.cc -libdns___la_SOURCES += masterload.h masterload.cc -libdns___la_SOURCES += message.h message.cc -libdns___la_SOURCES += messagerenderer.h messagerenderer.cc -libdns___la_SOURCES += name.h name.cc -libdns___la_SOURCES += name_internal.h -libdns___la_SOURCES += nsec3hash.h nsec3hash.cc -libdns___la_SOURCES += opcode.h opcode.cc -libdns___la_SOURCES += rcode.h rcode.cc -libdns___la_SOURCES += rdata.h rdata.cc -libdns___la_SOURCES += rdatafields.h rdatafields.cc -libdns___la_SOURCES += rrclass.cc -libdns___la_SOURCES += rrparamregistry.h -libdns___la_SOURCES += rrset.h rrset.cc -libdns___la_SOURCES += rrsetlist.h rrsetlist.cc -libdns___la_SOURCES += rrttl.h rrttl.cc -libdns___la_SOURCES += rrtype.cc -libdns___la_SOURCES += question.h question.cc -libdns___la_SOURCES += serial.h serial.cc -libdns___la_SOURCES += tsig.h tsig.cc -libdns___la_SOURCES += tsigerror.h tsigerror.cc -libdns___la_SOURCES += tsigkey.h tsigkey.cc -libdns___la_SOURCES += tsigrecord.h tsigrecord.cc -libdns___la_SOURCES += character_string.h character_string.cc -libdns___la_SOURCES += rdata/generic/detail/nsec_bitmap.h -libdns___la_SOURCES += rdata/generic/detail/nsec_bitmap.cc -libdns___la_SOURCES += rdata/generic/detail/nsec3param_common.cc -libdns___la_SOURCES += rdata/generic/detail/nsec3param_common.h -libdns___la_SOURCES += rdata/generic/detail/txt_like.h -libdns___la_SOURCES += rdata/generic/detail/ds_like.h +libb10_dns___la_SOURCES = +libb10_dns___la_SOURCES += edns.h edns.cc +libb10_dns___la_SOURCES += exceptions.h exceptions.cc +libb10_dns___la_SOURCES += labelsequence.h labelsequence.cc +libb10_dns___la_SOURCES += masterload.h masterload.cc +libb10_dns___la_SOURCES += message.h message.cc +libb10_dns___la_SOURCES += messagerenderer.h messagerenderer.cc +libb10_dns___la_SOURCES += name.h name.cc +libb10_dns___la_SOURCES += name_internal.h +libb10_dns___la_SOURCES += nsec3hash.h nsec3hash.cc +libb10_dns___la_SOURCES += opcode.h opcode.cc +libb10_dns___la_SOURCES += rcode.h rcode.cc +libb10_dns___la_SOURCES += rdata.h rdata.cc +libb10_dns___la_SOURCES += rdatafields.h rdatafields.cc +libb10_dns___la_SOURCES += rrclass.cc +libb10_dns___la_SOURCES += rrparamregistry.h +libb10_dns___la_SOURCES += rrset.h rrset.cc +libb10_dns___la_SOURCES += rrsetlist.h rrsetlist.cc +libb10_dns___la_SOURCES += rrttl.h rrttl.cc +libb10_dns___la_SOURCES += rrtype.cc +libb10_dns___la_SOURCES += question.h question.cc +libb10_dns___la_SOURCES += serial.h serial.cc +libb10_dns___la_SOURCES += tsig.h tsig.cc +libb10_dns___la_SOURCES += tsigerror.h tsigerror.cc +libb10_dns___la_SOURCES += tsigkey.h tsigkey.cc +libb10_dns___la_SOURCES += tsigrecord.h tsigrecord.cc +libb10_dns___la_SOURCES += character_string.h character_string.cc +libb10_dns___la_SOURCES += rdata/generic/detail/nsec_bitmap.h +libb10_dns___la_SOURCES += rdata/generic/detail/nsec_bitmap.cc +libb10_dns___la_SOURCES += rdata/generic/detail/nsec3param_common.cc +libb10_dns___la_SOURCES += rdata/generic/detail/nsec3param_common.h +libb10_dns___la_SOURCES += rdata/generic/detail/txt_like.h +libb10_dns___la_SOURCES += rdata/generic/detail/ds_like.h -libdns___la_CPPFLAGS = $(AM_CPPFLAGS) +libb10_dns___la_CPPFLAGS = $(AM_CPPFLAGS) # Most applications of libdns++ will only implicitly rely on libcryptolink, # so we add the dependency here so that the applications don't have to link # libcryptolink explicitly. -libdns___la_LIBADD = $(top_builddir)/src/lib/cryptolink/libb10-cryptolink.la -libdns___la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la +libb10_dns___la_LIBADD = $(top_builddir)/src/lib/cryptolink/libb10-cryptolink.la +libb10_dns___la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la nodist_libdns___include_HEADERS = rdataclass.h rrclass.h rrtype.h -nodist_libdns___la_SOURCES = rdataclass.cc rrparamregistry.cc +nodist_libb10_dns___la_SOURCES = rdataclass.cc rrparamregistry.cc rrclass.h: rrclass-placeholder.h rrtype.h: rrtype-placeholder.h diff --git a/src/lib/dns/benchmarks/Makefile.am b/src/lib/dns/benchmarks/Makefile.am index bfa0bdf0aa..a7e216adff 100644 --- a/src/lib/dns/benchmarks/Makefile.am +++ b/src/lib/dns/benchmarks/Makefile.am @@ -13,12 +13,12 @@ noinst_PROGRAMS = rdatarender_bench message_renderer_bench rdatarender_bench_SOURCES = rdatarender_bench.cc -rdatarender_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la +rdatarender_bench_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la rdatarender_bench_LDADD += $(top_builddir)/src/lib/util/libb10-util.la rdatarender_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la message_renderer_bench_SOURCES = message_renderer_bench.cc message_renderer_bench_SOURCES += oldmessagerenderer.h oldmessagerenderer.cc -message_renderer_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la +message_renderer_bench_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la message_renderer_bench_LDADD += $(top_builddir)/src/lib/util/libb10-util.la message_renderer_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la diff --git a/src/lib/dns/python/Makefile.am b/src/lib/dns/python/Makefile.am index ad93ee1ce3..a385500467 100644 --- a/src/lib/dns/python/Makefile.am +++ b/src/lib/dns/python/Makefile.am @@ -47,7 +47,7 @@ EXTRA_DIST += nsec3hash_python_inc.cc # Python prefers .so, while some OSes (specifically MacOS) use a different # suffix for dynamic objects. -module is necessary to work this around. pydnspp_la_LDFLAGS += -module -avoid-version -pydnspp_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la +pydnspp_la_LIBADD = $(top_builddir)/src/lib/dns/libb10-dns++.la pydnspp_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la pydnspp_la_LIBADD += libpydnspp.la pydnspp_la_LIBADD += $(PYTHON_LIB) diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am index d6f8cdc077..0abb3896f1 100644 --- a/src/lib/dns/tests/Makefile.am +++ b/src/lib/dns/tests/Makefile.am @@ -74,7 +74,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) # an older version of botan, and somehow that version gets # linked if we don't run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS) -run_unittests_LDADD = $(top_builddir)/src/lib/dns/libdns++.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_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la diff --git a/src/lib/nsas/tests/Makefile.am b/src/lib/nsas/tests/Makefile.am index 6d60af9833..835460b0e4 100644 --- a/src/lib/nsas/tests/Makefile.am +++ b/src/lib/nsas/tests/Makefile.am @@ -52,7 +52,7 @@ run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la +run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am index aa81b4f260..d2f046cc62 100644 --- a/src/lib/resolve/Makefile.am +++ b/src/lib/resolve/Makefile.am @@ -31,7 +31,7 @@ libresolve_la_SOURCES += recursive_query.cc recursive_query.h nodist_libresolve_la_SOURCES = resolve_messages.h resolve_messages.cc -libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la +libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libb10-dns++.la libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la libresolve_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la libresolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libasiodns.la diff --git a/src/lib/resolve/tests/Makefile.am b/src/lib/resolve/tests/Makefile.am index 8b51ef7039..aa88f42f08 100644 --- a/src/lib/resolve/tests/Makefile.am +++ b/src/lib/resolve/tests/Makefile.am @@ -34,7 +34,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.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_LDADD += $(top_builddir)/src/lib/log/libb10-log.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la diff --git a/src/lib/server_common/Makefile.am b/src/lib/server_common/Makefile.am index f03a2426c2..b547819ceb 100644 --- a/src/lib/server_common/Makefile.am +++ b/src/lib/server_common/Makefile.am @@ -30,7 +30,7 @@ libserver_common_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la libserver_common_la_LIBADD += $(top_builddir)/src/lib/config/libcfgclient.la libserver_common_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la libserver_common_la_LIBADD += $(top_builddir)/src/lib/acl/libacl.la -libserver_common_la_LIBADD += $(top_builddir)/src/lib/dns/libdns++.la +libserver_common_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la libserver_common_la_LIBADD += $(top_builddir)/src/lib/util/io/libutil_io.la BUILT_SOURCES = server_common_messages.h server_common_messages.cc server_common_messages.h server_common_messages.cc: server_common_messages.mes diff --git a/src/lib/server_common/tests/Makefile.am b/src/lib/server_common/tests/Makefile.am index 367635afb5..b80793c40c 100644 --- a/src/lib/server_common/tests/Makefile.am +++ b/src/lib/server_common/tests/Makefile.am @@ -46,7 +46,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la run_unittests_LDADD += $(top_builddir)/src/lib/acl/libacl.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la -run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la +run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la diff --git a/tests/tools/badpacket/Makefile.am b/tests/tools/badpacket/Makefile.am index 0aec1ffb6e..5ad8307e3f 100644 --- a/tests/tools/badpacket/Makefile.am +++ b/tests/tools/badpacket/Makefile.am @@ -26,7 +26,7 @@ badpacket_CXXFLAGS += -Wno-error endif badpacket_LDADD = $(top_builddir)/src/lib/asiodns/libasiodns.la -badpacket_LDADD += $(top_builddir)/src/lib/dns/libdns++.la +badpacket_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la badpacket_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la badpacket_LDADD += $(top_builddir)/src/lib/log/libb10-log.la badpacket_LDADD += $(top_builddir)/src/lib/util/libb10-util.la