BIND 10 trac2071, updated. 21f4b49aeb02621bf545adcb55ff054f18bf6377 [2071] partial rename of libutil
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jun 20 19:09:07 UTC 2012
The branch, trac2071 has been updated
via 21f4b49aeb02621bf545adcb55ff054f18bf6377 (commit)
from 101479ef5ceb88d3fe7b282d9f69fc9fcaf51b08 (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 21f4b49aeb02621bf545adcb55ff054f18bf6377
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Wed Jun 20 14:08:42 2012 -0500
[2071] partial rename of libutil
This is a test. It is not finished yet.
Will resume this another day.
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/Makefile.am | 4 +--
src/bin/auth/benchmarks/Makefile.am | 2 +-
src/bin/auth/tests/Makefile.am | 4 +--
src/bin/host/Makefile.am | 2 +-
src/bin/resolver/Makefile.am | 2 +-
src/bin/resolver/tests/Makefile.am | 4 +--
src/bin/sockcreator/Makefile.am | 2 +-
src/bin/sockcreator/tests/Makefile.am | 4 +--
src/lib/acl/Makefile.am | 2 +-
src/lib/acl/tests/Makefile.am | 4 +--
src/lib/asiodns/tests/Makefile.am | 4 +--
src/lib/asiolink/tests/Makefile.am | 2 +-
src/lib/bench/tests/Makefile.am | 4 +--
src/lib/cache/tests/Makefile.am | 4 +--
src/lib/cc/tests/Makefile.am | 2 +-
src/lib/config/tests/Makefile.am | 2 +-
src/lib/cryptolink/tests/Makefile.am | 4 +--
src/lib/datasrc/tests/Makefile.am | 4 +--
src/lib/dhcp/Makefile.am | 2 +-
src/lib/dhcp/tests/Makefile.am | 2 +-
src/lib/dns/Makefile.am | 2 +-
src/lib/dns/benchmarks/Makefile.am | 4 +--
src/lib/dns/tests/Makefile.am | 4 +--
src/lib/log/Makefile.am | 2 +-
src/lib/log/compiler/Makefile.am | 2 +-
src/lib/log/tests/Makefile.am | 12 ++++-----
src/lib/nsas/tests/Makefile.am | 4 +--
src/lib/python/isc/util/cio/Makefile.am | 2 +-
src/lib/resolve/tests/Makefile.am | 4 +--
src/lib/server_common/Makefile.am | 2 +-
src/lib/server_common/tests/Makefile.am | 4 +--
src/lib/statistics/tests/Makefile.am | 2 +-
src/lib/util/Makefile.am | 42 +++++++++++++++----------------
src/lib/util/io/Makefile.am | 22 ++++++++--------
src/lib/util/pyunittests/Makefile.am | 2 +-
src/lib/util/tests/Makefile.am | 6 ++---
src/lib/util/unittests/Makefile.am | 26 +++++++++----------
src/lib/xfr/Makefile.am | 2 +-
src/lib/xfr/tests/Makefile.am | 2 +-
tests/tools/badpacket/Makefile.am | 2 +-
tests/tools/badpacket/tests/Makefile.am | 4 +--
tests/tools/perfdhcp/tests/Makefile.am | 4 +--
42 files changed, 108 insertions(+), 108 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 34b5155..64edfe1 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -61,8 +61,8 @@ 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/util/libb10util.la
+b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libb10util_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
diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am
index 2de01ff..946d7fe 100644
--- a/src/bin/auth/benchmarks/Makefile.am
+++ b/src/bin/auth/benchmarks/Makefile.am
@@ -27,7 +27,7 @@ query_bench_SOURCES += ${top_srcdir}/src/lib/datasrc/memory_datasrc.cc
nodist_query_bench_SOURCES = ../auth_messages.h ../auth_messages.cc
query_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
-query_bench_LDADD += $(top_builddir)/src/lib/util/libutil.la
+query_bench_LDADD += $(top_builddir)/src/lib/util/libb10util.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
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 84fd5fa..5b84534 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -60,7 +60,7 @@ 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/util/libb10util.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
@@ -70,7 +70,7 @@ 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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
run_unittests_LDADD += $(GTEST_LDADD)
run_unittests_LDADD += $(SQLITE_LIBS)
diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am
index a8f96c2..4200e3c 100644
--- a/src/bin/host/Makefile.am
+++ b/src/bin/host/Makefile.am
@@ -13,7 +13,7 @@ CLEANFILES = *.gcno *.gcda
bin_PROGRAMS = b10-host
b10_host_SOURCES = host.cc
b10_host_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
-b10_host_LDADD += $(top_builddir)/src/lib/util/libutil.la
+b10_host_LDADD += $(top_builddir)/src/lib/util/libb10util.la
b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
man_MANS = b10-host.1
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index 2bb3768..0e5c079 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -59,7 +59,7 @@ 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/util/libb10util.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
diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am
index af3fcd3..4254678 100644
--- a/src/bin/resolver/tests/Makefile.am
+++ b/src/bin/resolver/tests/Makefile.am
@@ -52,8 +52,8 @@ 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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
# Note the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS
diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am
index 8494114..19eeae3 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/util/io/libb10util_io.la
b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
diff --git a/src/bin/sockcreator/tests/Makefile.am b/src/bin/sockcreator/tests/Makefile.am
index cc5959c..92e0b95 100644
--- a/src/bin/sockcreator/tests/Makefile.am
+++ b/src/bin/sockcreator/tests/Makefile.am
@@ -21,8 +21,8 @@ run_unittests_SOURCES += run_unittests.cc
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/unittests/libb10util_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libb10util_io.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/acl/Makefile.am b/src/lib/acl/Makefile.am
index 92b7869..8a3917c 100644
--- a/src/lib/acl/Makefile.am
+++ b/src/lib/acl/Makefile.am
@@ -14,7 +14,7 @@ libacl_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
+libacl_la_LIBADD += $(top_builddir)/src/lib/util/libb10util.la
# DNS specialized one
lib_LTLIBRARIES += libdnsacl.la
diff --git a/src/lib/acl/tests/Makefile.am b/src/lib/acl/tests/Makefile.am
index 6df91c7..587803c 100644
--- a/src/lib/acl/tests/Makefile.am
+++ b/src/lib/acl/tests/Makefile.am
@@ -30,9 +30,9 @@ 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/unittests/libb10util_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/util/libb10util.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
diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am
index a96a3e6..58cc8db 100644
--- a/src/lib/asiodns/tests/Makefile.am
+++ b/src/lib/asiodns/tests/Makefile.am
@@ -29,8 +29,8 @@ 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/util/unittests/libutil_unittests.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10util.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
diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am
index 39b098d..5af44b0 100644
--- a/src/lib/asiolink/tests/Makefile.am
+++ b/src/lib/asiolink/tests/Makefile.am
@@ -38,7 +38,7 @@ 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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
diff --git a/src/lib/bench/tests/Makefile.am b/src/lib/bench/tests/Makefile.am
index 8069559..1b99e62 100644
--- a/src/lib/bench/tests/Makefile.am
+++ b/src/lib/bench/tests/Makefile.am
@@ -19,8 +19,8 @@ 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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
endif
diff --git a/src/lib/cache/tests/Makefile.am b/src/lib/cache/tests/Makefile.am
index fe33d3c..f6ea6f5 100644
--- a/src/lib/cache/tests/Makefile.am
+++ b/src/lib/cache/tests/Makefile.am
@@ -54,9 +54,9 @@ 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/util/libb10util.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am
index b891628..6d63765 100644
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@ -32,7 +32,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
# 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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index 1d9bad8..5d146be 100644
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -30,7 +30,7 @@ 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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
endif
diff --git a/src/lib/cryptolink/tests/Makefile.am b/src/lib/cryptolink/tests/Makefile.am
index be2f4d6..79286e5 100644
--- a/src/lib/cryptolink/tests/Makefile.am
+++ b/src/lib/cryptolink/tests/Makefile.am
@@ -21,9 +21,9 @@ 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/util/libb10util.la
run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index e72fd71..b9446cb 100644
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -36,12 +36,12 @@ 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/util/libb10util.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/util/unittests/libutil_unittests.la
+common_ldadd += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
common_ldadd += $(GTEST_LDADD) $(SQLITE_LIBS)
# The general tests
diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index ec169a5..faff709 100644
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -35,7 +35,7 @@ EXTRA_DIST = README
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_LIBADD += $(top_builddir)/src/lib/util/libb10util.la
libdhcp___la_LDFLAGS = -no-undefined -version-info 2:0:0
if USE_CLANGPP
diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am
index 13e8458..3a5b24b 100644
--- a/src/lib/dhcp/tests/Makefile.am
+++ b/src/lib/dhcp/tests/Makefile.am
@@ -53,7 +53,7 @@ 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/util/libb10util.la
libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 2cd889d..38fa01a 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -129,7 +129,7 @@ libdns___la_CPPFLAGS = $(AM_CPPFLAGS)
# 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
+libdns___la_LIBADD += $(top_builddir)/src/lib/util/libb10util.la
nodist_libdns___include_HEADERS = rdataclass.h rrclass.h rrtype.h
nodist_libdns___la_SOURCES = rdataclass.cc rrparamregistry.cc
diff --git a/src/lib/dns/benchmarks/Makefile.am b/src/lib/dns/benchmarks/Makefile.am
index ff591cc..d646638 100644
--- a/src/lib/dns/benchmarks/Makefile.am
+++ b/src/lib/dns/benchmarks/Makefile.am
@@ -14,11 +14,11 @@ 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/util/libb10util.la
rdatarender_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.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/util/libb10util.la
message_renderer_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am
index 208c7ef..200c49f 100644
--- a/src/lib/dns/tests/Makefile.am
+++ b/src/lib/dns/tests/Makefile.am
@@ -75,8 +75,8 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
# 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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(BOTAN_LIBS) $(GTEST_LDADD)
endif
diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index fb3aed7..44a30d3 100644
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -47,5 +47,5 @@ if USE_CLANGPP
liblog_la_CXXFLAGS += -Wno-error
endif
liblog_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-liblog_la_LIBADD = $(LOG4CPLUS_LIBS) $(top_builddir)/src/lib/util/libutil.la
+liblog_la_LIBADD = $(LOG4CPLUS_LIBS) $(top_builddir)/src/lib/util/libb10util.la
liblog_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..bc09333 100644
--- a/src/lib/log/compiler/Makefile.am
+++ b/src/lib/log/compiler/Makefile.am
@@ -15,5 +15,5 @@ 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/util/libb10util.la
message_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 615f64b..35261ba 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -24,7 +24,7 @@ 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/util/libb10util.la
logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
logger_example_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
@@ -33,7 +33,7 @@ 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/util/libb10util.la
init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
init_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
@@ -43,7 +43,7 @@ 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/util/libb10util.la
logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
logger_lock_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
@@ -62,10 +62,10 @@ AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
AM_LDFLAGS += $(GTEST_LDFLAGS)
AM_LDADD += $(top_builddir)/src/lib/log/liblog.la
-AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
+AM_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
+AM_LDADD += $(top_builddir)/src/lib/util/libb10util.la
AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+AM_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
AM_LDADD += $(GTEST_LDADD)
# Set of unit tests for the general logging classes
diff --git a/src/lib/nsas/tests/Makefile.am b/src/lib/nsas/tests/Makefile.am
index 3557c82..f84ce0c 100644
--- a/src/lib/nsas/tests/Makefile.am
+++ b/src/lib/nsas/tests/Makefile.am
@@ -50,11 +50,11 @@ 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/util/libb10util.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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
diff --git a/src/lib/python/isc/util/cio/Makefile.am b/src/lib/python/isc/util/cio/Makefile.am
index 0a2e735..b86e19a 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/libb10util_io.la
socketsession_la_LIBADD += $(PYTHON_LIB)
# This is not installed, it helps locate the module during tests
diff --git a/src/lib/resolve/tests/Makefile.am b/src/lib/resolve/tests/Makefile.am
index 4ee3811..f766839 100644
--- a/src/lib/resolve/tests/Makefile.am
+++ b/src/lib/resolve/tests/Makefile.am
@@ -35,9 +35,9 @@ 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/util/libb10util.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
diff --git a/src/lib/server_common/Makefile.am b/src/lib/server_common/Makefile.am
index 6010316..74afdf5 100644
--- a/src/lib/server_common/Makefile.am
+++ b/src/lib/server_common/Makefile.am
@@ -31,7 +31,7 @@ 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
+libserver_common_la_LIBADD += $(top_builddir)/src/lib/util/io/libb10util_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 366c68e..115b765 100644
--- a/src/lib/server_common/tests/Makefile.am
+++ b/src/lib/server_common/tests/Makefile.am
@@ -44,10 +44,10 @@ 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/util/libb10util.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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_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/config/tests/libfake_session.la
diff --git a/src/lib/statistics/tests/Makefile.am b/src/lib/statistics/tests/Makefile.am
index c0f0295..e7b877b 100644
--- a/src/lib/statistics/tests/Makefile.am
+++ b/src/lib/statistics/tests/Makefile.am
@@ -30,7 +30,7 @@ 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/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 283ac72..8c5f9a9 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 += 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 = libb10util.la
+libb10util_la_SOURCES = filename.h filename.cc
+libb10util_la_SOURCES += locks.h lru_list.h
+libb10util_la_SOURCES += strutil.h strutil.cc
+libb10util_la_SOURCES += buffer.h io_utilities.h
+libb10util_la_SOURCES += time_utilities.h time_utilities.cc
+libb10util_la_SOURCES += interprocess_sync.h
+libb10util_la_SOURCES += interprocess_sync_file.h interprocess_sync_file.cc
+libb10util_la_SOURCES += interprocess_sync_null.h interprocess_sync_null.cc
+libb10util_la_SOURCES += range_utilities.h
+libb10util_la_SOURCES += hash/sha1.h hash/sha1.cc
+libb10util_la_SOURCES += encode/base16_from_binary.h
+libb10util_la_SOURCES += encode/base32hex.h encode/base64.h
+libb10util_la_SOURCES += encode/base32hex_from_binary.h
+libb10util_la_SOURCES += encode/base_n.cc encode/hex.h
+libb10util_la_SOURCES += encode/binary_from_base32hex.h
+libb10util_la_SOURCES += encode/binary_from_base16.h
+libb10util_la_SOURCES += random/qid_gen.h random/qid_gen.cc
+libb10util_la_SOURCES += random/random_number_generator.h
EXTRA_DIST = python/pycppwrapper_util.h
-libutil_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-libutil_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libb10util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
+libb10util_la_LDFLAGS = -no-undefined -version-info 1:0:0
CLEANFILES = *.gcno *.gcda
diff --git a/src/lib/util/io/Makefile.am b/src/lib/util/io/Makefile.am
index 1cb0ab9..d2cb6b8 100644
--- a/src/lib/util/io/Makefile.am
+++ b/src/lib/util/io/Makefile.am
@@ -3,21 +3,21 @@ 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 = libb10util_io.la
+libb10util_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
+libb10util_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
+libb10util_io_la_SOURCES += pktinfo_utilities.h
+libb10util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
CLEANFILES = *.gcno *.gcda
-pyexec_LTLIBRARIES = libutil_io_python.la
+pyexec_LTLIBRARIES = libb10util_io_python.la
# Python prefers .so, while some OSes (specifically MacOS) use a different
# 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_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
+libb10util_io_python_la_LDFLAGS = -module -avoid-version
+libb10util_io_python_la_SOURCES = fdshare_python.cc
+libb10util_io_python_la_LIBADD = libb10util_io.la
+libb10util_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
-libutil_io_python_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
+libb10util_io_python_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
diff --git a/src/lib/util/pyunittests/Makefile.am b/src/lib/util/pyunittests/Makefile.am
index 93b0748..b477791 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/libb10util.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 a7811d5..d75142a 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -44,10 +44,10 @@ 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/libb10util.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libb10util_io.la
run_unittests_LDADD += \
- $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+ $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
endif
diff --git a/src/lib/util/unittests/Makefile.am b/src/lib/util/unittests/Makefile.am
index 3007a83..e892cd3 100644
--- a/src/lib/util/unittests/Makefile.am
+++ b/src/lib/util/unittests/Makefile.am
@@ -1,26 +1,26 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CXXFLAGS = $(B10_CXXFLAGS)
-noinst_LTLIBRARIES = libutil_unittests.la
-libutil_unittests_la_SOURCES = fork.h fork.cc resolver.h
-libutil_unittests_la_SOURCES += newhook.h newhook.cc
-libutil_unittests_la_SOURCES += testdata.h testdata.cc
+noinst_LTLIBRARIES = libb10util_unittests.la
+libb10util_unittests_la_SOURCES = fork.h fork.cc resolver.h
+libb10util_unittests_la_SOURCES += newhook.h newhook.cc
+libb10util_unittests_la_SOURCES += testdata.h testdata.cc
if HAVE_GTEST
-libutil_unittests_la_SOURCES += resource.h resource.cc
-libutil_unittests_la_SOURCES += run_all.h run_all.cc
-libutil_unittests_la_SOURCES += textdata.h
+libb10util_unittests_la_SOURCES += resource.h resource.cc
+libb10util_unittests_la_SOURCES += run_all.h run_all.cc
+libb10util_unittests_la_SOURCES += textdata.h
endif
-# For now, this isn't needed for libutil_unittests
+# For now, this isn't needed for libb10util_unittests
EXTRA_DIST = mock_socketsession.h
-libutil_unittests_la_CPPFLAGS = $(AM_CPPFLAGS)
+libb10util_unittests_la_CPPFLAGS = $(AM_CPPFLAGS)
if HAVE_GTEST
-libutil_unittests_la_CPPFLAGS += $(GTEST_INCLUDES)
+libb10util_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
+libb10util_unittests_la_LIBADD = $(top_builddir)/src/lib/util/libb10util.la
+libb10util_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libb10util_io.la
+libb10util_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
CLEANFILES = *.gcno *.gcda
diff --git a/src/lib/xfr/Makefile.am b/src/lib/xfr/Makefile.am
index 3d7f60f..39b0aeb 100644
--- a/src/lib/xfr/Makefile.am
+++ b/src/lib/xfr/Makefile.am
@@ -14,4 +14,4 @@ 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
+libxfr_la_LIBADD = $(top_builddir)/src/lib/util/io/libb10util_io.la
diff --git a/src/lib/xfr/tests/Makefile.am b/src/lib/xfr/tests/Makefile.am
index d8f3933..5cf4b7a 100644
--- a/src/lib/xfr/tests/Makefile.am
+++ b/src/lib/xfr/tests/Makefile.am
@@ -20,7 +20,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/unittests/libb10util_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
endif
diff --git a/tests/tools/badpacket/Makefile.am b/tests/tools/badpacket/Makefile.am
index fcba404..7fa409d 100644
--- a/tests/tools/badpacket/Makefile.am
+++ b/tests/tools/badpacket/Makefile.am
@@ -29,5 +29,5 @@ 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/util/libb10util.la
badpacket_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
diff --git a/tests/tools/badpacket/tests/Makefile.am b/tests/tools/badpacket/tests/Makefile.am
index bf70669..26b33e4 100644
--- a/tests/tools/badpacket/tests/Makefile.am
+++ b/tests/tools/badpacket/tests/Makefile.am
@@ -27,9 +27,9 @@ 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/util/libb10util.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
endif
noinst_PROGRAMS = $(TESTS)
diff --git a/tests/tools/perfdhcp/tests/Makefile.am b/tests/tools/perfdhcp/tests/Makefile.am
index 21e5b46..b0a7503 100644
--- a/tests/tools/perfdhcp/tests/Makefile.am
+++ b/tests/tools/perfdhcp/tests/Makefile.am
@@ -36,11 +36,11 @@ 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/util/libb10util.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/unittests/libutil_unittests.la
+run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libb10util_unittests.la
endif
noinst_PROGRAMS = $(TESTS)
More information about the bind10-changes
mailing list