[2071] Add b10 prefix to libcc.la

diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 45ac902952db768e47ac61c3d04a860a307446ae..09034b2123dd14624ebe8a08c0097342bd717ee4 100644 (file)
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -65,7 +65,7 @@ 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
-b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la
+b10_auth_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 b10_auth_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
 b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la

diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am
index a7933bae8af705441571444049022f71c1c426a0..76d03ba8c4817c216f678ee6be0d98269401342c 100644 (file)
--- a/src/bin/auth/benchmarks/Makefile.am
+++ b/src/bin/auth/benchmarks/Makefile.am
@@ -32,7 +32,7 @@ query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 query_bench_LDADD += $(top_builddir)/src/lib/bench/libbench.la
 query_bench_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
 query_bench_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
-query_bench_LDADD += $(top_builddir)/src/lib/cc/libcc.la
+query_bench_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 query_bench_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
 query_bench_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
 query_bench_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la

diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 694cd09730550e89358ad7980a6ca623f4cae6f5..71a4dcd6e2076157ebbd10aed814c722573bc774 100644 (file)
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -71,7 +71,7 @@ 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
 run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
 run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 2e2bcadfe8323ec4201c3d6620c6ecaff103c64a..bc80f3d416d45577c726af4af9d2ee3e82a2a204 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -44,7 +44,7 @@ b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
 b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
 b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libcc.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 
 
 b10_dhcp4dir = $(pkgdatadir)

diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index aaf3373b6c941767056528cf0632015775a2c3a7..4217e189346f78313f7a744a0cf7780cd542138a 100644 (file)
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -66,7 +66,7 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 endif
 
 noinst_PROGRAMS = $(TESTS)

diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index 18ba8ef4ce218e60c2246e9bdedd93705e77d1e3..e948eec4a0a8acc5ac7c5ec47a4c4e3bc05ac8e6 100644 (file)
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -58,7 +58,7 @@ nodist_b10_resolver_SOURCES = resolver_messages.cc resolver_messages.h
 
 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/cc/libb10-cc.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la

diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am
index bd15e002033eb9a65bd5bd645ad784ae62f51f18..1fb04b8329d06b7bd136677ad5643856666a9532 100644 (file)
--- a/src/bin/resolver/tests/Makefile.am
+++ b/src/bin/resolver/tests/Makefile.am
@@ -43,7 +43,7 @@ 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
 run_unittests_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
 run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la

diff --git a/src/lib/acl/Makefile.am b/src/lib/acl/Makefile.am
index acd1efe551b251db1d3155b85dd994b7a3a56e88..7c2b34a25ef2baeab2be3b7ed3e33b45638ce229 100644 (file)
--- a/src/lib/acl/Makefile.am
+++ b/src/lib/acl/Makefile.am
@@ -13,7 +13,7 @@ libacl_la_SOURCES += logic_check.h
 libacl_la_SOURCES += loader.h loader.cc
 
 libacl_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libacl_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
+libacl_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 libacl_la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la
 
 # DNS specialized one

diff --git a/src/lib/acl/tests/Makefile.am b/src/lib/acl/tests/Makefile.am
index 55ac21af2bf5d39df8927eaa2c30439f948109f1..47aa784ea294b56da137816bf4ec2c74195a9d33 100644 (file)
--- a/src/lib/acl/tests/Makefile.am
+++ b/src/lib/acl/tests/Makefile.am
@@ -33,7 +33,7 @@ run_unittests_LDADD = $(GTEST_LDADD)
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.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/cc/libcc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.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

diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am
index a6aa06de8d083df6b31012b9c48582b28c049560..ec478de0020f25d79dac932e3b620cdccb653d7d 100644 (file)
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@ -20,11 +20,11 @@ if USE_CLANGPP
 AM_CXXFLAGS += -Wno-error
 endif
 
-lib_LTLIBRARIES = libcc.la
-libcc_la_SOURCES = data.cc data.h session.cc session.h
-libcc_la_SOURCES += logger.cc logger.h
-nodist_libcc_la_SOURCES = cc_messages.cc cc_messages.h
-libcc_la_LIBADD = $(top_builddir)/src/lib/log/libb10-log.la
+lib_LTLIBRARIES = libb10-cc.la
+libb10_cc_la_SOURCES = data.cc data.h session.cc session.h
+libb10_cc_la_SOURCES += logger.cc logger.h
+nodist_libb10_cc_la_SOURCES = cc_messages.cc cc_messages.h
+libb10_cc_la_LIBADD = $(top_builddir)/src/lib/log/libb10-log.la
 
 CLEANFILES = *.gcno *.gcda session_config.h cc_messages.cc cc_messages.h
 

diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am
index 5304e4b551048261a15e9d3a9b40cd85b6b85f7c..1c2b4b83f8a7cd304cbdd88caf63a46365b8e740 100644 (file)
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@ -30,7 +30,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 # We need to put our libs first, in case gtest (or any dependency, really)
 # is installed in the same location as a different version of bind10
 # Otherwise the linker may not use the source tree libs
-run_unittests_LDADD =  $(top_builddir)/src/lib/cc/libcc.la
+run_unittests_LDADD =  $(top_builddir)/src/lib/cc/libb10-cc.la
 run_unittests_LDADD +=  $(top_builddir)/src/lib/log/libb10-log.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/config/Makefile.am b/src/lib/config/Makefile.am
index 8fe275d26eb59b3a8b29d132ea51fa63b33faf45..0348b64ceb5a9971406dab9cb6907c351e0a08ed 100644 (file)
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -17,7 +17,7 @@ libcfgclient_la_SOURCES += module_spec.h module_spec.cc
 libcfgclient_la_SOURCES += ccsession.cc ccsession.h
 libcfgclient_la_SOURCES += config_log.h config_log.cc
 
-libcfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libcc.la
+libcfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libb10-cc.la
 libcfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 
 libcfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1

diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index 0c5c4fee82aecd181578ede6b4a539016a344715..4ab315a8d01ef1934e39d39b152525b41ad5df84 100644 (file)
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -26,7 +26,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD =  $(GTEST_LDADD)
 run_unittests_LDADD += libfake_session.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la

diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index 37d44c5e970c66abe87d5820bed718c38b10b0c1..37cfb457e22841d6693766a2ab6a4fda2f68a082 100644 (file)
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -63,7 +63,7 @@ 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/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 += $(top_builddir)/src/lib/cc/libb10-cc.la
 libdatasrc_la_LIBADD += memory/libdatasrc_memory.la # convenience library
 libdatasrc_la_LIBADD += $(SQLITE_LIBS)
 

diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index 2f4590750e1038624b65f6c26e6cfc4ccfbf7c61..b7675799fe638dc5c8a553c1b126807321dfd570 100644 (file)
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -39,7 +39,7 @@ 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
-common_ldadd += $(top_builddir)/src/lib/cc/libcc.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/util/unittests/libutil_unittests.la
 common_ldadd += $(GTEST_LDADD) $(SQLITE_LIBS)

diff --git a/src/lib/python/isc/datasrc/Makefile.am b/src/lib/python/isc/datasrc/Makefile.am
index 2ccf8ffb49a645e1036fb8ac8d29727743d00bfa..99a4694ff1870efd858e943150cbb2334301f69a 100644 (file)
--- a/src/lib/python/isc/datasrc/Makefile.am
+++ b/src/lib/python/isc/datasrc/Makefile.am
@@ -26,7 +26,7 @@ datasrc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
 datasrc_la_LDFLAGS = $(PYTHON_LDFLAGS)
 datasrc_la_LDFLAGS += -module -avoid-version
 datasrc_la_LIBADD = $(top_builddir)/src/lib/datasrc/libdatasrc.la
-datasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
+datasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 datasrc_la_LIBADD += $(top_builddir)/src/lib/dns/python/libpydnspp.la
 datasrc_la_LIBADD += $(PYTHON_LIB)
 

diff --git a/src/lib/python/isc/log/Makefile.am b/src/lib/python/isc/log/Makefile.am
index 5a5d89c803c2f7a3ae87129d21dbd26ac7272b9c..c88e3cb4a2d7e9a1281881ab227cc677d052d5d3 100644 (file)
--- a/src/lib/python/isc/log/Makefile.am
+++ b/src/lib/python/isc/log/Makefile.am
@@ -15,7 +15,7 @@ log_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
 log_la_LDFLAGS = $(PYTHON_LDFLAGS)
 log_la_LDFLAGS += -module -avoid-version
 log_la_LIBADD = $(top_builddir)/src/lib/log/libb10-log.la
-log_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
+log_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 log_la_LIBADD += $(top_builddir)/src/lib/config/libcfgclient.la
 log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 log_la_LIBADD += $(PYTHON_LIB)

diff --git a/src/lib/server_common/Makefile.am b/src/lib/server_common/Makefile.am
index b547819ceb1f81508e2479123199541df258df55..53665aba0ace3f63df9529c703357a8d5d5a4ccb 100644 (file)
--- a/src/lib/server_common/Makefile.am
+++ b/src/lib/server_common/Makefile.am
@@ -26,7 +26,7 @@ nodist_libserver_common_la_SOURCES = server_common_messages.h
 nodist_libserver_common_la_SOURCES += server_common_messages.cc
 libserver_common_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 libserver_common_la_LIBADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
+libserver_common_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.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

diff --git a/src/lib/server_common/tests/Makefile.am b/src/lib/server_common/tests/Makefile.am
index b80793c40cad5a5233144403120877d0c4dcc298..47232a4d164a97fee51f8858b62435e477e476e8 100644 (file)
--- a/src/lib/server_common/tests/Makefile.am
+++ b/src/lib/server_common/tests/Makefile.am
@@ -41,7 +41,7 @@ run_unittests_LDADD = $(GTEST_LDADD)
 run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.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/cc/libcc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 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