[master] Merge branch 'trac3955'

src/lib/asiolink/Makefile.am

@@ -15,7 +15,7 @@ CLEANFILES = *.gcno *.gcda
 
 lib_LTLIBRARIES = libkea-asiolink.la
 
-libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 2:0:0
 
 libkea_asiolink_la_SOURCES  = asiolink.h
 libkea_asiolink_la_SOURCES += dummy_io_cb.h

src/lib/cc/Makefile.am

@@ -8,4 +8,8 @@ lib_LTLIBRARIES = libkea-cc.la
 libkea_cc_la_SOURCES = data.cc data.h
 libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
 
+libkea_cc_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+
+libkea_cc_la_LDFLAGS = -no-undefined -version-info 1:0:0
+
 CLEANFILES = *.gcno *.gcda

src/lib/config/Makefile.am

@@ -27,7 +27,7 @@ libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptio
 libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 
-libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 2:0:0
 
 nodist_libkea_cfgclient_la_SOURCES  = config_messages.h config_messages.cc
 

src/lib/cryptolink/Makefile.am

@@ -25,4 +25,6 @@ libkea_cryptolink_la_SOURCES += openssl_hmac.cc
 endif
 
 libkea_cryptolink_la_LDFLAGS = ${CRYPTO_LDFLAGS}
-libkea_cryptolink_la_LIBADD = ${CRYPTO_LIBS} ${CRYPTO_RPATH}
+libkea_cryptolink_la_LDFLAGS += -no-undefined -version-info 1:0:0
+libkea_cryptolink_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_cryptolink_la_LIBADD += ${CRYPTO_LIBS} ${CRYPTO_RPATH}

src/lib/dhcp/Makefile.am

@@ -71,7 +71,7 @@ libkea_dhcp___la_LIBADD   = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_dhcp___la_LDFLAGS  = -no-undefined -version-info 2:0:0
+libkea_dhcp___la_LDFLAGS  = -no-undefined -version-info 3:0:0
 
 EXTRA_DIST  = README libdhcp++.dox
 

src/lib/dhcp_ddns/Makefile.am

@@ -42,6 +42,8 @@ libkea_dhcp_ddns_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
 libkea_dhcp_ddns_la_LDFLAGS  = $(AM_LDFLAGS)
 libkea_dhcp_ddns_la_LDFLAGS += ${CRYPTO_LDFLAGS}
+libkea_dhcp_ddns_la_LDFLAGS += -no-undefined -version-info 1:0:0
+
 libkea_dhcp_ddns_la_LIBADD  =
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la

src/lib/dhcpsrv/Makefile.am

@@ -154,7 +154,7 @@ libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
-libkea_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 3:0:0
+libkea_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 4:0:0
 if HAVE_MYSQL
 libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS)
 endif

src/lib/dns/Makefile.am

@@ -103,7 +103,7 @@ BUILT_SOURCES += rdataclass.h rdataclass.cc
 
 lib_LTLIBRARIES = libkea-dns++.la
 
-libkea_dns___la_LDFLAGS = -no-undefined -version-info 2:0:0
+libkea_dns___la_LDFLAGS = -no-undefined -version-info 2:0:1
 
 libkea_dns___la_SOURCES =
 libkea_dns___la_SOURCES += dns_fwd.h

src/lib/hooks/Makefile.am

@@ -53,7 +53,7 @@ nodist_libkea_hooks_la_SOURCES = hooks_messages.cc hooks_messages.h
 
 libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libkea_hooks_la_LDFLAGS  = $(AM_LDFLAGS)
+libkea_hooks_la_LDFLAGS  = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0
 libkea_hooks_la_LIBADD  =
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la

src/lib/hooks/hooks.h

@@ -20,8 +20,8 @@
 
 namespace {
 
-// Version 1 of the hooks framework.
-const int KEA_HOOKS_VERSION = 1;
+// Version 2 of the hooks framework.
+const int KEA_HOOKS_VERSION = 2;
 
 // Names of the framework functions.
 const char* const LOAD_FUNCTION_NAME = "load";

src/lib/log/Makefile.am

@@ -46,7 +46,7 @@ libkea_log_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
 libkea_log_la_LIBADD   = $(top_builddir)/src/lib/util/libkea-util.la
 libkea_log_la_LIBADD  += interprocess/libkea-log_interprocess.la
 libkea_log_la_LIBADD  += $(LOG4CPLUS_LIBS)
-libkea_log_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libkea_log_la_LDFLAGS = -no-undefined -version-info 1:0:1
 
 # Specify the headers for copying into the installation directory tree. User-
 # written libraries only need the definitions for logger.h and dependencies.

src/lib/stats/Makefile.am

@@ -10,6 +10,8 @@ libkea_stats_la_SOURCES += context.h context.cc
 libkea_stats_la_SOURCES += stats_mgr.h stats_mgr.cc
 
 libkea_stats_la_CPPFLAGS = $(AM_CPPFLAGS)
+libkea_stats_la_LDFLAGS = -no-undefined -version-info 1:0:0
+
 libkea_stats_la_LIBADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 

src/lib/util/Makefile.am

@@ -36,6 +36,9 @@ libkea_util_la_SOURCES += random/qid_gen.h random/qid_gen.cc
 libkea_util_la_SOURCES += random/random_number_generator.h
 
 libkea_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+
+libkea_util_la_LDFLAGS  = -no-undefined -version-info 1:0:0
+
 CLEANFILES = *.gcno *.gcda
 
 libkea_util_includedir = $(includedir)/$(PACKAGE_NAME)/util