From: Mukund Sivaraman Date: Thu, 2 Aug 2012 04:05:11 +0000 (+0530) Subject: [2071] Add b10 prefix to libacl.la X-Git-Tag: trac2351_base~141^2~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76232f728e2555bfa44edd558fe34911636e3e06;p=thirdparty%2Fkea.git [2071] Add b10 prefix to libacl.la --- diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am index e50263d100..3e65f11b94 100644 --- 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 7c2b34a25e..ccedbd06b8 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/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 47aa784ea2..59119485d5 100644 --- 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 b9a0c8104a..9b7ac6c25c 100644 --- 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 86d915734d..b84e3d382b 100644 --- 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 0c1cefbf24..dfa7b933ae 100644 --- 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