From: Mukund Sivaraman Date: Thu, 2 Aug 2012 04:14:49 +0000 (+0530) Subject: [2071] Add b10 prefix to libnsas.la X-Git-Tag: trac2351_base~141^2~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16fa1ecec88a29e4cf8e974950a90ea400dd300b;p=thirdparty%2Fkea.git [2071] Add b10 prefix to libnsas.la --- diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am index 561a96944d..6a4175861b 100644 --- a/src/bin/auth/benchmarks/Makefile.am +++ b/src/bin/auth/benchmarks/Makefile.am @@ -35,7 +35,7 @@ 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/libnsas.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/asiodns/libb10-asiodns.la diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am index 89a18cd3c8..245d252898 100644 --- a/src/bin/auth/tests/Makefile.am +++ b/src/bin/auth/tests/Makefile.am @@ -76,7 +76,7 @@ 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/nsas/libnsas.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/config/tests/libfake_session.la diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am index 2584d0df41..125f981ac3 100644 --- a/src/bin/resolver/Makefile.am +++ b/src/bin/resolver/Makefile.am @@ -68,7 +68,7 @@ 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/cache/libcache.la -b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la +b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la b10_resolver_LDFLAGS = -pthread diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am index ec06ad73b3..929d394390 100644 --- a/src/bin/resolver/tests/Makefile.am +++ b/src/bin/resolver/tests/Makefile.am @@ -50,7 +50,7 @@ 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/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/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 diff --git a/src/lib/cache/tests/Makefile.am b/src/lib/cache/tests/Makefile.am index a3a2f2fb12..b27e6b8cdb 100644 --- a/src/lib/cache/tests/Makefile.am +++ b/src/lib/cache/tests/Makefile.am @@ -52,7 +52,7 @@ run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la -run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.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 diff --git a/src/lib/nsas/Makefile.am b/src/lib/nsas/Makefile.am index 663afbad85..eb8c0c3d4a 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 fab4fbbce8..1b89cb8efe 100644 --- a/src/lib/nsas/tests/Makefile.am +++ b/src/lib/nsas/tests/Makefile.am @@ -49,7 +49,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/nsas/libnsas.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 diff --git a/src/lib/resolve/tests/Makefile.am b/src/lib/resolve/tests/Makefile.am index 9f9547731a..c918045d0d 100644 --- a/src/lib/resolve/tests/Makefile.am +++ b/src/lib/resolve/tests/Makefile.am @@ -29,7 +29,7 @@ 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/nsas/libb10-nsas.la run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la