From: Mukund Sivaraman Date: Thu, 2 Aug 2012 04:03:03 +0000 (+0530) Subject: [2071] Add b10 prefix to libcc.la X-Git-Tag: trac2351_base~141^2~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f411d8c3690ecd368ea9d66a74635498c123ce2b;p=thirdparty%2Fkea.git [2071] Add b10 prefix to libcc.la --- diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am index 45ac902952..09034b2123 100644 --- 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 a7933bae8a..76d03ba8c4 100644 --- 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 694cd09730..71a4dcd6e2 100644 --- 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 2e2bcadfe8..bc80f3d416 100644 --- 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 aaf3373b6c..4217e18934 100644 --- 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 18ba8ef4ce..e948eec4a0 100644 --- 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 bd15e00203..1fb04b8329 100644 --- 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 acd1efe551..7c2b34a25e 100644 --- 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 55ac21af2b..47aa784ea2 100644 --- 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 a6aa06de8d..ec478de002 100644 --- 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 5304e4b551..1c2b4b83f8 100644 --- 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 8fe275d26e..0348b64ceb 100644 --- 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 0c5c4fee82..4ab315a8d0 100644 --- 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 37d44c5e97..37cfb457e2 100644 --- 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 2f4590750e..b7675799fe 100644 --- 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 2ccf8ffb49..99a4694ff1 100644 --- 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 5a5d89c803..c88e3cb4a2 100644 --- 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 b547819ceb..53665aba0a 100644 --- 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 b80793c40c..47232a4d16 100644 --- 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