diff options
Diffstat (limited to 'src/lib')
33 files changed, 43 insertions, 43 deletions
diff --git a/src/lib/acl/Makefile.am b/src/lib/acl/Makefile.am index 92b7869742..0fb3aa4806 100644 --- a/src/lib/acl/Makefile.am +++ b/src/lib/acl/Makefile.am @@ -12,7 +12,7 @@ libacl_la_SOURCES += ip_check.h ip_check.cc libacl_la_SOURCES += logic_check.h libacl_la_SOURCES += loader.h loader.cc -libacl_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la +libacl_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la libacl_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la libacl_la_LIBADD += $(top_builddir)/src/lib/util/libutil.la diff --git a/src/lib/acl/tests/Makefile.am b/src/lib/acl/tests/Makefile.am index 9183bfe5b8..1792dee197 100644 --- a/src/lib/acl/tests/Makefile.am +++ b/src/lib/acl/tests/Makefile.am @@ -36,7 +36,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la endif diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am index 1e186456ee..b3b0d91dbe 100644 --- a/src/lib/asiodns/tests/Makefile.am +++ b/src/lib/asiodns/tests/Makefile.am @@ -33,7 +33,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests. run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am index d0f859a949..577f8a2996 100644 --- a/src/lib/asiolink/tests/Makefile.am +++ b/src/lib/asiolink/tests/Makefile.am @@ -39,7 +39,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDADD = $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(GTEST_LDADD) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) diff --git a/src/lib/bench/example/Makefile.am b/src/lib/bench/example/Makefile.am index 8257b3576d..51e79e52be 100644 --- a/src/lib/bench/example/Makefile.am +++ b/src/lib/bench/example/Makefile.am @@ -5,5 +5,5 @@ CLEANFILES = *.gcno *.gcda noinst_PROGRAMS = search_bench search_bench_SOURCES = search_bench.cc -search_bench_LDADD = $(top_builddir)/src/lib/exceptions/libexceptions.la +search_bench_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la diff --git a/src/lib/bench/tests/Makefile.am b/src/lib/bench/tests/Makefile.am index fc5c3ae583..c678357f5c 100644 --- a/src/lib/bench/tests/Makefile.am +++ b/src/lib/bench/tests/Makefile.am @@ -21,7 +21,7 @@ run_unittests_LDADD = $(top_builddir)/src/lib/bench/libbench.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(GTEST_LDADD) endif diff --git a/src/lib/cache/tests/Makefile.am b/src/lib/cache/tests/Makefile.am index 4e473145db..c4bf5b0aff 100644 --- a/src/lib/cache/tests/Makefile.am +++ b/src/lib/cache/tests/Makefile.am @@ -57,7 +57,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am index 7291abe82b..ffc2d72d52 100644 --- a/src/lib/cc/tests/Makefile.am +++ b/src/lib/cc/tests/Makefile.am @@ -33,7 +33,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDADD = $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(GTEST_LDADD) endif diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am index 518d4979c1..8fe275d26e 100644 --- a/src/lib/config/Makefile.am +++ b/src/lib/config/Makefile.am @@ -18,7 +18,7 @@ libcfgclient_la_SOURCES += ccsession.cc ccsession.h libcfgclient_la_SOURCES += config_log.h config_log.cc libcfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libcc.la -libcfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +libcfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la libcfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1 diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am index ac1a547953..fc512b2d7f 100644 --- a/src/lib/config/tests/Makefile.am +++ b/src/lib/config/tests/Makefile.am @@ -28,7 +28,7 @@ run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD += libfake_session.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la diff --git a/src/lib/cryptolink/tests/Makefile.am b/src/lib/cryptolink/tests/Makefile.am index 29b30cdac0..eee0f8e5b3 100644 --- a/src/lib/cryptolink/tests/Makefile.am +++ b/src/lib/cryptolink/tests/Makefile.am @@ -24,7 +24,7 @@ run_unittests_LDADD = $(GTEST_LDADD) $(BOTAN_LIBS) run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am index defc7aca65..fc78f338cc 100644 --- a/src/lib/datasrc/Makefile.am +++ b/src/lib/datasrc/Makefile.am @@ -46,21 +46,21 @@ sqlite3_ds_la_SOURCES = sqlite3_accessor.h sqlite3_accessor.cc 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/libexceptions.la +sqlite3_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la sqlite3_ds_la_LIBADD += libdatasrc.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/libexceptions.la +memory_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la memory_ds_la_LIBADD += libdatasrc.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/libexceptions.la +static_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la static_ds_la_LIBADD += libdatasrc.la -libdatasrc_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la +libdatasrc_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la libdatasrc_la_LIBADD += $(top_builddir)/src/lib/dns/libdns++.la libdatasrc_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la libdatasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la diff --git a/src/lib/datasrc/memory/tests/Makefile.am b/src/lib/datasrc/memory/tests/Makefile.am index 473bff5900..37b7879ff4 100644 --- a/src/lib/datasrc/memory/tests/Makefile.am +++ b/src/lib/datasrc/memory/tests/Makefile.am @@ -26,7 +26,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDADD = $(builddir)/../libdatasrc_memory.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(GTEST_LDADD) endif diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am index 5db12ea0a6..bd945eefed 100644 --- a/src/lib/datasrc/tests/Makefile.am +++ b/src/lib/datasrc/tests/Makefile.am @@ -38,7 +38,7 @@ common_ldadd = $(top_builddir)/src/lib/datasrc/libdatasrc.la common_ldadd += $(top_builddir)/src/lib/dns/libdns++.la common_ldadd += $(top_builddir)/src/lib/util/libutil.la common_ldadd += $(top_builddir)/src/lib/log/liblog.la -common_ldadd += $(top_builddir)/src/lib/exceptions/libexceptions.la +common_ldadd += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la common_ldadd += $(top_builddir)/src/lib/cc/libcc.la common_ldadd += $(top_builddir)/src/lib/testutils/libtestutils.la common_ldadd += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am index 46225e479a..0b1690ebc4 100644 --- a/src/lib/dhcp/tests/Makefile.am +++ b/src/lib/dhcp/tests/Makefile.am @@ -55,7 +55,7 @@ libdhcp___unittests_LDADD = $(GTEST_LDADD) libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la -libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/dns/benchmarks/Makefile.am b/src/lib/dns/benchmarks/Makefile.am index ff591cc68d..be676a6965 100644 --- a/src/lib/dns/benchmarks/Makefile.am +++ b/src/lib/dns/benchmarks/Makefile.am @@ -15,10 +15,10 @@ rdatarender_bench_SOURCES = rdatarender_bench.cc rdatarender_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la rdatarender_bench_LDADD += $(top_builddir)/src/lib/util/libutil.la -rdatarender_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +rdatarender_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la message_renderer_bench_SOURCES = message_renderer_bench.cc message_renderer_bench_SOURCES += oldmessagerenderer.h oldmessagerenderer.cc message_renderer_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la message_renderer_bench_LDADD += $(top_builddir)/src/lib/util/libutil.la -message_renderer_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +message_renderer_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la diff --git a/src/lib/dns/python/Makefile.am b/src/lib/dns/python/Makefile.am index 28466596ed..ad93ee1ce3 100644 --- a/src/lib/dns/python/Makefile.am +++ b/src/lib/dns/python/Makefile.am @@ -48,6 +48,6 @@ EXTRA_DIST += nsec3hash_python_inc.cc # suffix for dynamic objects. -module is necessary to work this around. pydnspp_la_LDFLAGS += -module -avoid-version pydnspp_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la -pydnspp_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +pydnspp_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la pydnspp_la_LIBADD += libpydnspp.la pydnspp_la_LIBADD += $(PYTHON_LIB) diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am index db2a8947b5..4558681e90 100644 --- a/src/lib/dns/tests/Makefile.am +++ b/src/lib/dns/tests/Makefile.am @@ -77,7 +77,7 @@ run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS) run_unittests_LDADD = $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(BOTAN_LIBS) $(GTEST_LDADD) endif diff --git a/src/lib/exceptions/Makefile.am b/src/lib/exceptions/Makefile.am index 1d0ce2d4d9..aa7d6cdb9c 100644 --- a/src/lib/exceptions/Makefile.am +++ b/src/lib/exceptions/Makefile.am @@ -3,10 +3,10 @@ SUBDIRS = . tests AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CXXFLAGS=$(B10_CXXFLAGS) -lib_LTLIBRARIES = libexceptions.la -libexceptions_la_SOURCES = exceptions.h exceptions.cc +lib_LTLIBRARIES = libb10-exceptions.la +libb10_exceptions_la_SOURCES = exceptions.h exceptions.cc CLEANFILES = *.gcno *.gcda -libexceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions -libexceptions_include_HEADERS = exceptions.h +libb10_exceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions +libb10_exceptions_include_HEADERS = exceptions.h diff --git a/src/lib/exceptions/tests/Makefile.am b/src/lib/exceptions/tests/Makefile.am index 1e313530bd..83b9765044 100644 --- a/src/lib/exceptions/tests/Makefile.am +++ b/src/lib/exceptions/tests/Makefile.am @@ -20,7 +20,7 @@ run_unittests_SOURCES += exceptions_unittest.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(GTEST_LDFLAGS) run_unittests_LDADD = $(GTEST_LDADD) -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/log/compiler/Makefile.am b/src/lib/log/compiler/Makefile.am index 84cd4f6e28..99196b0503 100644 --- a/src/lib/log/compiler/Makefile.am +++ b/src/lib/log/compiler/Makefile.am @@ -16,4 +16,4 @@ noinst_PROGRAMS = message message_SOURCES = message.cc message_LDADD = $(top_builddir)/src/lib/log/liblog.la message_LDADD += $(top_builddir)/src/lib/util/libutil.la -message_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +message_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am index aac3914d22..dc1d174874 100644 --- a/src/lib/log/tests/Makefile.am +++ b/src/lib/log/tests/Makefile.am @@ -25,7 +25,7 @@ logger_example_CPPFLAGS = $(AM_CPPFLAGS) logger_example_LDFLAGS = $(AM_LDFLAGS) logger_example_LDADD = $(top_builddir)/src/lib/log/liblog.la logger_example_LDADD += $(top_builddir)/src/lib/util/libutil.la -logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la logger_example_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS) noinst_PROGRAMS += init_logger_test @@ -34,7 +34,7 @@ init_logger_test_CPPFLAGS = $(AM_CPPFLAGS) init_logger_test_LDFLAGS = $(AM_LDFLAGS) init_logger_test_LDADD = $(top_builddir)/src/lib/log/liblog.la init_logger_test_LDADD += $(top_builddir)/src/lib/util/libutil.la -init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la init_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS) noinst_PROGRAMS += logger_lock_test @@ -44,7 +44,7 @@ logger_lock_test_CPPFLAGS = $(AM_CPPFLAGS) logger_lock_test_LDFLAGS = $(AM_LDFLAGS) logger_lock_test_LDADD = $(top_builddir)/src/lib/log/liblog.la logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libutil.la -logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la logger_lock_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS) TESTS_ENVIRONMENT = \ @@ -64,7 +64,7 @@ AM_LDFLAGS += $(GTEST_LDFLAGS) AM_LDADD += $(top_builddir)/src/lib/util/libutil.la AM_LDADD += $(top_builddir)/src/lib/log/liblog.la AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +AM_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la AM_LDADD += $(GTEST_LDADD) diff --git a/src/lib/nsas/tests/Makefile.am b/src/lib/nsas/tests/Makefile.am index bc0397883c..5d65d0dbfe 100644 --- a/src/lib/nsas/tests/Makefile.am +++ b/src/lib/nsas/tests/Makefile.am @@ -55,7 +55,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la endif noinst_PROGRAMS = $(TESTS) diff --git a/src/lib/python/isc/log/Makefile.am b/src/lib/python/isc/log/Makefile.am index 3658c1766c..407948e3d7 100644 --- a/src/lib/python/isc/log/Makefile.am +++ b/src/lib/python/isc/log/Makefile.am @@ -17,7 +17,7 @@ log_la_LDFLAGS += -module -avoid-version log_la_LIBADD = $(top_builddir)/src/lib/log/liblog.la log_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la log_la_LIBADD += $(top_builddir)/src/lib/config/libcfgclient.la -log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la log_la_LIBADD += $(PYTHON_LIB) # This is not installed, it helps locate the module during tests diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am index 4b818620af..fd86b6dd4d 100644 --- a/src/lib/resolve/Makefile.am +++ b/src/lib/resolve/Makefile.am @@ -32,7 +32,7 @@ libresolve_la_SOURCES += recursive_query.cc recursive_query.h nodist_libresolve_la_SOURCES = resolve_messages.h resolve_messages.cc libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la -libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la libresolve_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la libresolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libasiodns.la diff --git a/src/lib/resolve/tests/Makefile.am b/src/lib/resolve/tests/Makefile.am index 97afe5c7b7..e703862ae9 100644 --- a/src/lib/resolve/tests/Makefile.am +++ b/src/lib/resolve/tests/Makefile.am @@ -38,7 +38,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la endif diff --git a/src/lib/server_common/Makefile.am b/src/lib/server_common/Makefile.am index 60103165b4..1bbb15f343 100644 --- a/src/lib/server_common/Makefile.am +++ b/src/lib/server_common/Makefile.am @@ -24,7 +24,7 @@ libserver_common_la_SOURCES += logger.h logger.cc libserver_common_la_SOURCES += socket_request.h socket_request.cc nodist_libserver_common_la_SOURCES = server_common_messages.h nodist_libserver_common_la_SOURCES += server_common_messages.cc -libserver_common_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la +libserver_common_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la libserver_common_la_LIBADD += $(top_builddir)/src/lib/asiolink/libasiolink.la libserver_common_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la libserver_common_la_LIBADD += $(top_builddir)/src/lib/config/libcfgclient.la diff --git a/src/lib/server_common/tests/Makefile.am b/src/lib/server_common/tests/Makefile.am index d6498f13fc..cd989959f5 100644 --- a/src/lib/server_common/tests/Makefile.am +++ b/src/lib/server_common/tests/Makefile.am @@ -48,7 +48,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la run_unittests_LDADD += $(top_builddir)/src/lib/config/tests/libfake_session.la endif diff --git a/src/lib/statistics/tests/Makefile.am b/src/lib/statistics/tests/Makefile.am index c6e7cb825e..4a14743c29 100644 --- a/src/lib/statistics/tests/Makefile.am +++ b/src/lib/statistics/tests/Makefile.am @@ -31,7 +31,7 @@ run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am index b135ffc3fa..a687f5159b 100644 --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am @@ -31,5 +31,5 @@ libutil_la_SOURCES += random/random_number_generator.h EXTRA_DIST = python/pycppwrapper_util.h -libutil_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la +libutil_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la CLEANFILES = *.gcno *.gcda diff --git a/src/lib/util/io/Makefile.am b/src/lib/util/io/Makefile.am index 1cb0ab902b..e8c01abbb8 100644 --- a/src/lib/util/io/Makefile.am +++ b/src/lib/util/io/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = libutil_io.la libutil_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc libutil_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h libutil_io_la_SOURCES += pktinfo_utilities.h -libutil_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la +libutil_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la CLEANFILES = *.gcno *.gcda diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am index 97ee77d3d1..a6e1fa8350 100644 --- a/src/lib/util/tests/Makefile.am +++ b/src/lib/util/tests/Makefile.am @@ -49,7 +49,7 @@ run_unittests_LDADD = $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la run_unittests_LDADD += \ $(top_builddir)/src/lib/util/unittests/libutil_unittests.la -run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la run_unittests_LDADD += $(GTEST_LDADD) endif diff --git a/src/lib/util/unittests/Makefile.am b/src/lib/util/unittests/Makefile.am index 39fbf88750..38d0b8a5ba 100644 --- a/src/lib/util/unittests/Makefile.am +++ b/src/lib/util/unittests/Makefile.am @@ -22,6 +22,6 @@ endif libutil_unittests_la_LIBADD = $(top_builddir)/src/lib/util/libutil.la libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libutil_io.la -libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la CLEANFILES = *.gcno *.gcda |