mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 16:05:17 +00:00
Code Issues Releases Wiki Activity

[master] Merge branch 'trac3955'

Browse Source
This commit is contained in:
Marcin Siodelski
2015-07-21 09:52:05 +02:00
parent e490a10cfe 5ad7dc3492
commit ff29b8b5cb
13 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/asiolink/Makefile.am
View File

@@ -15,7 +15,7 @@ CLEANFILES = *.gcno *.gcda
lib_LTLIBRARIES = libkea-asiolink.la 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 = asiolink.h
libkea_asiolink_la_SOURCES += dummy_io_cb.h libkea_asiolink_la_SOURCES += dummy_io_cb.h

4
src/lib/cc/Makefile.am
View File

@@ -8,4 +8,8 @@ lib_LTLIBRARIES = libkea-cc.la
libkea_cc_la_SOURCES = data.cc data.h libkea_cc_la_SOURCES = data.cc data.h
libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.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 CLEANFILES = *.gcno *.gcda

2
src/lib/config/Makefile.am
View File

@@ -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/log/libkea-log.la
libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.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 nodist_libkea_cfgclient_la_SOURCES = config_messages.h config_messages.cc

4
src/lib/cryptolink/Makefile.am
View File

@@ -25,4 +25,6 @@ libkea_cryptolink_la_SOURCES += openssl_hmac.cc
endif endif
libkea_cryptolink_la_LDFLAGS = ${CRYPTO_LDFLAGS} 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}

2
src/lib/dhcp/Makefile.am
View File

@@ -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/dns/libkea-dns++.la
libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.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_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 EXTRA_DIST = README libdhcp++.dox

2
src/lib/dhcp_ddns/Makefile.am
View File

@@ -42,6 +42,8 @@ libkea_dhcp_ddns_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES) libkea_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
libkea_dhcp_ddns_la_LDFLAGS = $(AM_LDFLAGS) libkea_dhcp_ddns_la_LDFLAGS = $(AM_LDFLAGS)
libkea_dhcp_ddns_la_LDFLAGS += ${CRYPTO_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 =
libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la 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 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la

2
src/lib/dhcpsrv/Makefile.am
View File

@@ -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/hooks/libkea-hooks.la
libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.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 if HAVE_MYSQL
libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS) libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS)
endif endif

2
src/lib/dns/Makefile.am
View File

@@ -103,7 +103,7 @@ BUILT_SOURCES += rdataclass.h rdataclass.cc
lib_LTLIBRARIES = libkea-dns++.la 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 =
libkea_dns___la_SOURCES += dns_fwd.h libkea_dns___la_SOURCES += dns_fwd.h

2
src/lib/hooks/Makefile.am
View File

@@ -53,7 +53,7 @@ nodist_libkea_hooks_la_SOURCES = hooks_messages.cc hooks_messages.h
libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS) libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES) 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 =
libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la

4
src/lib/hooks/hooks.h
View File

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

2
src/lib/log/Makefile.am
View File

@@ -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 = $(top_builddir)/src/lib/util/libkea-util.la
libkea_log_la_LIBADD += interprocess/libkea-log_interprocess.la libkea_log_la_LIBADD += interprocess/libkea-log_interprocess.la
libkea_log_la_LIBADD += $(LOG4CPLUS_LIBS) 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- # Specify the headers for copying into the installation directory tree. User-
# written libraries only need the definitions for logger.h and dependencies. # written libraries only need the definitions for logger.h and dependencies.

2
src/lib/stats/Makefile.am
View File

@@ -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_SOURCES += stats_mgr.h stats_mgr.cc
libkea_stats_la_CPPFLAGS = $(AM_CPPFLAGS) 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/cc/libkea-cc.la
libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la

3
src/lib/util/Makefile.am
View File

@@ -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_SOURCES += random/random_number_generator.h
libkea_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la 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 CLEANFILES = *.gcno *.gcda
libkea_util_includedir = $(includedir)/$(PACKAGE_NAME)/util libkea_util_includedir = $(includedir)/$(PACKAGE_NAME)/util