Browse Source

[2071] Add b10 prefix to libdatasrc.la

Mukund Sivaraman 12 years ago
parent
commit
bb894ca2c8

+ 1 - 1
src/bin/auth/Makefile.am

@@ -60,7 +60,7 @@ b10_auth_SOURCES += ${top_srcdir}/src/lib/datasrc/memory_datasrc.cc
 nodist_b10_auth_SOURCES = auth_messages.h auth_messages.cc
 EXTRA_DIST += auth_messages.mes
 
-b10_auth_LDADD =  $(top_builddir)/src/lib/datasrc/libdatasrc.la
+b10_auth_LDADD =  $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
 b10_auth_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
 b10_auth_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
 b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la

+ 1 - 1
src/bin/auth/benchmarks/Makefile.am

@@ -30,7 +30,7 @@ query_bench_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
 query_bench_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
 query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 query_bench_LDADD += $(top_builddir)/src/lib/bench/libb10-bench.la
-query_bench_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
+query_bench_LDADD += $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
 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

+ 1 - 1
src/bin/auth/tests/Makefile.am

@@ -65,7 +65,7 @@ nodist_run_unittests_SOURCES = ../auth_messages.h ../auth_messages.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(top_builddir)/src/lib/testutils/libb10-testutils.la
-run_unittests_LDADD +=  $(top_builddir)/src/lib/datasrc/libdatasrc.la
+run_unittests_LDADD +=  $(top_builddir)/src/lib/datasrc/libb10-datasrc.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/asiodns/libb10-asiodns.la

+ 28 - 28
src/lib/datasrc/Makefile.am

@@ -20,25 +20,25 @@ CLEANFILES = *.gcno *.gcda datasrc_messages.h datasrc_messages.cc
 CLEANFILES += datasrc_config.h
 CLEANFILES += static.zone
 
-lib_LTLIBRARIES = libdatasrc.la
-libdatasrc_la_SOURCES = data_source.h data_source.cc
-libdatasrc_la_SOURCES += static_datasrc.h static_datasrc.cc
-libdatasrc_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
-libdatasrc_la_SOURCES += query.h query.cc
-libdatasrc_la_SOURCES += cache.h cache.cc
-libdatasrc_la_SOURCES += rbnode_rrset.h
-libdatasrc_la_SOURCES += rbtree.h
-libdatasrc_la_SOURCES += zonetable.h zonetable.cc
-libdatasrc_la_SOURCES += zone.h zone_finder_context.cc
-libdatasrc_la_SOURCES += result.h
-libdatasrc_la_SOURCES += logger.h logger.cc
-libdatasrc_la_SOURCES += client.h iterator.h
-libdatasrc_la_SOURCES += database.h database.cc
-libdatasrc_la_SOURCES += factory.h factory.cc
-libdatasrc_la_SOURCES += client_list.h client_list.cc
-libdatasrc_la_SOURCES += memory_datasrc.h memory_datasrc.cc
-nodist_libdatasrc_la_SOURCES = datasrc_messages.h datasrc_messages.cc
-libdatasrc_la_LDFLAGS = -no-undefined -version-info 1:0:1
+lib_LTLIBRARIES = libb10-datasrc.la
+libb10_datasrc_la_SOURCES = data_source.h data_source.cc
+libb10_datasrc_la_SOURCES += static_datasrc.h static_datasrc.cc
+libb10_datasrc_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
+libb10_datasrc_la_SOURCES += query.h query.cc
+libb10_datasrc_la_SOURCES += cache.h cache.cc
+libb10_datasrc_la_SOURCES += rbnode_rrset.h
+libb10_datasrc_la_SOURCES += rbtree.h
+libb10_datasrc_la_SOURCES += zonetable.h zonetable.cc
+libb10_datasrc_la_SOURCES += zone.h zone_finder_context.cc
+libb10_datasrc_la_SOURCES += result.h
+libb10_datasrc_la_SOURCES += logger.h logger.cc
+libb10_datasrc_la_SOURCES += client.h iterator.h
+libb10_datasrc_la_SOURCES += database.h database.cc
+libb10_datasrc_la_SOURCES += factory.h factory.cc
+libb10_datasrc_la_SOURCES += client_list.h client_list.cc
+libb10_datasrc_la_SOURCES += memory_datasrc.h memory_datasrc.cc
+nodist_libb10_datasrc_la_SOURCES = datasrc_messages.h datasrc_messages.cc
+libb10_datasrc_la_LDFLAGS = -no-undefined -version-info 1:0:1
 
 pkglib_LTLIBRARIES =  sqlite3_ds.la memory_ds.la static_ds.la
 
@@ -47,25 +47,25 @@ sqlite3_ds_la_SOURCES += sqlite3_accessor_link.cc
 sqlite3_ds_la_LDFLAGS = -module -avoid-version
 sqlite3_ds_la_LDFLAGS += -no-undefined -version-info 1:0:0
 sqlite3_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-sqlite3_ds_la_LIBADD += libdatasrc.la
+sqlite3_ds_la_LIBADD += libb10-datasrc.la
 sqlite3_ds_la_LIBADD += $(SQLITE_LIBS)
 
 memory_ds_la_SOURCES = memory_datasrc_link.cc
 memory_ds_la_LDFLAGS = -module -avoid-version
 memory_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-memory_ds_la_LIBADD += libdatasrc.la
+memory_ds_la_LIBADD += libb10-datasrc.la
 
 static_ds_la_SOURCES = static_datasrc_link.cc
 static_ds_la_LDFLAGS = -module -avoid-version
 static_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-static_ds_la_LIBADD += libdatasrc.la
+static_ds_la_LIBADD += libb10-datasrc.la
 
-libdatasrc_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libdatasrc_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
-libdatasrc_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
-libdatasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
-libdatasrc_la_LIBADD += memory/libdatasrc_memory.la # convenience library
-libdatasrc_la_LIBADD += $(SQLITE_LIBS)
+libb10_datasrc_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libb10_datasrc_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
+libb10_datasrc_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
+libb10_datasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+libb10_datasrc_la_LIBADD += memory/libdatasrc_memory.la # convenience library
+libb10_datasrc_la_LIBADD += $(SQLITE_LIBS)
 
 BUILT_SOURCES = datasrc_config.h datasrc_messages.h datasrc_messages.cc
 datasrc_messages.h datasrc_messages.cc: Makefile datasrc_messages.mes

+ 1 - 1
src/lib/datasrc/tests/Makefile.am

@@ -34,7 +34,7 @@ common_sources = run_unittests.cc
 common_sources += $(top_srcdir)/src/lib/dns/tests/unittest_util.h
 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/datasrc/libb10-datasrc.la
 common_ldadd += $(top_builddir)/src/lib/dns/libb10-dns++.la
 common_ldadd += $(top_builddir)/src/lib/util/libb10-util.la
 common_ldadd += $(top_builddir)/src/lib/log/libb10-log.la

+ 1 - 1
src/lib/python/isc/datasrc/Makefile.am

@@ -25,7 +25,7 @@ datasrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
 datasrc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
 datasrc_la_LDFLAGS = $(PYTHON_LDFLAGS)
 datasrc_la_LDFLAGS += -module -avoid-version
-datasrc_la_LIBADD = $(top_builddir)/src/lib/datasrc/libdatasrc.la
+datasrc_la_LIBADD = $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
 datasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 datasrc_la_LIBADD += $(top_builddir)/src/lib/dns/python/libpydnspp.la
 datasrc_la_LIBADD += $(PYTHON_LIB)