Commit a9cbbc21 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

[2071] Add b10 prefix to libexceptions.la

parent 4f42de9d
...@@ -66,7 +66,7 @@ b10_auth_LDADD += $(top_builddir)/src/lib/util/libutil.la ...@@ -66,7 +66,7 @@ b10_auth_LDADD += $(top_builddir)/src/lib/util/libutil.la
b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la
b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la
b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la b10_auth_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_auth_LDADD += $(top_builddir)/src/lib/log/liblog.la b10_auth_LDADD += $(top_builddir)/src/lib/log/liblog.la
......
...@@ -28,7 +28,7 @@ nodist_query_bench_SOURCES = ../auth_messages.h ../auth_messages.cc ...@@ -28,7 +28,7 @@ nodist_query_bench_SOURCES = ../auth_messages.h ../auth_messages.cc
query_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la query_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
query_bench_LDADD += $(top_builddir)/src/lib/util/libutil.la query_bench_LDADD += $(top_builddir)/src/lib/util/libutil.la
query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
query_bench_LDADD += $(top_builddir)/src/lib/bench/libbench.la query_bench_LDADD += $(top_builddir)/src/lib/bench/libbench.la
query_bench_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la query_bench_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
query_bench_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la query_bench_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
......
...@@ -72,7 +72,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la ...@@ -72,7 +72,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.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/xfr/libxfr.la run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
......
...@@ -40,7 +40,7 @@ b10_dhcp4_CXXFLAGS = -Wno-unused-parameter ...@@ -40,7 +40,7 @@ b10_dhcp4_CXXFLAGS = -Wno-unused-parameter
endif endif
b10_dhcp4_LDADD = $(top_builddir)/src/lib/dhcp/libdhcp++.la b10_dhcp4_LDADD = $(top_builddir)/src/lib/dhcp/libdhcp++.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/liblog.la b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/liblog.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
......
...@@ -62,7 +62,7 @@ dhcp4_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) ...@@ -62,7 +62,7 @@ dhcp4_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
dhcp4_unittests_LDADD = $(GTEST_LDADD) dhcp4_unittests_LDADD = $(GTEST_LDADD)
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
......
...@@ -40,7 +40,7 @@ if USE_CLANGPP ...@@ -40,7 +40,7 @@ if USE_CLANGPP
b10_dhcp6_CXXFLAGS = -Wno-unused-parameter b10_dhcp6_CXXFLAGS = -Wno-unused-parameter
endif endif
b10_dhcp6_LDADD = $(top_builddir)/src/lib/exceptions/libexceptions.la b10_dhcp6_LDADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la b10_dhcp6_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/liblog.la b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/liblog.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
......
...@@ -58,7 +58,7 @@ dhcp6_unittests_LDADD = $(GTEST_LDADD) ...@@ -58,7 +58,7 @@ dhcp6_unittests_LDADD = $(GTEST_LDADD)
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libdhcp++.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
endif endif
......
...@@ -14,7 +14,7 @@ bin_PROGRAMS = b10-host ...@@ -14,7 +14,7 @@ bin_PROGRAMS = b10-host
b10_host_SOURCES = host.cc b10_host_SOURCES = host.cc
b10_host_LDADD = $(top_builddir)/src/lib/dns/libdns++.la b10_host_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
b10_host_LDADD += $(top_builddir)/src/lib/util/libutil.la b10_host_LDADD += $(top_builddir)/src/lib/util/libutil.la
b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
man_MANS = b10-host.1 man_MANS = b10-host.1
EXTRA_DIST = $(man_MANS) b10-host.xml EXTRA_DIST = $(man_MANS) b10-host.xml
......
...@@ -61,7 +61,7 @@ b10_resolver_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la ...@@ -61,7 +61,7 @@ b10_resolver_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
b10_resolver_LDADD += $(top_builddir)/src/lib/cc/libcc.la b10_resolver_LDADD += $(top_builddir)/src/lib/cc/libcc.la
b10_resolver_LDADD += $(top_builddir)/src/lib/util/libutil.la b10_resolver_LDADD += $(top_builddir)/src/lib/util/libutil.la
b10_resolver_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la b10_resolver_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
b10_resolver_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la b10_resolver_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
......
...@@ -44,7 +44,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la ...@@ -44,7 +44,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la run_unittests_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.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/xfr/libxfr.la run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
......
...@@ -16,4 +16,4 @@ pkglibexec_PROGRAMS = b10-sockcreator ...@@ -16,4 +16,4 @@ pkglibexec_PROGRAMS = b10-sockcreator
b10_sockcreator_SOURCES = sockcreator.cc sockcreator.h main.cc b10_sockcreator_SOURCES = sockcreator.cc sockcreator.h main.cc
b10_sockcreator_LDADD = $(top_builddir)/src/lib/util/io/libutil_io.la b10_sockcreator_LDADD = $(top_builddir)/src/lib/util/io/libutil_io.la
b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
...@@ -12,7 +12,7 @@ libacl_la_SOURCES += ip_check.h ip_check.cc ...@@ -12,7 +12,7 @@ libacl_la_SOURCES += ip_check.h ip_check.cc
libacl_la_SOURCES += logic_check.h libacl_la_SOURCES += logic_check.h
libacl_la_SOURCES += loader.h loader.cc 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/cc/libcc.la
libacl_la_LIBADD += $(top_builddir)/src/lib/util/libutil.la libacl_la_LIBADD += $(top_builddir)/src/lib/util/libutil.la
......
...@@ -36,7 +36,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la ...@@ -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/cc/libcc.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.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/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 run_unittests_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
endif endif
......
...@@ -33,7 +33,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests. ...@@ -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/util/libutil.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.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/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_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
......
...@@ -39,7 +39,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) ...@@ -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/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.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/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_LDADD += $(GTEST_LDADD)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
......
...@@ -5,5 +5,5 @@ CLEANFILES = *.gcno *.gcda ...@@ -5,5 +5,5 @@ CLEANFILES = *.gcno *.gcda
noinst_PROGRAMS = search_bench noinst_PROGRAMS = search_bench
search_bench_SOURCES = search_bench.cc 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
...@@ -21,7 +21,7 @@ run_unittests_LDADD = $(top_builddir)/src/lib/bench/libbench.la ...@@ -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/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.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/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_LDADD += $(GTEST_LDADD)
endif endif
......
...@@ -57,7 +57,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la ...@@ -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/util/libutil.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.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/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 endif
noinst_PROGRAMS = $(TESTS) noinst_PROGRAMS = $(TESTS)
......
...@@ -33,7 +33,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) ...@@ -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/cc/libcc.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.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/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_LDADD += $(GTEST_LDADD)
endif endif
......
...@@ -18,7 +18,7 @@ libcfgclient_la_SOURCES += ccsession.cc ccsession.h ...@@ -18,7 +18,7 @@ libcfgclient_la_SOURCES += ccsession.cc ccsession.h
libcfgclient_la_SOURCES += config_log.h config_log.cc 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/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 libcfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1
......
...@@ -28,7 +28,7 @@ run_unittests_LDADD = $(GTEST_LDADD) ...@@ -28,7 +28,7 @@ run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += libfake_session.la run_unittests_LDADD += libfake_session.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.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/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/log/liblog.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
......
...@@ -24,7 +24,7 @@ run_unittests_LDADD = $(GTEST_LDADD) $(BOTAN_LIBS) ...@@ -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/util/libutil.la
run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.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/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 endif
noinst_PROGRAMS = $(TESTS) noinst_PROGRAMS = $(TESTS)
...@@ -46,21 +46,21 @@ sqlite3_ds_la_SOURCES = sqlite3_accessor.h sqlite3_accessor.cc ...@@ -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_SOURCES += sqlite3_accessor_link.cc
sqlite3_ds_la_LDFLAGS = -module -avoid-version sqlite3_ds_la_LDFLAGS = -module -avoid-version
sqlite3_ds_la_LDFLAGS += -no-undefined -version-info 1:0:0 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 += libdatasrc.la
sqlite3_ds_la_LIBADD += $(SQLITE_LIBS) sqlite3_ds_la_LIBADD += $(SQLITE_LIBS)
memory_ds_la_SOURCES = memory_datasrc_link.cc memory_ds_la_SOURCES = memory_datasrc_link.cc
memory_ds_la_LDFLAGS = -module -avoid-version 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 memory_ds_la_LIBADD += libdatasrc.la
static_ds_la_SOURCES = static_datasrc_link.cc static_ds_la_SOURCES = static_datasrc_link.cc
static_ds_la_LDFLAGS = -module -avoid-version 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 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/dns/libdns++.la
libdatasrc_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la libdatasrc_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la
libdatasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la libdatasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
......
...@@ -26,7 +26,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) ...@@ -26,7 +26,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(builddir)/../libdatasrc_memory.la run_unittests_LDADD = $(builddir)/../libdatasrc_memory.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.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/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_LDADD += $(GTEST_LDADD)
endif endif
......
...@@ -38,7 +38,7 @@ common_ldadd = $(top_builddir)/src/lib/datasrc/libdatasrc.la ...@@ -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/dns/libdns++.la
common_ldadd += $(top_builddir)/src/lib/util/libutil.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/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/cc/libcc.la
common_ldadd += $(top_builddir)/src/lib/testutils/libtestutils.la common_ldadd += $(top_builddir)/src/lib/testutils/libtestutils.la
common_ldadd += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la common_ldadd += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
......
...@@ -55,7 +55,7 @@ libdhcp___unittests_LDADD = $(GTEST_LDADD) ...@@ -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/log/liblog.la
libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libutil.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/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 endif
noinst_PROGRAMS = $(TESTS) noinst_PROGRAMS = $(TESTS)
...@@ -15,10 +15,10 @@ rdatarender_bench_SOURCES = rdatarender_bench.cc ...@@ -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/dns/libdns++.la
rdatarender_bench_LDADD += $(top_builddir)/src/lib/util/libutil.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 = message_renderer_bench.cc
message_renderer_bench_SOURCES += oldmessagerenderer.h oldmessagerenderer.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/dns/libdns++.la
message_renderer_bench_LDADD += $(top_builddir)/src/lib/util/libutil.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
...@@ -48,6 +48,6 @@ EXTRA_DIST += nsec3hash_python_inc.cc ...@@ -48,6 +48,6 @@ EXTRA_DIST += nsec3hash_python_inc.cc
# suffix for dynamic objects. -module is necessary to work this around. # suffix for dynamic objects. -module is necessary to work this around.
pydnspp_la_LDFLAGS += -module -avoid-version pydnspp_la_LDFLAGS += -module -avoid-version
pydnspp_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la 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 += libpydnspp.la
pydnspp_la_LIBADD += $(PYTHON_LIB) pydnspp_la_LIBADD += $(PYTHON_LIB)
...@@ -77,7 +77,7 @@ run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS) ...@@ -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/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.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/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) run_unittests_LDADD += $(BOTAN_LIBS) $(GTEST_LDADD)
endif endif
......
...@@ -3,10 +3,10 @@ SUBDIRS = . tests ...@@ -3,10 +3,10 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CXXFLAGS=$(B10_CXXFLAGS) AM_CXXFLAGS=$(B10_CXXFLAGS)
lib_LTLIBRARIES = libexceptions.la lib_LTLIBRARIES = libb10-exceptions.la
libexceptions_la_SOURCES = exceptions.h exceptions.cc libb10_exceptions_la_SOURCES = exceptions.h exceptions.cc
CLEANFILES = *.gcno *.gcda CLEANFILES = *.gcno *.gcda
libexceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions libb10_exceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions
libexceptions_include_HEADERS = exceptions.h libb10_exceptions_include_HEADERS = exceptions.h
...@@ -20,7 +20,7 @@ run_unittests_SOURCES += exceptions_unittest.cc ...@@ -20,7 +20,7 @@ run_unittests_SOURCES += exceptions_unittest.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(GTEST_LDFLAGS) run_unittests_LDFLAGS = $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD) 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 endif
noinst_PROGRAMS = $(TESTS) noinst_PROGRAMS = $(TESTS)
...@@ -16,4 +16,4 @@ noinst_PROGRAMS = message ...@@ -16,4 +16,4 @@ noinst_PROGRAMS = message
message_SOURCES = message.cc message_SOURCES = message.cc
message_LDADD = $(top_builddir)/src/lib/log/liblog.la message_LDADD = $(top_builddir)/src/lib/log/liblog.la
message_LDADD += $(top_builddir)/src/lib/util/libutil.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
...@@ -25,7 +25,7 @@ logger_example_CPPFLAGS = $(AM_CPPFLAGS) ...@@ -25,7 +25,7 @@ logger_example_CPPFLAGS = $(AM_CPPFLAGS)
logger_example_LDFLAGS = $(AM_LDFLAGS) logger_example_LDFLAGS = $(AM_LDFLAGS)
logger_example_LDADD = $(top_builddir)/src/lib/log/liblog.la 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/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) logger_example_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
noinst_PROGRAMS += init_logger_test noinst_PROGRAMS += init_logger_test
...@@ -34,7 +34,7 @@ init_logger_test_CPPFLAGS = $(AM_CPPFLAGS) ...@@ -34,7 +34,7 @@ init_logger_test_CPPFLAGS = $(AM_CPPFLAGS)
init_logger_test_LDFLAGS = $(AM_LDFLAGS) 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/log/liblog.la
init_logger_test_LDADD += $(top_builddir)/src/lib/util/libutil.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) init_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
noinst_PROGRAMS += logger_lock_test noinst_PROGRAMS += logger_lock_test
...@@ -44,7 +44,7 @@ logger_lock_test_CPPFLAGS = $(AM_CPPFLAGS) ...@@ -44,7 +44,7 @@ logger_lock_test_CPPFLAGS = $(AM_CPPFLAGS)
logger_lock_test_LDFLAGS = $(AM_LDFLAGS) 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/log/liblog.la
logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libutil.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) logger_lock_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
TESTS_ENVIRONMENT = \ TESTS_ENVIRONMENT = \
...@@ -64,7 +64,7 @@ AM_LDFLAGS += $(GTEST_LDFLAGS) ...@@ -64,7 +64,7 @@ AM_LDFLAGS += $(GTEST_LDFLAGS)
AM_LDADD += $(top_builddir)/src/lib/util/libutil.la AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
AM_LDADD += $(top_builddir)/src/lib/log/liblog.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/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 += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
AM_LDADD += $(GTEST_LDADD) AM_LDADD += $(GTEST_LDADD)
......
...@@ -55,7 +55,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la ...@@ -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/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.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/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 endif
noinst_PROGRAMS = $(TESTS) noinst_PROGRAMS = $(TESTS)
...@@ -17,7 +17,7 @@ log_la_LDFLAGS += -module -avoid-version ...@@ -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/log/liblog.la
log_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.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/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) log_la_LIBADD += $(PYTHON_LIB)
# This is not installed, it helps locate the module during tests # This is not installed, it helps locate the module during tests
......
...@@ -32,7 +32,7 @@ libresolve_la_SOURCES += recursive_query.cc recursive_query.h ...@@ -32,7 +32,7 @@ libresolve_la_SOURCES += recursive_query.cc recursive_query.h
nodist_libresolve_la_SOURCES = resolve_messages.h resolve_messages.cc 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/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/log/liblog.la
libresolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libasiodns.la libresolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
......
...@@ -38,7 +38,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la ...@@ -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/util/libutil.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.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/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 endif