Browse Source

[2071] Add b10 prefix to libresolve.la

Mukund Sivaraman 12 years ago
parent
commit
4d130eec2a

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

@@ -69,7 +69,7 @@ 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/libb10-cache.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la
+b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libb10-resolve.la
 b10_resolver_LDFLAGS = -pthread
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir

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

@@ -48,7 +48,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/resolve/libresolve.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
 run_unittests_LDADD += $(top_builddir)/src/lib/acl/libb10-acl.la

+ 15 - 15
src/lib/resolve/Makefile.am

@@ -21,30 +21,30 @@ BUILT_SOURCES = resolve_messages.h resolve_messages.cc
 
 CLEANFILES = *.gcno *.gcda resolve_messages.cc resolve_messages.h
 
-lib_LTLIBRARIES = libresolve.la
-libresolve_la_SOURCES = resolve.h resolve.cc
-libresolve_la_SOURCES += resolve_log.h resolve_log.cc
-libresolve_la_SOURCES += resolver_interface.h
-libresolve_la_SOURCES += resolver_callback.h resolver_callback.cc
-libresolve_la_SOURCES += response_classifier.cc response_classifier.h
-libresolve_la_SOURCES += recursive_query.cc recursive_query.h
+lib_LTLIBRARIES = libb10-resolve.la
+libb10_resolve_la_SOURCES = resolve.h resolve.cc
+libb10_resolve_la_SOURCES += resolve_log.h resolve_log.cc
+libb10_resolve_la_SOURCES += resolver_interface.h
+libb10_resolve_la_SOURCES += resolver_callback.h resolver_callback.cc
+libb10_resolve_la_SOURCES += response_classifier.cc response_classifier.h
+libb10_resolve_la_SOURCES += recursive_query.cc recursive_query.h
 
-nodist_libresolve_la_SOURCES = resolve_messages.h resolve_messages.cc
+nodist_libb10_resolve_la_SOURCES = resolve_messages.h resolve_messages.cc
 
-libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
-libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-libresolve_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
-libresolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
+libb10_resolve_la_LIBADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
+libb10_resolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+libb10_resolve_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
+libb10_resolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
 
 # The message file should be in the distribution.
 EXTRA_DIST = resolve_messages.mes
 
 # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
 # B10_CXXFLAGS)
-libresolve_la_CXXFLAGS = $(AM_CXXFLAGS)
+libb10_resolve_la_CXXFLAGS = $(AM_CXXFLAGS)
 if USE_CLANGPP
 # For clang++, we need to turn off -Werror completely.
-libresolve_la_CXXFLAGS += -Wno-error
+libb10_resolve_la_CXXFLAGS += -Wno-error
 endif
-libresolve_la_CPPFLAGS = $(AM_CPPFLAGS)
+libb10_resolve_la_CPPFLAGS = $(AM_CPPFLAGS)
 

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

@@ -33,7 +33,7 @@ run_unittests_LDADD +=  $(top_builddir)/src/lib/nsas/libb10-nsas.la
 run_unittests_LDADD +=  $(top_builddir)/src/lib/cache/libb10-cache.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/resolve/libresolve.la
+run_unittests_LDADD +=  $(top_builddir)/src/lib/resolve/libb10-resolve.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/log/libb10-log.la