[2071] Add b10 prefix to libdns++.la

diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 227a1a325035d740500071083b38bbeae468aa9e..45ac902952db768e47ac61c3d04a860a307446ae 100644 (file)
--- 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 61098b4502e781e67a4084f91f87b7458714dc6c..a7933bae8af705441571444049022f71c1c426a0 100644 (file)
--- 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 93066d6e9f0cd8b15d9d42ee386cd7a40bdd7bff..694cd09730550e89358ad7980a6ca623f4cae6f5 100644 (file)
--- 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 caa62e25b4e3ee7cbedfaf270c3fba42d8728c56..22fba652bc23c9a6bdff5617dae1f5c7b3993897 100644 (file)
--- 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 929d5e21687fa40dfbccf40de092c4f371637adb..18ba8ef4ce218e60c2246e9bdedd93705e77d1e3 100644 (file)
--- 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 5672d954f211eaa2ccae7d37cdb5a16546b3ec2c..bd15e002033eb9a65bd5bd645ad784ae62f51f18 100644 (file)
--- 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 b569fda25782e12430e486189c84bd54ff99f303..acd1efe551b251db1d3155b85dd994b7a3a56e88 100644 (file)
--- 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 68fd1cde87bce948a83b3db694498654f2817af2..55ac21af2bf5d39df8927eaa2c30439f948109f1 100644 (file)
--- 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 a074690b8e6fa07c3b7e569545bd54ef93c88528..a1240790bb8748e4958c7f0684214e2fc35f1c49 100644 (file)
--- 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 a5b7ee235334dcb5f6e40bb440cf2025b5396532..d39d021566b08a1fcb19094cdd4e116c3c86d742 100644 (file)
--- 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 c533a6463d6fccaccbb94aa9b0d296f2939275db..69ff1e8d88414432c0dca3d4acf54e00e08a67d7 100644 (file)
--- 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 666859575edf73dbd919499d391235c257e89791..37d44c5e970c66abe87d5820bed718c38b10b0c1 100644 (file)
--- 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 37b7879ff42d61e85fecf58f48549581329dd892..73e9ebf884c97e3a7e8af1b9fc36b14201ccd1f1 100644 (file)
--- 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 ab677e831070a9692ee3e7cfffc77fce5ceb408c..2f4590750e1038624b65f6c26e6cfc4ccfbf7c61 100644 (file)
--- 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 88f946ac35cb5fd77f70260f9f9baab3c88a8d90..38809e0921630664afb141f909e377a116cb3e32 100644 (file)
--- 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 bfa0bdf0aa356dd2c6dc32c210c1eb844b3617fb..a7e216adff5892a89db8b4b254c3b5f8629c6d72 100644 (file)
--- 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 ad93ee1ce3661af99aa4fe263ef64de215803b28..a385500467315f0d04d19761ca01ef6da12e826d 100644 (file)
--- 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 d6f8cdc0777e5486ea688c87951a67dc4e29a6e4..0abb3896f1ab7c7dac7f026a84e0628db1fe29f1 100644 (file)
--- 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 6d60af98339cb72f33147dc39507eb41601970e8..835460b0e438b7e6c9f05765e6f478e880385140 100644 (file)
--- 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 aa81b4f26023b8bd87e60ff20f4df06d31f389e0..d2f046cc62695bfcdefb9fffc23b15687e81344a 100644 (file)
--- 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 8b51ef7039918ed9bce9a6840e989c821f277182..aa88f42f080be7e3a2dc02d5bab03239cfdef897 100644 (file)
--- 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 f03a2426c21e122879df3a7e992c7c5e2bcb0d66..b547819ceb1f81508e2479123199541df258df55 100644 (file)
--- 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 367635afb587ef53f1d23b648af36def7bacc974..b80793c40cad5a5233144403120877d0c4dcc298 100644 (file)
--- 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 0aec1ffb6e2d2e5b69c98babc51cbf5b50f42bda..5ad8307e3fa606c04e7b8c44d35669c2d34d69e2 100644 (file)
--- 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