[2071] Add b10 prefix to libacl.la

diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am
index e50263d10087bc250b0a08f3f8eeab762f06e53c..3e65f11b9403e6ab38870bfe0934e76d2cbd0ee8 100644 (file)
--- a/src/bin/resolver/tests/Makefile.am
+++ b/src/bin/resolver/tests/Makefile.am
@@ -51,7 +51,7 @@ 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/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
 

diff --git a/src/lib/acl/Makefile.am b/src/lib/acl/Makefile.am
index 7c2b34a25ef2baeab2be3b7ed3e33b45638ce229..ccedbd06b875307fd9b67ddb5ce7af30be6bbc98 100644 (file)
--- 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/libb10-exceptions.la
-libacl_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-libacl_la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.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
 
 libdnsacl_la_SOURCES = dns.h dns.cc dnsname_check.h
 
-libdnsacl_la_LIBADD = libacl.la
+libdnsacl_la_LIBADD = libb10-acl.la
 libdnsacl_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 47aa784ea294b56da137816bf4ec2c74195a9d33..59119485d5f313870d4bb685d7be06edfece182e 100644 (file)
--- a/src/lib/acl/tests/Makefile.am
+++ b/src/lib/acl/tests/Makefile.am
@@ -31,7 +31,7 @@ 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/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

diff --git a/src/lib/python/isc/acl/Makefile.am b/src/lib/python/isc/acl/Makefile.am
index b9a0c8104a12db499a077e3c4914cd5c08fe097a..9b7ac6c25c0919c21ac0c56f32fd0905ef8a7c5c 100644 (file)
--- a/src/lib/python/isc/acl/Makefile.am
+++ b/src/lib/python/isc/acl/Makefile.am
@@ -27,7 +27,7 @@ _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

diff --git a/src/lib/server_common/Makefile.am b/src/lib/server_common/Makefile.am
index 86d915734de02f82657f2822bdc805019f591250..b84e3d382b3fbda29ce7c5d4ada98200ad8ebf1c 100644 (file)
--- a/src/lib/server_common/Makefile.am
+++ b/src/lib/server_common/Makefile.am
@@ -29,7 +29,7 @@ libserver_common_la_LIBADD += $(top_builddir)/src/lib/asiolink/libasiolink.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/libacl.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
 BUILT_SOURCES = server_common_messages.h server_common_messages.cc

diff --git a/src/lib/server_common/tests/Makefile.am b/src/lib/server_common/tests/Makefile.am
index 0c1cefbf24758fc0f3941266c3e1769e9e144ab5..dfa7b933aee5f5a83ca127ff6686336217563d81 100644 (file)
--- a/src/lib/server_common/tests/Makefile.am
+++ b/src/lib/server_common/tests/Makefile.am
@@ -43,7 +43,7 @@ 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/libb10-cc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
-run_unittests_LDADD += $(top_builddir)/src/lib/acl/libacl.la
+run_unittests_LDADD += $(top_builddir)/src/lib/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