7 files changed, 22 insertions, 22 deletions
diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 204b15789f..4342aef93b 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -71,7 +71,7 @@ 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/libserver_common.la
+b10_auth_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
 b10_auth_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
 b10_auth_LDADD += $(SQLITE_LIBS)
 
diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am
index 7da2065950..8c70e99b73 100644
--- a/src/bin/auth/benchmarks/Makefile.am
+++ b/src/bin/auth/benchmarks/Makefile.am
@@ -37,7 +37,7 @@ 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/libserver_common.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/libstatistics.la
 query_bench_LDADD += $(SQLITE_LIBS)
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 8e6b6cb4c5..46c5cb6ab9 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -75,7 +75,7 @@ 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/libserver_common.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
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index fa798a1922..c31d37877f 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -66,7 +66,7 @@ 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/libserver_common.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
diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am
index a4bfcba13b..636c88c1eb 100644
--- a/src/bin/resolver/tests/Makefile.am
+++ b/src/bin/resolver/tests/Makefile.am
@@ -47,7 +47,7 @@ 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/libserver_common.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
diff --git a/src/lib/server_common/Makefile.am b/src/lib/server_common/Makefile.am
index eb64851307..5793db72d3 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/libb10-exceptions.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/acl/libb10-acl.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
-libserver_common_la_LIBADD += $(top_builddir)/src/lib/util/io/libutil_io.la
+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/libutil_io.la
 BUILT_SOURCES = server_common_messages.h server_common_messages.cc
 server_common_messages.h server_common_messages.cc: server_common_messages.mes
 	$(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 f56a63644b..6e03f70582 100644
--- a/src/lib/server_common/tests/Makefile.am
+++ b/src/lib/server_common/tests/Makefile.am
@@ -38,7 +38,7 @@ 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/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