BIND 10 master, updated. b76e8206e2589ddda552c8162be4beca5b390059 [2071] Add ChangeLog entry
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Aug 3 05:22:56 UTC 2012
The branch, master has been updated
via b76e8206e2589ddda552c8162be4beca5b390059 (commit)
via ac20a00c28069804edc0a36050995df52f601efb (commit)
via 684119502bb3e40d12a3502c9f95aa71ee65a153 (commit)
via ce3f97e6b640b93ed2d8303de7671ef10035be27 (commit)
via 81fac6a441b1c0230638a070d80fa1005a69d5d4 (commit)
via f706565ec0b41e3a1e45dd4fae9a56c93e360b7c (commit)
via 4af209e3f7406a0cde6976eae7a536057e227c0e (commit)
via a69852a56397fe0b1a19c6f51dbfc42450b3d48e (commit)
via 9528b55d5ae89ff06cb9c0266983d8bc7d5a4042 (commit)
via 596f071e741b3d8bfa29b0c687b6cd9073674d79 (commit)
via bb894ca2c8641e488b91c7643acf667a5098851a (commit)
via cd33333c8cebc1f669896c114c1fa00ef9b219ac (commit)
via 4d130eec2aa0743e1272c333e17bd98981e27829 (commit)
via 32610445f0d708de1ad35ff81669efae2165cf3c (commit)
via 16fa1ecec88a29e4cf8e974950a90ea400dd300b (commit)
via d50a3d3d72e8ce493c3f9d79ec2f762efa341bf5 (commit)
via 9dc49932143fa6f2d30ee60ff8ca653c5b3fd3f0 (commit)
via 8759015ce4de6414b808addd279adeed15ce096f (commit)
via c2d1823d7ebac25950e0c81327adb438a7d4c15a (commit)
via 76232f728e2555bfa44edd558fe34911636e3e06 (commit)
via 04ab3886ab2b07180945c51f71eb64fec321c58c (commit)
via f411d8c3690ecd368ea9d66a74635498c123ce2b (commit)
via 7b240f1cb3365191263cfef6d656d345dfeaa8f9 (commit)
via b5974eeb4d42e4deee3f000d6913f6392943ac64 (commit)
via 7b2491ee2c7df7b810e347a74c48d85f251d742f (commit)
via edb116c7a102f9276b5b759726d1cdd5b77e74cb (commit)
via a9cbbc2187dc1c7ff9e291e02d751f048d944377 (commit)
from 6715af1c22e0946681ab12658d6ae3dd6d1f702a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b76e8206e2589ddda552c8162be4beca5b390059
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri Aug 3 10:33:05 2012 +0530
[2071] Add ChangeLog entry
commit ac20a00c28069804edc0a36050995df52f601efb
Merge: 6841195 6715af1
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri Aug 3 10:30:32 2012 +0530
Merge branch 'master' into trac2071_2
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 ++
dns++.pc.in | 2 +-
src/bin/auth/Makefile.am | 26 +++++-----
src/bin/auth/benchmarks/Makefile.am | 28 +++++------
src/bin/auth/tests/Makefile.am | 28 +++++------
src/bin/dhcp4/Makefile.am | 12 ++---
src/bin/dhcp4/tests/Makefile.am | 14 +++---
src/bin/dhcp6/Makefile.am | 8 +--
src/bin/dhcp6/tests/Makefile.am | 8 +--
src/bin/host/Makefile.am | 6 +--
src/bin/resolver/Makefile.am | 28 +++++------
src/bin/resolver/tests/Makefile.am | 32 ++++++------
src/bin/sockcreator/Makefile.am | 4 +-
src/bin/sockcreator/tests/Makefile.am | 2 +-
src/lib/acl/Makefile.am | 26 +++++-----
src/lib/acl/tests/Makefile.am | 14 +++---
src/lib/asiodns/Makefile.am | 34 ++++++-------
src/lib/asiodns/tests/Makefile.am | 12 ++---
src/lib/asiolink/Makefile.am | 46 +++++++++---------
src/lib/asiolink/tests/Makefile.am | 6 +--
src/lib/bench/Makefile.am | 4 +-
src/lib/bench/example/Makefile.am | 2 +-
src/lib/bench/tests/Makefile.am | 8 +--
src/lib/cache/Makefile.am | 24 ++++-----
src/lib/cache/tests/Makefile.am | 14 +++---
src/lib/cc/Makefile.am | 10 ++--
src/lib/cc/tests/Makefile.am | 6 +--
src/lib/config/Makefile.am | 18 +++----
src/lib/config/tests/Makefile.am | 8 +--
src/lib/cryptolink/Makefile.am | 10 ++--
src/lib/cryptolink/tests/Makefile.am | 6 +--
src/lib/datasrc/Makefile.am | 62 ++++++++++++------------
src/lib/datasrc/memory/tests/Makefile.am | 4 +-
src/lib/datasrc/tests/Makefile.am | 14 +++---
src/lib/dhcp/Makefile.am | 42 ++++++++--------
src/lib/dhcp/tests/Makefile.am | 8 +--
src/lib/dns/Makefile.am | 78 +++++++++++++++---------------
src/lib/dns/benchmarks/Makefile.am | 12 ++---
src/lib/dns/python/Makefile.am | 56 ++++++++++-----------
src/lib/dns/tests/Makefile.am | 6 +--
src/lib/exceptions/Makefile.am | 8 +--
src/lib/exceptions/tests/Makefile.am | 2 +-
src/lib/log/Makefile.am | 62 ++++++++++++------------
src/lib/log/compiler/Makefile.am | 6 +--
src/lib/log/tests/Makefile.am | 24 ++++-----
src/lib/nsas/Makefile.am | 38 +++++++--------
src/lib/nsas/tests/Makefile.am | 12 ++---
src/lib/python/isc/acl/Makefile.am | 4 +-
src/lib/python/isc/datasrc/Makefile.am | 6 +--
src/lib/python/isc/log/Makefile.am | 8 +--
src/lib/python/isc/util/cio/Makefile.am | 2 +-
src/lib/resolve/Makefile.am | 30 ++++++------
src/lib/resolve/tests/Makefile.am | 18 +++----
src/lib/server_common/Makefile.am | 32 ++++++------
src/lib/server_common/tests/Makefile.am | 22 ++++-----
src/lib/statistics/Makefile.am | 6 +--
src/lib/statistics/tests/Makefile.am | 6 +--
src/lib/testutils/Makefile.am | 12 ++---
src/lib/util/Makefile.am | 44 ++++++++---------
src/lib/util/io/Makefile.am | 12 ++---
src/lib/util/pyunittests/Makefile.am | 2 +-
src/lib/util/tests/Makefile.am | 6 +--
src/lib/util/unittests/Makefile.am | 6 +--
src/lib/xfr/Makefile.am | 6 +--
src/lib/xfr/tests/Makefile.am | 4 +-
tests/tools/badpacket/Makefile.am | 12 ++---
tests/tools/badpacket/tests/Makefile.am | 4 +-
tests/tools/perfdhcp/Makefile.am | 24 ++++-----
tests/tools/perfdhcp/tests/Makefile.am | 8 +--
69 files changed, 582 insertions(+), 577 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index dcbb0cf..68f2ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+457. [build]* muks
+ BIND 10 library names now have a "b10-" prefix. This is to avoid
+ clashes with other similarly named libraries on the system.
+ (Trac #2071, git ac20a00c28069804edc0a36050995df52f601efb)
+
456. [build]* muks
BIND 10 now compiles against log4cplus-1.1.0 (RC releases)
also. Note: some older versions of log4cplus don't work any more;
diff --git a/dns++.pc.in b/dns++.pc.in
index d2a7e06..8d2725c 100644
--- a/dns++.pc.in
+++ b/dns++.pc.in
@@ -8,4 +8,4 @@ Description: BIND 10 DNS library
Version: @PACKAGE_VERSION@
Requires: botan-1.8
Cflags: -I${includedir}/@PACKAGE_NAME@
-Libs: -L${libdir} -ldns++ -lcryptolink -lutil -lexceptions -lm
+Libs: -L${libdir} -lb10-dns++ -lb10-cryptolink -lb10-util -lb10-exceptions -lm
diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 1f0fbbf..47bed15 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -60,19 +60,19 @@ b10_auth_SOURCES += ${top_srcdir}/src/lib/datasrc/memory_datasrc.cc
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/util/libutil.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/exceptions/libexceptions.la
-b10_auth_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
-b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-b10_auth_LDADD += $(top_builddir)/src/lib/log/liblog.la
-b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
-b10_auth_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
-b10_auth_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
+b10_auth_LDADD = $(top_builddir)/src/lib/datasrc/libb10-datasrc.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/libb10-util-io.la
+b10_auth_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.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/libb10-asiodns.la
+b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+b10_auth_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
+b10_auth_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
+b10_auth_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
b10_auth_LDADD += $(SQLITE_LIBS)
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am
index 2de01ff..c09230a 100644
--- a/src/bin/auth/benchmarks/Makefile.am
+++ b/src/bin/auth/benchmarks/Makefile.am
@@ -26,19 +26,19 @@ 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/util/libutil.la
-query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.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/xfr/libxfr.la
-query_bench_LDADD += $(top_builddir)/src/lib/log/liblog.la
-query_bench_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
-query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-query_bench_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
-query_bench_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
-query_bench_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.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/libb10-bench.la
+query_bench_LDADD += $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
+query_bench_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
+query_bench_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+query_bench_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
+query_bench_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+query_bench_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
+query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+query_bench_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
+query_bench_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
+query_bench_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
query_bench_LDADD += $(SQLITE_LIBS)
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 602c1d6..f87ed4c 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -64,21 +64,21 @@ nodist_run_unittests_SOURCES = ../auth_messages.h ../auth_messages.cc
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/util/libutil.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/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
-run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
+run_unittests_LDADD = $(top_builddir)/src/lib/testutils/libb10-testutils.la
+run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libb10-datasrc.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/libb10-asiodns.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.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/libb10-xfr.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
+run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
+run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/tests/libfake_session.la
run_unittests_LDADD += $(GTEST_LDADD)
run_unittests_LDADD += $(SQLITE_LIBS)
diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index d343633..dcf9ca0 100644
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -39,12 +39,12 @@ if USE_CLANGPP
b10_dhcp4_CXXFLAGS = -Wno-unused-parameter
endif
-b10_dhcp4_LDADD = $(top_builddir)/src/lib/dhcp/libdhcp++.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/liblog.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/dhcp/libb10-dhcp++.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.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 f56b6f6..402af60 100644
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -60,13 +60,13 @@ endif
dhcp4_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
dhcp4_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
dhcp4_unittests_LDADD = $(GTEST_LDADD)
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.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/asiolink/libb10-asiolink.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+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/libb10-asiolink.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 16b17ed..e68ce2e 100644
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -40,10 +40,10 @@ if USE_CLANGPP
b10_dhcp6_CXXFLAGS = -Wno-unused-parameter
endif
-b10_dhcp6_LDADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/liblog.la
-b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
+b10_dhcp6_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
b10_dhcp6dir = $(pkgdatadir)
b10_dhcp6_DATA = dhcp6.spec
diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index ac20d56..9b67804 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -55,10 +55,10 @@ endif
dhcp6_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
dhcp6_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
dhcp6_unittests_LDADD = $(GTEST_LDADD)
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif
diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am
index a8f96c2..22fba65 100644
--- a/src/bin/host/Makefile.am
+++ b/src/bin/host/Makefile.am
@@ -12,9 +12,9 @@ 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/util/libutil.la
-b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.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
man_MANS = b10-host.1
EXTRA_DIST = $(man_MANS) b10-host.xml
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index 2bb3768..83bf8b3 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -56,20 +56,20 @@ 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/config/libcfgclient.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/cc/libcc.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/util/libutil.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/log/liblog.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libcache.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la
+b10_resolver_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.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/libb10-dnsacl.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libb10-cache.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libb10-resolve.la
b10_resolver_LDFLAGS = -pthread
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am
index 153dcd5..52b39a1 100644
--- a/src/bin/resolver/tests/Makefile.am
+++ b/src/bin/resolver/tests/Makefile.am
@@ -37,22 +37,22 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
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/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/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
-run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la
-run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
-run_unittests_LDADD += $(top_builddir)/src/lib/acl/libacl.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.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
+run_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
+run_unittests_LDADD += $(top_builddir)/src/lib/acl/libb10-dnsacl.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/libb10-xfr.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
+run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libb10-resolve.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cache/libb10-cache.la
+run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
+run_unittests_LDADD += $(top_builddir)/src/lib/acl/libb10-acl.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
# Note the ordering matters: -Wno-... must follow -Wextra (defined in
diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am
index 8494114..42b8c34 100644
--- a/src/bin/sockcreator/Makefile.am
+++ b/src/bin/sockcreator/Makefile.am
@@ -15,5 +15,5 @@ CLEANFILES = *.gcno *.gcda
pkglibexec_PROGRAMS = b10-sockcreator
b10_sockcreator_SOURCES = sockcreator.cc sockcreator.h main.cc
-b10_sockcreator_LDADD = $(top_builddir)/src/lib/util/io/libutil_io.la
-b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+b10_sockcreator_LDADD = $(top_builddir)/src/lib/util/io/libb10-util-io.la
+b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
diff --git a/src/bin/sockcreator/tests/Makefile.am b/src/bin/sockcreator/tests/Makefile.am
index 054c437..f543652 100644
--- a/src/bin/sockcreator/tests/Makefile.am
+++ b/src/bin/sockcreator/tests/Makefile.am
@@ -22,7 +22,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/acl/Makefile.am b/src/lib/acl/Makefile.am
index 92b7869..001ca59 100644
--- a/src/lib/acl/Makefile.am
+++ b/src/lib/acl/Makefile.am
@@ -5,23 +5,23 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS)
# The core library
-lib_LTLIBRARIES = libacl.la
-libacl_la_SOURCES = acl.h
-libacl_la_SOURCES += check.h
-libacl_la_SOURCES += ip_check.h ip_check.cc
-libacl_la_SOURCES += logic_check.h
-libacl_la_SOURCES += loader.h loader.cc
+lib_LTLIBRARIES = libb10-acl.la
+libb10_acl_la_SOURCES = acl.h
+libb10_acl_la_SOURCES += check.h
+libb10_acl_la_SOURCES += ip_check.h ip_check.cc
+libb10_acl_la_SOURCES += logic_check.h
+libb10_acl_la_SOURCES += loader.h loader.cc
-libacl_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-libacl_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
-libacl_la_LIBADD += $(top_builddir)/src/lib/util/libutil.la
+libb10_acl_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libb10_acl_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+libb10_acl_la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la
# DNS specialized one
-lib_LTLIBRARIES += libdnsacl.la
+lib_LTLIBRARIES += libb10-dnsacl.la
-libdnsacl_la_SOURCES = dns.h dns.cc dnsname_check.h
+libb10_dnsacl_la_SOURCES = dns.h dns.cc dnsname_check.h
-libdnsacl_la_LIBADD = libacl.la
-libdnsacl_la_LIBADD += $(top_builddir)/src/lib/dns/libdns++.la
+libb10_dnsacl_la_LIBADD = libb10-acl.la
+libb10_dnsacl_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 9183bfe..d103047 100644
--- a/src/lib/acl/tests/Makefile.am
+++ b/src/lib/acl/tests/Makefile.am
@@ -31,13 +31,13 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
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/libutil.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/log/liblog.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
+run_unittests_LDADD += $(top_builddir)/src/lib/acl/libb10-acl.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.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
+run_unittests_LDADD += $(top_builddir)/src/lib/acl/libb10-dnsacl.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am
index a03f147..321de8b 100644
--- a/src/lib/asiodns/Makefile.am
+++ b/src/lib/asiodns/Makefile.am
@@ -16,28 +16,28 @@ asiodns_messages.h asiodns_messages.cc: asiodns_messages.mes
BUILT_SOURCES = asiodns_messages.h asiodns_messages.cc
-lib_LTLIBRARIES = libasiodns.la
-libasiodns_la_SOURCES = dns_answer.h
-libasiodns_la_SOURCES += asiodns.h
-libasiodns_la_SOURCES += dns_lookup.h
-libasiodns_la_SOURCES += dns_server.h
-libasiodns_la_SOURCES += dns_service.cc dns_service.h
-libasiodns_la_SOURCES += tcp_server.cc tcp_server.h
-libasiodns_la_SOURCES += udp_server.cc udp_server.h
-libasiodns_la_SOURCES += sync_udp_server.cc sync_udp_server.h
-libasiodns_la_SOURCES += io_fetch.cc io_fetch.h
-libasiodns_la_SOURCES += logger.h logger.cc
-
-nodist_libasiodns_la_SOURCES = asiodns_messages.cc asiodns_messages.h
+lib_LTLIBRARIES = libb10-asiodns.la
+libb10_asiodns_la_SOURCES = dns_answer.h
+libb10_asiodns_la_SOURCES += asiodns.h
+libb10_asiodns_la_SOURCES += dns_lookup.h
+libb10_asiodns_la_SOURCES += dns_server.h
+libb10_asiodns_la_SOURCES += dns_service.cc dns_service.h
+libb10_asiodns_la_SOURCES += tcp_server.cc tcp_server.h
+libb10_asiodns_la_SOURCES += udp_server.cc udp_server.h
+libb10_asiodns_la_SOURCES += sync_udp_server.cc sync_udp_server.h
+libb10_asiodns_la_SOURCES += io_fetch.cc io_fetch.h
+libb10_asiodns_la_SOURCES += logger.h logger.cc
+
+nodist_libb10_asiodns_la_SOURCES = asiodns_messages.cc asiodns_messages.h
EXTRA_DIST = asiodns_messages.mes
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS)
-libasiodns_la_CXXFLAGS = $(AM_CXXFLAGS)
+libb10_asiodns_la_CXXFLAGS = $(AM_CXXFLAGS)
if USE_CLANGPP
# Same for clang++, but we need to turn off -Werror completely.
-libasiodns_la_CXXFLAGS += -Wno-error
+libb10_asiodns_la_CXXFLAGS += -Wno-error
endif
-libasiodns_la_CPPFLAGS = $(AM_CPPFLAGS)
-libasiodns_la_LIBADD = $(top_builddir)/src/lib/log/liblog.la
+libb10_asiodns_la_CPPFLAGS = $(AM_CPPFLAGS)
+libb10_asiodns_la_LIBADD = $(top_builddir)/src/lib/log/libb10-log.la
diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am
index 1e18645..25f2ea8 100644
--- a/src/lib/asiodns/tests/Makefile.am
+++ b/src/lib/asiodns/tests/Makefile.am
@@ -28,13 +28,13 @@ 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/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.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/asiodns/libb10-asiodns.la
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index 07c3e13..3505982 100644
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -13,32 +13,32 @@ CLEANFILES = *.gcno *.gcda
# gcc's unused-parameter warning, which would make the build fail
# with -Werror (our default setting).
-lib_LTLIBRARIES = libasiolink.la
-
-libasiolink_la_LDFLAGS = -no-undefined -version-info 1:0:1
-
-libasiolink_la_SOURCES = asiolink.h
-libasiolink_la_SOURCES += dummy_io_cb.h
-libasiolink_la_SOURCES += interval_timer.cc interval_timer.h
-libasiolink_la_SOURCES += io_address.cc io_address.h
-libasiolink_la_SOURCES += io_asio_socket.h
-libasiolink_la_SOURCES += io_endpoint.cc io_endpoint.h
-libasiolink_la_SOURCES += io_error.h
-libasiolink_la_SOURCES += io_message.h
-libasiolink_la_SOURCES += io_service.h io_service.cc
-libasiolink_la_SOURCES += io_socket.h io_socket.cc
-libasiolink_la_SOURCES += simple_callback.h
-libasiolink_la_SOURCES += tcp_endpoint.h
-libasiolink_la_SOURCES += tcp_socket.h
-libasiolink_la_SOURCES += udp_endpoint.h
-libasiolink_la_SOURCES += udp_socket.h
+lib_LTLIBRARIES = libb10-asiolink.la
+
+libb10_asiolink_la_LDFLAGS = -no-undefined -version-info 1:0:1
+
+libb10_asiolink_la_SOURCES = asiolink.h
+libb10_asiolink_la_SOURCES += dummy_io_cb.h
+libb10_asiolink_la_SOURCES += interval_timer.cc interval_timer.h
+libb10_asiolink_la_SOURCES += io_address.cc io_address.h
+libb10_asiolink_la_SOURCES += io_asio_socket.h
+libb10_asiolink_la_SOURCES += io_endpoint.cc io_endpoint.h
+libb10_asiolink_la_SOURCES += io_error.h
+libb10_asiolink_la_SOURCES += io_message.h
+libb10_asiolink_la_SOURCES += io_service.h io_service.cc
+libb10_asiolink_la_SOURCES += io_socket.h io_socket.cc
+libb10_asiolink_la_SOURCES += simple_callback.h
+libb10_asiolink_la_SOURCES += tcp_endpoint.h
+libb10_asiolink_la_SOURCES += tcp_socket.h
+libb10_asiolink_la_SOURCES += udp_endpoint.h
+libb10_asiolink_la_SOURCES += udp_socket.h
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS)
-libasiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
+libb10_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
if USE_CLANGPP
# Same for clang++, but we need to turn off -Werror completely.
-libasiolink_la_CXXFLAGS += -Wno-error
+libb10_asiolink_la_CXXFLAGS += -Wno-error
endif
-libasiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
-libasiolink_la_LIBADD = $(top_builddir)/src/lib/log/liblog.la
+libb10_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
+libb10_asiolink_la_LIBADD = $(top_builddir)/src/lib/log/libb10-log.la
diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am
index d0f859a..b401834 100644
--- a/src/lib/asiolink/tests/Makefile.am
+++ b/src/lib/asiolink/tests/Makefile.am
@@ -36,10 +36,10 @@ run_unittests_SOURCES += udp_socket_unittest.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDADD = $(top_builddir)/src/lib/asiolink/libasiolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
+run_unittests_LDADD = $(top_builddir)/src/lib/asiolink/libb10-asiolink.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/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
diff --git a/src/lib/bench/Makefile.am b/src/lib/bench/Makefile.am
index 514b3b3..b4e1856 100644
--- a/src/lib/bench/Makefile.am
+++ b/src/lib/bench/Makefile.am
@@ -6,6 +6,6 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
CLEANFILES = *.gcno *.gcda
-noinst_LTLIBRARIES = libbench.la
-libbench_la_SOURCES = benchmark_util.h benchmark_util.cc
+noinst_LTLIBRARIES = libb10-bench.la
+libb10_bench_la_SOURCES = benchmark_util.h benchmark_util.cc
EXTRA_DIST = benchmark.h
diff --git a/src/lib/bench/example/Makefile.am b/src/lib/bench/example/Makefile.am
index 8257b35..51e79e5 100644
--- a/src/lib/bench/example/Makefile.am
+++ b/src/lib/bench/example/Makefile.am
@@ -5,5 +5,5 @@ CLEANFILES = *.gcno *.gcda
noinst_PROGRAMS = search_bench
search_bench_SOURCES = search_bench.cc
-search_bench_LDADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
+search_bench_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
diff --git a/src/lib/bench/tests/Makefile.am b/src/lib/bench/tests/Makefile.am
index fc5c3ae..a5688e8 100644
--- a/src/lib/bench/tests/Makefile.am
+++ b/src/lib/bench/tests/Makefile.am
@@ -17,11 +17,11 @@ 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/util/libutil.la
+run_unittests_LDADD = $(top_builddir)/src/lib/bench/libb10-bench.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/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
endif
diff --git a/src/lib/cache/Makefile.am b/src/lib/cache/Makefile.am
index 9871a5e..00ca16e 100644
--- a/src/lib/cache/Makefile.am
+++ b/src/lib/cache/Makefile.am
@@ -21,18 +21,18 @@ if USE_CLANGPP
AM_CXXFLAGS += -Wno-unused-parameter
endif
-lib_LTLIBRARIES = libcache.la
-libcache_la_SOURCES = resolver_cache.h resolver_cache.cc
-libcache_la_SOURCES += message_cache.h message_cache.cc
-libcache_la_SOURCES += message_entry.h message_entry.cc
-libcache_la_SOURCES += rrset_cache.h rrset_cache.cc
-libcache_la_SOURCES += rrset_entry.h rrset_entry.cc
-libcache_la_SOURCES += cache_entry_key.h cache_entry_key.cc
-libcache_la_SOURCES += rrset_copy.h rrset_copy.cc
-libcache_la_SOURCES += local_zone_data.h local_zone_data.cc
-libcache_la_SOURCES += message_utility.h message_utility.cc
-libcache_la_SOURCES += logger.h logger.cc
-nodist_libcache_la_SOURCES = cache_messages.cc cache_messages.h
+lib_LTLIBRARIES = libb10-cache.la
+libb10_cache_la_SOURCES = resolver_cache.h resolver_cache.cc
+libb10_cache_la_SOURCES += message_cache.h message_cache.cc
+libb10_cache_la_SOURCES += message_entry.h message_entry.cc
+libb10_cache_la_SOURCES += rrset_cache.h rrset_cache.cc
+libb10_cache_la_SOURCES += rrset_entry.h rrset_entry.cc
+libb10_cache_la_SOURCES += cache_entry_key.h cache_entry_key.cc
+libb10_cache_la_SOURCES += rrset_copy.h rrset_copy.cc
+libb10_cache_la_SOURCES += local_zone_data.h local_zone_data.cc
+libb10_cache_la_SOURCES += message_utility.h message_utility.cc
+libb10_cache_la_SOURCES += logger.h logger.cc
+nodist_libb10_cache_la_SOURCES = cache_messages.cc cache_messages.h
BUILT_SOURCES = cache_messages.cc cache_messages.h
diff --git a/src/lib/cache/tests/Makefile.am b/src/lib/cache/tests/Makefile.am
index 4e47314..83b67b0 100644
--- a/src/lib/cache/tests/Makefile.am
+++ b/src/lib/cache/tests/Makefile.am
@@ -50,14 +50,14 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.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/util/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cache/libb10-cache.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.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/libb10-asiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am
index c23b27c..ec478de 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/liblog.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 7291abe..1c2b4b8 100644
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@ -30,10 +30,10 @@ 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/log/liblog.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/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
endif
diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
index 518d497..b4fc2e0 100644
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -11,18 +11,18 @@ config_messages.h config_messages.cc: config_messages.mes
BUILT_SOURCES = config_messages.h config_messages.cc
-lib_LTLIBRARIES = libcfgclient.la
-libcfgclient_la_SOURCES = config_data.h config_data.cc
-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
+lib_LTLIBRARIES = libb10-cfgclient.la
+libb10_cfgclient_la_SOURCES = config_data.h config_data.cc
+libb10_cfgclient_la_SOURCES += module_spec.h module_spec.cc
+libb10_cfgclient_la_SOURCES += ccsession.cc ccsession.h
+libb10_cfgclient_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/exceptions/libexceptions.la
+libb10_cfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libb10-cc.la
+libb10_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libcfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libb10_cfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1
-nodist_libcfgclient_la_SOURCES = config_messages.h config_messages.cc
+nodist_libb10_cfgclient_la_SOURCES = config_messages.h config_messages.cc
# The message file should be in the distribution.
EXTRA_DIST = config_messages.mes
diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index ac1a547..5418a8d 100644
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -26,10 +26,10 @@ 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/config/libcfgclient.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+run_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
endif
diff --git a/src/lib/cryptolink/Makefile.am b/src/lib/cryptolink/Makefile.am
index fc12fae..91825d8 100644
--- a/src/lib/cryptolink/Makefile.am
+++ b/src/lib/cryptolink/Makefile.am
@@ -6,10 +6,10 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
CLEANFILES = *.gcno *.gcda
-lib_LTLIBRARIES = libcryptolink.la
+lib_LTLIBRARIES = libb10-cryptolink.la
-libcryptolink_la_SOURCES = cryptolink.h cryptolink.cc
-libcryptolink_la_SOURCES += crypto_hmac.h crypto_hmac.cc
+libb10_cryptolink_la_SOURCES = cryptolink.h cryptolink.cc
+libb10_cryptolink_la_SOURCES += crypto_hmac.h crypto_hmac.cc
-libcryptolink_la_LDFLAGS = ${BOTAN_LDFLAGS}
-libcryptolink_la_LIBADD = ${BOTAN_LIBS} ${BOTAN_RPATH}
+libb10_cryptolink_la_LDFLAGS = ${BOTAN_LDFLAGS}
+libb10_cryptolink_la_LIBADD = ${BOTAN_LIBS} ${BOTAN_RPATH}
diff --git a/src/lib/cryptolink/tests/Makefile.am b/src/lib/cryptolink/tests/Makefile.am
index 29b30cd..4659a82 100644
--- a/src/lib/cryptolink/tests/Makefile.am
+++ b/src/lib/cryptolink/tests/Makefile.am
@@ -21,10 +21,10 @@ run_unittests_SOURCES += crypto_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD) $(BOTAN_LIBS)
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libb10-cryptolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index defc7ac..bb18b75 100644
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -20,25 +20,25 @@ CLEANFILES = *.gcno *.gcda datasrc_messages.h datasrc_messages.cc
CLEANFILES += datasrc_config.h
CLEANFILES += static.zone
-lib_LTLIBRARIES = libdatasrc.la
-libdatasrc_la_SOURCES = data_source.h data_source.cc
-libdatasrc_la_SOURCES += static_datasrc.h static_datasrc.cc
-libdatasrc_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
-libdatasrc_la_SOURCES += query.h query.cc
-libdatasrc_la_SOURCES += cache.h cache.cc
-libdatasrc_la_SOURCES += rbnode_rrset.h
-libdatasrc_la_SOURCES += rbtree.h
-libdatasrc_la_SOURCES += zonetable.h zonetable.cc
-libdatasrc_la_SOURCES += zone.h zone_finder_context.cc
-libdatasrc_la_SOURCES += result.h
-libdatasrc_la_SOURCES += logger.h logger.cc
-libdatasrc_la_SOURCES += client.h iterator.h
-libdatasrc_la_SOURCES += database.h database.cc
-libdatasrc_la_SOURCES += factory.h factory.cc
-libdatasrc_la_SOURCES += client_list.h client_list.cc
-libdatasrc_la_SOURCES += memory_datasrc.h memory_datasrc.cc
-nodist_libdatasrc_la_SOURCES = datasrc_messages.h datasrc_messages.cc
-libdatasrc_la_LDFLAGS = -no-undefined -version-info 1:0:1
+lib_LTLIBRARIES = libb10-datasrc.la
+libb10_datasrc_la_SOURCES = data_source.h data_source.cc
+libb10_datasrc_la_SOURCES += static_datasrc.h static_datasrc.cc
+libb10_datasrc_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
+libb10_datasrc_la_SOURCES += query.h query.cc
+libb10_datasrc_la_SOURCES += cache.h cache.cc
+libb10_datasrc_la_SOURCES += rbnode_rrset.h
+libb10_datasrc_la_SOURCES += rbtree.h
+libb10_datasrc_la_SOURCES += zonetable.h zonetable.cc
+libb10_datasrc_la_SOURCES += zone.h zone_finder_context.cc
+libb10_datasrc_la_SOURCES += result.h
+libb10_datasrc_la_SOURCES += logger.h logger.cc
+libb10_datasrc_la_SOURCES += client.h iterator.h
+libb10_datasrc_la_SOURCES += database.h database.cc
+libb10_datasrc_la_SOURCES += factory.h factory.cc
+libb10_datasrc_la_SOURCES += client_list.h client_list.cc
+libb10_datasrc_la_SOURCES += memory_datasrc.h memory_datasrc.cc
+nodist_libb10_datasrc_la_SOURCES = datasrc_messages.h datasrc_messages.cc
+libb10_datasrc_la_LDFLAGS = -no-undefined -version-info 1:0:1
pkglib_LTLIBRARIES = sqlite3_ds.la memory_ds.la static_ds.la
@@ -46,26 +46,26 @@ sqlite3_ds_la_SOURCES = sqlite3_accessor.h sqlite3_accessor.cc
sqlite3_ds_la_SOURCES += sqlite3_accessor_link.cc
sqlite3_ds_la_LDFLAGS = -module -avoid-version
sqlite3_ds_la_LDFLAGS += -no-undefined -version-info 1:0:0
-sqlite3_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-sqlite3_ds_la_LIBADD += libdatasrc.la
+sqlite3_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+sqlite3_ds_la_LIBADD += libb10-datasrc.la
sqlite3_ds_la_LIBADD += $(SQLITE_LIBS)
memory_ds_la_SOURCES = memory_datasrc_link.cc
memory_ds_la_LDFLAGS = -module -avoid-version
-memory_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-memory_ds_la_LIBADD += libdatasrc.la
+memory_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+memory_ds_la_LIBADD += libb10-datasrc.la
static_ds_la_SOURCES = static_datasrc_link.cc
static_ds_la_LDFLAGS = -module -avoid-version
-static_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-static_ds_la_LIBADD += libdatasrc.la
+static_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+static_ds_la_LIBADD += libb10-datasrc.la
-libdatasrc_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-libdatasrc_la_LIBADD += $(top_builddir)/src/lib/dns/libdns++.la
-libdatasrc_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la
-libdatasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
-libdatasrc_la_LIBADD += memory/libdatasrc_memory.la # convenience library
-libdatasrc_la_LIBADD += $(SQLITE_LIBS)
+libb10_datasrc_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libb10_datasrc_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
+libb10_datasrc_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
+libb10_datasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+libb10_datasrc_la_LIBADD += memory/libdatasrc_memory.la # convenience library
+libb10_datasrc_la_LIBADD += $(SQLITE_LIBS)
BUILT_SOURCES = datasrc_config.h datasrc_messages.h datasrc_messages.cc
datasrc_messages.h datasrc_messages.cc: Makefile datasrc_messages.mes
diff --git a/src/lib/datasrc/memory/tests/Makefile.am b/src/lib/datasrc/memory/tests/Makefile.am
index 473bff5..73e9ebf 100644
--- a/src/lib/datasrc/memory/tests/Makefile.am
+++ b/src/lib/datasrc/memory/tests/Makefile.am
@@ -24,9 +24,9 @@ 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/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
endif
diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index 5db12ea..027ec6e 100644
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -34,13 +34,13 @@ common_sources = run_unittests.cc
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/util/libutil.la
-common_ldadd += $(top_builddir)/src/lib/log/liblog.la
-common_ldadd += $(top_builddir)/src/lib/exceptions/libexceptions.la
-common_ldadd += $(top_builddir)/src/lib/cc/libcc.la
-common_ldadd += $(top_builddir)/src/lib/testutils/libtestutils.la
+common_ldadd = $(top_builddir)/src/lib/datasrc/libb10-datasrc.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
+common_ldadd += $(top_builddir)/src/lib/cc/libb10-cc.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)
diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index ec169a5..fbd4eb5 100644
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -13,33 +13,33 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
CLEANFILES = *.gcno *.gcda
-lib_LTLIBRARIES = libdhcp++.la
-libdhcp___la_SOURCES =
-libdhcp___la_SOURCES += libdhcp++.cc libdhcp++.h
-libdhcp___la_SOURCES += iface_mgr.cc iface_mgr.h
-libdhcp___la_SOURCES += iface_mgr_linux.cc
-libdhcp___la_SOURCES += iface_mgr_bsd.cc
-libdhcp___la_SOURCES += iface_mgr_sun.cc
-libdhcp___la_SOURCES += option.cc option.h
-libdhcp___la_SOURCES += option6_ia.cc option6_ia.h
-libdhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h
-libdhcp___la_SOURCES += option6_addrlst.cc option6_addrlst.h
-libdhcp___la_SOURCES += option4_addrlst.cc option4_addrlst.h
-libdhcp___la_SOURCES += dhcp6.h dhcp4.h
-libdhcp___la_SOURCES += pkt6.cc pkt6.h
-libdhcp___la_SOURCES += pkt4.cc pkt4.h
+lib_LTLIBRARIES = libb10-dhcp++.la
+libb10_dhcp___la_SOURCES =
+libb10_dhcp___la_SOURCES += libdhcp++.cc libdhcp++.h
+libb10_dhcp___la_SOURCES += iface_mgr.cc iface_mgr.h
+libb10_dhcp___la_SOURCES += iface_mgr_linux.cc
+libb10_dhcp___la_SOURCES += iface_mgr_bsd.cc
+libb10_dhcp___la_SOURCES += iface_mgr_sun.cc
+libb10_dhcp___la_SOURCES += option.cc option.h
+libb10_dhcp___la_SOURCES += option6_ia.cc option6_ia.h
+libb10_dhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h
+libb10_dhcp___la_SOURCES += option6_addrlst.cc option6_addrlst.h
+libb10_dhcp___la_SOURCES += option4_addrlst.cc option4_addrlst.h
+libb10_dhcp___la_SOURCES += dhcp6.h dhcp4.h
+libb10_dhcp___la_SOURCES += pkt6.cc pkt6.h
+libb10_dhcp___la_SOURCES += pkt4.cc pkt4.h
EXTRA_DIST = README
#EXTRA_DIST += log_messages.mes
-libdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
-libdhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libdhcp___la_LIBADD = $(top_builddir)/src/lib/asiolink/libasiolink.la
-libdhcp___la_LIBADD += $(top_builddir)/src/lib/util/libutil.la
-libdhcp___la_LDFLAGS = -no-undefined -version-info 2:0:0
+libb10_dhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
+libb10_dhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libb10_dhcp___la_LIBADD = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+libb10_dhcp___la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la
+libb10_dhcp___la_LDFLAGS = -no-undefined -version-info 2:0:0
if USE_CLANGPP
# Disable unused parameter warning caused by some of the
# Boost headers when compiling with clang.
-libdhcp___la_CXXFLAGS += -Wno-unused-parameter
+libb10_dhcp___la_CXXFLAGS += -Wno-unused-parameter
endif
diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am
index 46225e4..eba7e81 100644
--- a/src/lib/dhcp/tests/Makefile.am
+++ b/src/lib/dhcp/tests/Makefile.am
@@ -52,10 +52,10 @@ if USE_CLANGPP
libdhcp___unittests_CXXFLAGS += -Wno-unused-variable -Wno-unused-parameter
endif
libdhcp___unittests_LDADD = $(GTEST_LDADD)
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 2cd889d..38809e0 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/libcryptolink.la
-libdns___la_LIBADD += $(top_builddir)/src/lib/util/libutil.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 ff591cc..a7e216a 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/util/libutil.la
-rdatarender_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.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/util/libutil.la
-message_renderer_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.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 2846659..6dd94b6 100644
--- a/src/lib/dns/python/Makefile.am
+++ b/src/lib/dns/python/Makefile.am
@@ -4,31 +4,31 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS)
-lib_LTLIBRARIES = libpydnspp.la
-libpydnspp_la_SOURCES = pydnspp_common.cc pydnspp_common.h pydnspp_towire.h
-libpydnspp_la_SOURCES += name_python.cc name_python.h
-libpydnspp_la_SOURCES += nsec3hash_python.cc nsec3hash_python.h
-libpydnspp_la_SOURCES += rrset_python.cc rrset_python.h
-libpydnspp_la_SOURCES += rrclass_python.cc rrclass_python.h
-libpydnspp_la_SOURCES += rrtype_python.cc rrtype_python.h
-libpydnspp_la_SOURCES += rrttl_python.cc rrttl_python.h
-libpydnspp_la_SOURCES += rdata_python.cc rdata_python.h
-libpydnspp_la_SOURCES += serial_python.cc serial_python.h
-libpydnspp_la_SOURCES += messagerenderer_python.cc messagerenderer_python.h
-libpydnspp_la_SOURCES += rcode_python.cc rcode_python.h
-libpydnspp_la_SOURCES += opcode_python.cc opcode_python.h
-libpydnspp_la_SOURCES += question_python.cc question_python.h
-libpydnspp_la_SOURCES += tsigkey_python.cc tsigkey_python.h
-libpydnspp_la_SOURCES += tsigerror_python.cc tsigerror_python.h
-libpydnspp_la_SOURCES += tsig_rdata_python.cc tsig_rdata_python.h
-libpydnspp_la_SOURCES += tsigrecord_python.cc tsigrecord_python.h
-libpydnspp_la_SOURCES += tsig_python.cc tsig_python.h
-libpydnspp_la_SOURCES += edns_python.cc edns_python.h
-libpydnspp_la_SOURCES += message_python.cc message_python.h
-
-libpydnspp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
-libpydnspp_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
-libpydnspp_la_LDFLAGS = $(PYTHON_LDFLAGS)
+lib_LTLIBRARIES = libb10-pydnspp.la
+libb10_pydnspp_la_SOURCES = pydnspp_common.cc pydnspp_common.h pydnspp_towire.h
+libb10_pydnspp_la_SOURCES += name_python.cc name_python.h
+libb10_pydnspp_la_SOURCES += nsec3hash_python.cc nsec3hash_python.h
+libb10_pydnspp_la_SOURCES += rrset_python.cc rrset_python.h
+libb10_pydnspp_la_SOURCES += rrclass_python.cc rrclass_python.h
+libb10_pydnspp_la_SOURCES += rrtype_python.cc rrtype_python.h
+libb10_pydnspp_la_SOURCES += rrttl_python.cc rrttl_python.h
+libb10_pydnspp_la_SOURCES += rdata_python.cc rdata_python.h
+libb10_pydnspp_la_SOURCES += serial_python.cc serial_python.h
+libb10_pydnspp_la_SOURCES += messagerenderer_python.cc messagerenderer_python.h
+libb10_pydnspp_la_SOURCES += rcode_python.cc rcode_python.h
+libb10_pydnspp_la_SOURCES += opcode_python.cc opcode_python.h
+libb10_pydnspp_la_SOURCES += question_python.cc question_python.h
+libb10_pydnspp_la_SOURCES += tsigkey_python.cc tsigkey_python.h
+libb10_pydnspp_la_SOURCES += tsigerror_python.cc tsigerror_python.h
+libb10_pydnspp_la_SOURCES += tsig_rdata_python.cc tsig_rdata_python.h
+libb10_pydnspp_la_SOURCES += tsigrecord_python.cc tsigrecord_python.h
+libb10_pydnspp_la_SOURCES += tsig_python.cc tsig_python.h
+libb10_pydnspp_la_SOURCES += edns_python.cc edns_python.h
+libb10_pydnspp_la_SOURCES += message_python.cc message_python.h
+
+libb10_pydnspp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
+libb10_pydnspp_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
+libb10_pydnspp_la_LDFLAGS = $(PYTHON_LDFLAGS)
@@ -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/exceptions/libexceptions.la
-pydnspp_la_LIBADD += libpydnspp.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 += libb10-pydnspp.la
pydnspp_la_LIBADD += $(PYTHON_LIB)
diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am
index db2a894..0abb389 100644
--- a/src/lib/dns/tests/Makefile.am
+++ b/src/lib/dns/tests/Makefile.am
@@ -74,10 +74,10 @@ 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/util/libutil.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/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD += $(BOTAN_LIBS) $(GTEST_LDADD)
endif
diff --git a/src/lib/exceptions/Makefile.am b/src/lib/exceptions/Makefile.am
index 1d0ce2d..aa7d6cd 100644
--- a/src/lib/exceptions/Makefile.am
+++ b/src/lib/exceptions/Makefile.am
@@ -3,10 +3,10 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CXXFLAGS=$(B10_CXXFLAGS)
-lib_LTLIBRARIES = libexceptions.la
-libexceptions_la_SOURCES = exceptions.h exceptions.cc
+lib_LTLIBRARIES = libb10-exceptions.la
+libb10_exceptions_la_SOURCES = exceptions.h exceptions.cc
CLEANFILES = *.gcno *.gcda
-libexceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions
-libexceptions_include_HEADERS = exceptions.h
+libb10_exceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions
+libb10_exceptions_include_HEADERS = exceptions.h
diff --git a/src/lib/exceptions/tests/Makefile.am b/src/lib/exceptions/tests/Makefile.am
index 1e31353..83b9765 100644
--- a/src/lib/exceptions/tests/Makefile.am
+++ b/src/lib/exceptions/tests/Makefile.am
@@ -20,7 +20,7 @@ run_unittests_SOURCES += exceptions_unittest.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index ed23176..6207655 100644
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -6,31 +6,31 @@ AM_CPPFLAGS += -DTOP_BUILDDIR=\"${abs_top_builddir}\"
CLEANFILES = *.gcno *.gcda
-lib_LTLIBRARIES = liblog.la
-liblog_la_SOURCES =
-liblog_la_SOURCES += dummylog.h dummylog.cc
-liblog_la_SOURCES += logimpl_messages.cc logimpl_messages.h
-liblog_la_SOURCES += log_dbglevels.h
-liblog_la_SOURCES += log_formatter.h log_formatter.cc
-liblog_la_SOURCES += logger.cc logger.h
-liblog_la_SOURCES += logger_impl.cc logger_impl.h
-liblog_la_SOURCES += logger_level.h
-liblog_la_SOURCES += logger_level.cc logger_level.h
-liblog_la_SOURCES += logger_level_impl.cc logger_level_impl.h
-liblog_la_SOURCES += logger_manager.cc logger_manager.h
-liblog_la_SOURCES += logger_manager_impl.cc logger_manager_impl.h
-liblog_la_SOURCES += logger_name.cc logger_name.h
-liblog_la_SOURCES += logger_specification.h
-liblog_la_SOURCES += logger_support.cc logger_support.h
-liblog_la_SOURCES += logger_unittest_support.cc logger_unittest_support.h
-liblog_la_SOURCES += log_messages.cc log_messages.h
-liblog_la_SOURCES += macros.h
-liblog_la_SOURCES += message_dictionary.cc message_dictionary.h
-liblog_la_SOURCES += message_exception.h
-liblog_la_SOURCES += message_initializer.cc message_initializer.h
-liblog_la_SOURCES += message_reader.cc message_reader.h
-liblog_la_SOURCES += message_types.h
-liblog_la_SOURCES += output_option.cc output_option.h
+lib_LTLIBRARIES = libb10-log.la
+libb10_log_la_SOURCES =
+libb10_log_la_SOURCES += dummylog.h dummylog.cc
+libb10_log_la_SOURCES += logimpl_messages.cc logimpl_messages.h
+libb10_log_la_SOURCES += log_dbglevels.h
+libb10_log_la_SOURCES += log_formatter.h log_formatter.cc
+libb10_log_la_SOURCES += logger.cc logger.h
+libb10_log_la_SOURCES += logger_impl.cc logger_impl.h
+libb10_log_la_SOURCES += logger_level.h
+libb10_log_la_SOURCES += logger_level.cc logger_level.h
+libb10_log_la_SOURCES += logger_level_impl.cc logger_level_impl.h
+libb10_log_la_SOURCES += logger_manager.cc logger_manager.h
+libb10_log_la_SOURCES += logger_manager_impl.cc logger_manager_impl.h
+libb10_log_la_SOURCES += logger_name.cc logger_name.h
+libb10_log_la_SOURCES += logger_specification.h
+libb10_log_la_SOURCES += logger_support.cc logger_support.h
+libb10_log_la_SOURCES += logger_unittest_support.cc logger_unittest_support.h
+libb10_log_la_SOURCES += log_messages.cc log_messages.h
+libb10_log_la_SOURCES += macros.h
+libb10_log_la_SOURCES += message_dictionary.cc message_dictionary.h
+libb10_log_la_SOURCES += message_exception.h
+libb10_log_la_SOURCES += message_initializer.cc message_initializer.h
+libb10_log_la_SOURCES += message_reader.cc message_reader.h
+libb10_log_la_SOURCES += message_types.h
+libb10_log_la_SOURCES += output_option.cc output_option.h
EXTRA_DIST = README
EXTRA_DIST += logimpl_messages.mes
@@ -38,14 +38,14 @@ EXTRA_DIST += log_messages.mes
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS)
-liblog_la_CXXFLAGS = $(AM_CXXFLAGS)
+libb10_log_la_CXXFLAGS = $(AM_CXXFLAGS)
if USE_GXX
-liblog_la_CXXFLAGS += -Wno-unused-parameter
+libb10_log_la_CXXFLAGS += -Wno-unused-parameter
endif
if USE_CLANGPP
# Same for clang++, but we need to turn off -Werror completely.
-liblog_la_CXXFLAGS += -Wno-error
+libb10_log_la_CXXFLAGS += -Wno-error
endif
-liblog_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-liblog_la_LIBADD = $(top_builddir)/src/lib/util/libutil.la $(LOG4CPLUS_LIBS)
-liblog_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libb10_log_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libb10_log_la_LIBADD = $(top_builddir)/src/lib/util/libb10-util.la $(LOG4CPLUS_LIBS)
+libb10_log_la_LDFLAGS = -no-undefined -version-info 1:0:0
diff --git a/src/lib/log/compiler/Makefile.am b/src/lib/log/compiler/Makefile.am
index 84cd4f6..f4435d8 100644
--- a/src/lib/log/compiler/Makefile.am
+++ b/src/lib/log/compiler/Makefile.am
@@ -14,6 +14,6 @@ CLEANFILES = *.gcno *.gcda
noinst_PROGRAMS = message
message_SOURCES = message.cc
-message_LDADD = $(top_builddir)/src/lib/log/liblog.la
-message_LDADD += $(top_builddir)/src/lib/util/libutil.la
-message_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+message_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
+message_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+message_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index aac3914..3ac19a4 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -23,18 +23,18 @@ noinst_PROGRAMS = logger_example
logger_example_SOURCES = logger_example.cc
logger_example_CPPFLAGS = $(AM_CPPFLAGS)
logger_example_LDFLAGS = $(AM_LDFLAGS)
-logger_example_LDADD = $(top_builddir)/src/lib/log/liblog.la
-logger_example_LDADD += $(top_builddir)/src/lib/util/libutil.la
-logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+logger_example_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
+logger_example_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
logger_example_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
noinst_PROGRAMS += init_logger_test
init_logger_test_SOURCES = init_logger_test.cc
init_logger_test_CPPFLAGS = $(AM_CPPFLAGS)
init_logger_test_LDFLAGS = $(AM_LDFLAGS)
-init_logger_test_LDADD = $(top_builddir)/src/lib/log/liblog.la
-init_logger_test_LDADD += $(top_builddir)/src/lib/util/libutil.la
-init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+init_logger_test_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
+init_logger_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
init_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
noinst_PROGRAMS += logger_lock_test
@@ -42,9 +42,9 @@ logger_lock_test_SOURCES = logger_lock_test.cc
nodist_logger_lock_test_SOURCES = log_test_messages.cc log_test_messages.h
logger_lock_test_CPPFLAGS = $(AM_CPPFLAGS)
logger_lock_test_LDFLAGS = $(AM_LDFLAGS)
-logger_lock_test_LDADD = $(top_builddir)/src/lib/log/liblog.la
-logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libutil.la
-logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+logger_lock_test_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
+logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
logger_lock_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
TESTS_ENVIRONMENT = \
@@ -61,10 +61,10 @@ endif
AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
AM_LDFLAGS += $(GTEST_LDFLAGS)
-AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
-AM_LDADD += $(top_builddir)/src/lib/log/liblog.la
+AM_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+AM_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+AM_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
AM_LDADD += $(GTEST_LDADD)
diff --git a/src/lib/nsas/Makefile.am b/src/lib/nsas/Makefile.am
index 663afba..eb8c0c3 100644
--- a/src/lib/nsas/Makefile.am
+++ b/src/lib/nsas/Makefile.am
@@ -26,7 +26,7 @@ nsas_messages.h nsas_messages.cc: nsas_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/nsas/nsas_messages.mes
# What is being built.
-lib_LTLIBRARIES = libnsas.la
+lib_LTLIBRARIES = libb10-nsas.la
# Tell Automake that the nsas_messages.{cc,h} source files are created in the build
# process, so it must create these before doing anything else. Although they
@@ -37,24 +37,24 @@ lib_LTLIBRARIES = libnsas.la
BUILT_SOURCES = nsas_messages.h nsas_messages.cc
# Library sources. The generated files will not be in the distribution.
-libnsas_la_SOURCES = address_entry.h address_entry.cc
-libnsas_la_SOURCES += asiolink.h
-libnsas_la_SOURCES += hash.cc hash.h
-libnsas_la_SOURCES += hash_deleter.h
-libnsas_la_SOURCES += hash_key.cc hash_key.h
-libnsas_la_SOURCES += hash_table.h
-libnsas_la_SOURCES += nameserver_address_store.cc nameserver_address_store.h
-libnsas_la_SOURCES += nameserver_address.h nameserver_address.cc
-libnsas_la_SOURCES += nameserver_entry.cc nameserver_entry.h
-libnsas_la_SOURCES += nsas_entry_compare.h
-libnsas_la_SOURCES += nsas_entry.h nsas_types.h
-libnsas_la_SOURCES += nsas_log.cc nsas_log.h
-libnsas_la_SOURCES += zone_entry.cc zone_entry.h
-libnsas_la_SOURCES += fetchable.h
-libnsas_la_SOURCES += address_request_callback.h
-libnsas_la_SOURCES += glue_hints.h glue_hints.cc
-
-nodist_libnsas_la_SOURCES = nsas_messages.h nsas_messages.cc
+libb10_nsas_la_SOURCES = address_entry.h address_entry.cc
+libb10_nsas_la_SOURCES += asiolink.h
+libb10_nsas_la_SOURCES += hash.cc hash.h
+libb10_nsas_la_SOURCES += hash_deleter.h
+libb10_nsas_la_SOURCES += hash_key.cc hash_key.h
+libb10_nsas_la_SOURCES += hash_table.h
+libb10_nsas_la_SOURCES += nameserver_address_store.cc nameserver_address_store.h
+libb10_nsas_la_SOURCES += nameserver_address.h nameserver_address.cc
+libb10_nsas_la_SOURCES += nameserver_entry.cc nameserver_entry.h
+libb10_nsas_la_SOURCES += nsas_entry_compare.h
+libb10_nsas_la_SOURCES += nsas_entry.h nsas_types.h
+libb10_nsas_la_SOURCES += nsas_log.cc nsas_log.h
+libb10_nsas_la_SOURCES += zone_entry.cc zone_entry.h
+libb10_nsas_la_SOURCES += fetchable.h
+libb10_nsas_la_SOURCES += address_request_callback.h
+libb10_nsas_la_SOURCES += glue_hints.h glue_hints.cc
+
+nodist_libb10_nsas_la_SOURCES = nsas_messages.h nsas_messages.cc
# The message file should be in the distribution.
EXTRA_DIST = nsas_messages.mes
diff --git a/src/lib/nsas/tests/Makefile.am b/src/lib/nsas/tests/Makefile.am
index bc03978..1b89cb8 100644
--- a/src/lib/nsas/tests/Makefile.am
+++ b/src/lib/nsas/tests/Makefile.am
@@ -49,13 +49,13 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.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/libb10-dns++.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/python/isc/acl/Makefile.am b/src/lib/python/isc/acl/Makefile.am
index b9a0c81..634fadd 100644
--- a/src/lib/python/isc/acl/Makefile.am
+++ b/src/lib/python/isc/acl/Makefile.am
@@ -27,11 +27,11 @@ _dns_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
acl_la_LDFLAGS += -module -avoid-version
-acl_la_LIBADD = $(top_builddir)/src/lib/acl/libacl.la
+acl_la_LIBADD = $(top_builddir)/src/lib/acl/libb10-acl.la
acl_la_LIBADD += $(PYTHON_LIB)
_dns_la_LDFLAGS += -module -avoid-version
-_dns_la_LIBADD = $(top_builddir)/src/lib/acl/libdnsacl.la
+_dns_la_LIBADD = $(top_builddir)/src/lib/acl/libb10-dnsacl.la
_dns_la_LIBADD += $(PYTHON_LIB)
EXTRA_DIST = acl.py _dns.py
diff --git a/src/lib/python/isc/datasrc/Makefile.am b/src/lib/python/isc/datasrc/Makefile.am
index 2ccf8ff..84da788 100644
--- a/src/lib/python/isc/datasrc/Makefile.am
+++ b/src/lib/python/isc/datasrc/Makefile.am
@@ -25,9 +25,9 @@ datasrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
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/dns/python/libpydnspp.la
+datasrc_la_LIBADD = $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
+datasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+datasrc_la_LIBADD += $(top_builddir)/src/lib/dns/python/libb10-pydnspp.la
datasrc_la_LIBADD += $(PYTHON_LIB)
EXTRA_DIST = client_inc.cc
diff --git a/src/lib/python/isc/log/Makefile.am b/src/lib/python/isc/log/Makefile.am
index 3658c17..5941492 100644
--- a/src/lib/python/isc/log/Makefile.am
+++ b/src/lib/python/isc/log/Makefile.am
@@ -14,10 +14,10 @@ log_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
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/liblog.la
-log_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
-log_la_LIBADD += $(top_builddir)/src/lib/config/libcfgclient.la
-log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+log_la_LIBADD = $(top_builddir)/src/lib/log/libb10-log.la
+log_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+log_la_LIBADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
+log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
log_la_LIBADD += $(PYTHON_LIB)
# This is not installed, it helps locate the module during tests
diff --git a/src/lib/python/isc/util/cio/Makefile.am b/src/lib/python/isc/util/cio/Makefile.am
index 0a2e735..4a23509 100644
--- a/src/lib/python/isc/util/cio/Makefile.am
+++ b/src/lib/python/isc/util/cio/Makefile.am
@@ -24,7 +24,7 @@ socketsession_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
socketsession_la_LDFLAGS += -module -avoid-version
-socketsession_la_LIBADD = $(top_builddir)/src/lib/util/io/libutil_io.la
+socketsession_la_LIBADD = $(top_builddir)/src/lib/util/io/libb10-util-io.la
socketsession_la_LIBADD += $(PYTHON_LIB)
# This is not installed, it helps locate the module during tests
diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am
index 4b81862..096a14d 100644
--- a/src/lib/resolve/Makefile.am
+++ b/src/lib/resolve/Makefile.am
@@ -21,30 +21,30 @@ BUILT_SOURCES = resolve_messages.h resolve_messages.cc
CLEANFILES = *.gcno *.gcda resolve_messages.cc resolve_messages.h
-lib_LTLIBRARIES = libresolve.la
-libresolve_la_SOURCES = resolve.h resolve.cc
-libresolve_la_SOURCES += resolve_log.h resolve_log.cc
-libresolve_la_SOURCES += resolver_interface.h
-libresolve_la_SOURCES += resolver_callback.h resolver_callback.cc
-libresolve_la_SOURCES += response_classifier.cc response_classifier.h
-libresolve_la_SOURCES += recursive_query.cc recursive_query.h
+lib_LTLIBRARIES = libb10-resolve.la
+libb10_resolve_la_SOURCES = resolve.h resolve.cc
+libb10_resolve_la_SOURCES += resolve_log.h resolve_log.cc
+libb10_resolve_la_SOURCES += resolver_interface.h
+libb10_resolve_la_SOURCES += resolver_callback.h resolver_callback.cc
+libb10_resolve_la_SOURCES += response_classifier.cc response_classifier.h
+libb10_resolve_la_SOURCES += recursive_query.cc recursive_query.h
-nodist_libresolve_la_SOURCES = resolve_messages.h resolve_messages.cc
+nodist_libb10_resolve_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/exceptions/libexceptions.la
-libresolve_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la
-libresolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
+libb10_resolve_la_LIBADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
+libb10_resolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libb10_resolve_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
+libb10_resolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
# The message file should be in the distribution.
EXTRA_DIST = resolve_messages.mes
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS)
-libresolve_la_CXXFLAGS = $(AM_CXXFLAGS)
+libb10_resolve_la_CXXFLAGS = $(AM_CXXFLAGS)
if USE_CLANGPP
# For clang++, we need to turn off -Werror completely.
-libresolve_la_CXXFLAGS += -Wno-error
+libb10_resolve_la_CXXFLAGS += -Wno-error
endif
-libresolve_la_CPPFLAGS = $(AM_CPPFLAGS)
+libb10_resolve_la_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/src/lib/resolve/tests/Makefile.am b/src/lib/resolve/tests/Makefile.am
index 97afe5c..84f603b 100644
--- a/src/lib/resolve/tests/Makefile.am
+++ b/src/lib/resolve/tests/Makefile.am
@@ -29,16 +29,16 @@ run_unittests_SOURCES += recursive_query_unittest_2.cc
run_unittests_SOURCES += recursive_query_unittest_3.cc
run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
-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/util/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
+run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cache/libb10-cache.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
+run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libb10-resolve.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
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif
diff --git a/src/lib/server_common/Makefile.am b/src/lib/server_common/Makefile.am
index 6010316..cf9059a 100644
--- a/src/lib/server_common/Makefile.am
+++ b/src/lib/server_common/Makefile.am
@@ -16,22 +16,22 @@ if USE_CLANGPP
AM_CXXFLAGS += -Wno-unused-parameter
endif
-lib_LTLIBRARIES = libserver_common.la
-libserver_common_la_SOURCES = client.h client.cc
-libserver_common_la_SOURCES += keyring.h keyring.cc
-libserver_common_la_SOURCES += portconfig.h portconfig.cc
-libserver_common_la_SOURCES += logger.h logger.cc
-libserver_common_la_SOURCES += socket_request.h socket_request.cc
-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/libexceptions.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/config/libcfgclient.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/log/liblog.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/util/io/libutil_io.la
+lib_LTLIBRARIES = libb10-server-common.la
+libb10_server_common_la_SOURCES = client.h client.cc
+libb10_server_common_la_SOURCES += keyring.h keyring.cc
+libb10_server_common_la_SOURCES += portconfig.h portconfig.cc
+libb10_server_common_la_SOURCES += logger.h logger.cc
+libb10_server_common_la_SOURCES += socket_request.h socket_request.cc
+nodist_libb10_server_common_la_SOURCES = server_common_messages.h
+nodist_libb10_server_common_la_SOURCES += server_common_messages.cc
+libb10_server_common_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
+libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
+libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/acl/libb10-acl.la
+libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
+libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
BUILT_SOURCES = server_common_messages.h server_common_messages.cc
server_common_messages.h server_common_messages.cc: server_common_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/server_common/server_common_messages.mes
diff --git a/src/lib/server_common/tests/Makefile.am b/src/lib/server_common/tests/Makefile.am
index d6498f1..6e03f70 100644
--- a/src/lib/server_common/tests/Makefile.am
+++ b/src/lib/server_common/tests/Makefile.am
@@ -38,18 +38,18 @@ nodist_run_unittests_SOURCES = data_path.h
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
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/log/liblog.la
-run_unittests_LDADD += $(top_builddir)/src/lib/acl/libacl.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
+run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.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/libb10-acl.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/libb10-dns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.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/config/libb10-cfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/tests/libfake_session.la
endif
diff --git a/src/lib/statistics/Makefile.am b/src/lib/statistics/Makefile.am
index 6c7b910..206b527 100644
--- a/src/lib/statistics/Makefile.am
+++ b/src/lib/statistics/Makefile.am
@@ -17,8 +17,8 @@ if USE_CLANGPP
AM_CXXFLAGS += -Wno-unused-parameter
endif
-lib_LTLIBRARIES = libstatistics.la
-libstatistics_la_SOURCES = counter.h counter.cc
-libstatistics_la_SOURCES += counter_dict.h counter_dict.cc
+lib_LTLIBRARIES = libb10-statistics.la
+libb10_statistics_la_SOURCES = counter.h counter.cc
+libb10_statistics_la_SOURCES += counter_dict.h counter_dict.cc
CLEANFILES = *.gcno *.gcda
diff --git a/src/lib/statistics/tests/Makefile.am b/src/lib/statistics/tests/Makefile.am
index c6e7cb8..007c8b0 100644
--- a/src/lib/statistics/tests/Makefile.am
+++ b/src/lib/statistics/tests/Makefile.am
@@ -28,10 +28,10 @@ run_unittests_SOURCES += counter_dict_unittest.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
+run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.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/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
diff --git a/src/lib/testutils/Makefile.am b/src/lib/testutils/Makefile.am
index 7a4c8d7..2281b6d 100644
--- a/src/lib/testutils/Makefile.am
+++ b/src/lib/testutils/Makefile.am
@@ -5,13 +5,13 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
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/libasiolink.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
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index b135ffc..c56e4b8 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -7,29 +7,29 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += -DLOCKFILE_DIR=\"${localstatedir}/${PACKAGE_NAME}\"
AM_CXXFLAGS = $(B10_CXXFLAGS)
-lib_LTLIBRARIES = libutil.la
-libutil_la_SOURCES = filename.h filename.cc
-libutil_la_SOURCES += locks.h lru_list.h
-libutil_la_SOURCES += strutil.h strutil.cc
-libutil_la_SOURCES += buffer.h io_utilities.h
-libutil_la_SOURCES += time_utilities.h time_utilities.cc
-libutil_la_SOURCES += interprocess_sync.h
-libutil_la_SOURCES += interprocess_sync_file.h interprocess_sync_file.cc
-libutil_la_SOURCES += interprocess_sync_null.h interprocess_sync_null.cc
-libutil_la_SOURCES += memory_segment.h
-libutil_la_SOURCES += memory_segment_local.h memory_segment_local.cc
-libutil_la_SOURCES += range_utilities.h
-libutil_la_SOURCES += hash/sha1.h hash/sha1.cc
-libutil_la_SOURCES += encode/base16_from_binary.h
-libutil_la_SOURCES += encode/base32hex.h encode/base64.h
-libutil_la_SOURCES += encode/base32hex_from_binary.h
-libutil_la_SOURCES += encode/base_n.cc encode/hex.h
-libutil_la_SOURCES += encode/binary_from_base32hex.h
-libutil_la_SOURCES += encode/binary_from_base16.h
-libutil_la_SOURCES += random/qid_gen.h random/qid_gen.cc
-libutil_la_SOURCES += random/random_number_generator.h
+lib_LTLIBRARIES = libb10-util.la
+libb10_util_la_SOURCES = filename.h filename.cc
+libb10_util_la_SOURCES += locks.h lru_list.h
+libb10_util_la_SOURCES += strutil.h strutil.cc
+libb10_util_la_SOURCES += buffer.h io_utilities.h
+libb10_util_la_SOURCES += time_utilities.h time_utilities.cc
+libb10_util_la_SOURCES += interprocess_sync.h
+libb10_util_la_SOURCES += interprocess_sync_file.h interprocess_sync_file.cc
+libb10_util_la_SOURCES += interprocess_sync_null.h interprocess_sync_null.cc
+libb10_util_la_SOURCES += memory_segment.h
+libb10_util_la_SOURCES += memory_segment_local.h memory_segment_local.cc
+libb10_util_la_SOURCES += range_utilities.h
+libb10_util_la_SOURCES += hash/sha1.h hash/sha1.cc
+libb10_util_la_SOURCES += encode/base16_from_binary.h
+libb10_util_la_SOURCES += encode/base32hex.h encode/base64.h
+libb10_util_la_SOURCES += encode/base32hex_from_binary.h
+libb10_util_la_SOURCES += encode/base_n.cc encode/hex.h
+libb10_util_la_SOURCES += encode/binary_from_base32hex.h
+libb10_util_la_SOURCES += encode/binary_from_base16.h
+libb10_util_la_SOURCES += random/qid_gen.h random/qid_gen.cc
+libb10_util_la_SOURCES += random/random_number_generator.h
EXTRA_DIST = python/pycppwrapper_util.h
-libutil_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
+libb10_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
CLEANFILES = *.gcno *.gcda
diff --git a/src/lib/util/io/Makefile.am b/src/lib/util/io/Makefile.am
index 1cb0ab9..1249178 100644
--- a/src/lib/util/io/Makefile.am
+++ b/src/lib/util/io/Makefile.am
@@ -3,11 +3,11 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
-lib_LTLIBRARIES = libutil_io.la
-libutil_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
-libutil_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
-libutil_io_la_SOURCES += pktinfo_utilities.h
-libutil_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
+lib_LTLIBRARIES = libb10-util-io.la
+libb10_util_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
+libb10_util_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
+libb10_util_io_la_SOURCES += pktinfo_utilities.h
+libb10_util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
CLEANFILES = *.gcno *.gcda
@@ -16,7 +16,7 @@ pyexec_LTLIBRARIES = libutil_io_python.la
# suffix for dynamic objects. -module is necessary to work this around.
libutil_io_python_la_LDFLAGS = -module -avoid-version
libutil_io_python_la_SOURCES = fdshare_python.cc
-libutil_io_python_la_LIBADD = libutil_io.la
+libutil_io_python_la_LIBADD = libb10-util-io.la
libutil_io_python_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
# Note: PYTHON_CXXFLAGS may have some -Wno... workaround, which must be
# placed after -Wextra defined in AM_CXXFLAGS
diff --git a/src/lib/util/pyunittests/Makefile.am b/src/lib/util/pyunittests/Makefile.am
index 93b0748..7f04d89 100644
--- a/src/lib/util/pyunittests/Makefile.am
+++ b/src/lib/util/pyunittests/Makefile.am
@@ -14,7 +14,7 @@ pyunittests_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
pyunittests_util_la_LDFLAGS += -module -avoid-version
-pyunittests_util_la_LIBADD = $(top_builddir)/src/lib/util/libutil.la
+pyunittests_util_la_LIBADD = $(top_builddir)/src/lib/util/libb10-util.la
pyunittests_util_la_LIBADD += $(PYTHON_LIB)
# hack to trigger libtool to not create a convenience archive,
diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am
index 97ee77d..105322f 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -45,11 +45,11 @@ run_unittests_SOURCES += range_utilities_unittest.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
-run_unittests_LDADD = $(top_builddir)/src/lib/util/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la
+run_unittests_LDADD = $(top_builddir)/src/lib/util/libb10-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
run_unittests_LDADD += \
$(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
endif
diff --git a/src/lib/util/unittests/Makefile.am b/src/lib/util/unittests/Makefile.am
index 39fbf88..451ab4e 100644
--- a/src/lib/util/unittests/Makefile.am
+++ b/src/lib/util/unittests/Makefile.am
@@ -20,8 +20,8 @@ if HAVE_GTEST
libutil_unittests_la_CPPFLAGS += $(GTEST_INCLUDES)
endif
-libutil_unittests_la_LIBADD = $(top_builddir)/src/lib/util/libutil.la
-libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libutil_io.la
-libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+libutil_unittests_la_LIBADD = $(top_builddir)/src/lib/util/libb10-util.la
+libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
+libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
CLEANFILES = *.gcno *.gcda
diff --git a/src/lib/xfr/Makefile.am b/src/lib/xfr/Makefile.am
index 3d7f60f..5551a5b 100644
--- a/src/lib/xfr/Makefile.am
+++ b/src/lib/xfr/Makefile.am
@@ -12,6 +12,6 @@ endif
CLEANFILES = *.gcno *.gcda
-lib_LTLIBRARIES = libxfr.la
-libxfr_la_SOURCES = xfrout_client.h xfrout_client.cc
-libxfr_la_LIBADD = $(top_builddir)/src/lib/util/io/libutil_io.la
+lib_LTLIBRARIES = libb10-xfr.la
+libb10_xfr_la_SOURCES = xfrout_client.h xfrout_client.cc
+libb10_xfr_la_LIBADD = $(top_builddir)/src/lib/util/io/libb10-util-io.la
diff --git a/src/lib/xfr/tests/Makefile.am b/src/lib/xfr/tests/Makefile.am
index e8f187f..908abe8 100644
--- a/src/lib/xfr/tests/Makefile.am
+++ b/src/lib/xfr/tests/Makefile.am
@@ -21,8 +21,8 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
-run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
+run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/tests/tools/badpacket/Makefile.am b/tests/tools/badpacket/Makefile.am
index fcba404..b24cf3c 100644
--- a/tests/tools/badpacket/Makefile.am
+++ b/tests/tools/badpacket/Makefile.am
@@ -25,9 +25,9 @@ if USE_CLANGPP
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/asiolink/libasiolink.la
-badpacket_LDADD += $(top_builddir)/src/lib/log/liblog.la
-badpacket_LDADD += $(top_builddir)/src/lib/util/libutil.la
-badpacket_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+badpacket_LDADD = $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
+badpacket_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
+badpacket_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+badpacket_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+badpacket_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+badpacket_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
diff --git a/tests/tools/badpacket/tests/Makefile.am b/tests/tools/badpacket/tests/Makefile.am
index a036dc8..3a8c922 100644
--- a/tests/tools/badpacket/tests/Makefile.am
+++ b/tests/tools/badpacket/tests/Makefile.am
@@ -27,8 +27,8 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
endif
diff --git a/tests/tools/perfdhcp/Makefile.am b/tests/tools/perfdhcp/Makefile.am
index 6ebc00f..d46f2d1 100644
--- a/tests/tools/perfdhcp/Makefile.am
+++ b/tests/tools/perfdhcp/Makefile.am
@@ -18,23 +18,23 @@ if USE_STATIC_LINK
AM_LDFLAGS += -static
endif
-lib_LTLIBRARIES = libperfdhcp++.la
-libperfdhcp___la_SOURCES = command_options.cc command_options.h
-libperfdhcp___la_SOURCES += localized_option.h
-libperfdhcp___la_SOURCES += perf_pkt6.cc perf_pkt6.h
-libperfdhcp___la_SOURCES += perf_pkt4.cc perf_pkt4.h
-libperfdhcp___la_SOURCES += pkt_transform.cc pkt_transform.h
-
-libperfdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
+lib_LTLIBRARIES = libb10_perfdhcp++.la
+libb10_perfdhcp___la_SOURCES = command_options.cc command_options.h
+libb10_perfdhcp___la_SOURCES += localized_option.h
+libb10_perfdhcp___la_SOURCES += perf_pkt6.cc perf_pkt6.h
+libb10_perfdhcp___la_SOURCES += perf_pkt4.cc perf_pkt4.h
+libb10_perfdhcp___la_SOURCES += pkt_transform.cc pkt_transform.h
+
+libb10_perfdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
if USE_CLANGPP
# Disable unused parameter warning caused by some of the
# Boost headers when compiling with clang.
-libperfdhcp___la_CXXFLAGS += -Wno-unused-parameter
+libb10_perfdhcp___la_CXXFLAGS += -Wno-unused-parameter
endif
-libperfdhcp___la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-libperfdhcp___la_LIBADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
-libperfdhcp___la_LIBADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
+libb10_perfdhcp___la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libb10_perfdhcp___la_LIBADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+libb10_perfdhcp___la_LIBADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
pkglibexec_PROGRAMS = perfdhcp
perfdhcp_SOURCES = perfdhcp.c
diff --git a/tests/tools/perfdhcp/tests/Makefile.am b/tests/tools/perfdhcp/tests/Makefile.am
index ab1251c..ec1b403 100644
--- a/tests/tools/perfdhcp/tests/Makefile.am
+++ b/tests/tools/perfdhcp/tests/Makefile.am
@@ -36,10 +36,10 @@ run_unittests_CXXFLAGS = -Wno-unused-parameter
endif
run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
endif
More information about the bind10-changes
mailing list