Skip to content

Commit

Permalink
[master] Merge branch 'trac5644'
Browse files Browse the repository at this point in the history
  • Loading branch information
msiodelski committed Jun 13, 2018
2 parents ab3cb8a + a84f7cf commit ee350cf
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/lib/asiolink/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CLEANFILES = *.gcno *.gcda

lib_LTLIBRARIES = libkea-asiolink.la

libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 6:0:0
libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 6:1:0

libkea_asiolink_la_SOURCES = asiolink.h
libkea_asiolink_la_SOURCES += asio_wrapper.h
Expand Down
2 changes: 1 addition & 1 deletion src/lib/cc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ libkea_cc_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
libkea_cc_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_cc_la_LIBADD += $(BOOST_LIBS)

libkea_cc_la_LDFLAGS = -no-undefined -version-info 4:0:0
libkea_cc_la_LDFLAGS = -no-undefined -version-info 5:0:0

# Specify the headers for copying into the installation directory tree.
libkea_cc_includedir = $(pkgincludedir)/cc
Expand Down
2 changes: 1 addition & 1 deletion src/lib/config/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_cfgclient_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)

libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 5:0:0
libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 5:1:0
libkea_cfgclient_la_LDFLAGS += $(CRYPTO_LDFLAGS)

nodist_libkea_cfgclient_la_SOURCES = config_messages.h config_messages.cc
Expand Down
2 changes: 1 addition & 1 deletion src/lib/cryptolink/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ libkea_cryptolink_la_SOURCES += openssl_hmac.cc
endif

libkea_cryptolink_la_LDFLAGS = $(CRYPTO_LDFLAGS)
libkea_cryptolink_la_LDFLAGS += -no-undefined -version-info 2:1:0
libkea_cryptolink_la_LDFLAGS += -no-undefined -version-info 3:0:0
libkea_cryptolink_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_cryptolink_la_LIBADD += $(CRYPTO_LIBS)

Expand Down
2 changes: 1 addition & 1 deletion src/lib/dhcp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_dhcp___la_LIBADD += $(BOOST_LIBS)
libkea_dhcp___la_LIBADD += $(CRYPTO_LIBS)
libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 7:0:0
libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 8:0:0
libkea_dhcp___la_LDFLAGS += $(CRYPTO_LDFLAGS)

EXTRA_DIST = README libdhcp++.dox
Expand Down
2 changes: 1 addition & 1 deletion src/lib/dhcpsrv/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_dhcpsrv_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)

libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 9:0:0
libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 10:0:0
libkea_dhcpsrv_la_LDFLAGS += $(CRYPTO_LDFLAGS)
if HAVE_MYSQL
libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/eval/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ libkea_eval_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
libkea_eval_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_eval_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)

libkea_eval_la_LDFLAGS = -no-undefined -version-info 7:0:0
libkea_eval_la_LDFLAGS = -no-undefined -version-info 7:1:0
libkea_eval_la_LDFLAGS += $(CRYPTO_LDFLAGS)

EXTRA_DIST = eval.dox
Expand Down
2 changes: 1 addition & 1 deletion src/lib/hooks/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ nodist_libkea_hooks_la_SOURCES = hooks_messages.cc hooks_messages.h

libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 5:0:0
libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 6: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/threads/libkea-threads.la
Expand Down
2 changes: 1 addition & 1 deletion src/lib/http/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ nodist_libkea_http_la_SOURCES = http_messages.cc http_messages.h
libkea_http_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_http_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_http_la_LDFLAGS = $(AM_LDFLAGS)
libkea_http_la_LDFLAGS += -no-undefined -version-info 1:0:0
libkea_http_la_LDFLAGS += -no-undefined -version-info 2:0:0

libkea_http_la_LIBADD =
libkea_http_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
Expand Down
2 changes: 1 addition & 1 deletion src/lib/process/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ nodist_libkea_process_la_SOURCES = process_messages.cc process_messages.h
libkea_process_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_process_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_process_la_LDFLAGS = $(AM_LDFLAGS)
libkea_process_la_LDFLAGS += -no-undefined -version-info 2:0:0
libkea_process_la_LDFLAGS += -no-undefined -version-info 2:1:0

libkea_process_la_LIBADD =
libkea_process_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
Expand Down
2 changes: 1 addition & 1 deletion src/lib/stats/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ 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 2:1:0
libkea_stats_la_LDFLAGS = -no-undefined -version-info 2:2: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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/util/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ 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 3:0:0
libkea_util_la_LDFLAGS = -no-undefined -version-info 3:1:0

CLEANFILES = *.gcno *.gcda

Expand Down

0 comments on commit ee350cf

Please sign in to comment.