]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac5375'
authorMarcin Siodelski <marcin@isc.org>
Mon, 23 Oct 2017 14:22:02 +0000 (16:22 +0200)
committerMarcin Siodelski <marcin@isc.org>
Mon, 23 Oct 2017 14:22:02 +0000 (16:22 +0200)
12 files changed:
1  2 
src/lib/asiodns/Makefile.am
src/lib/asiolink/Makefile.am
src/lib/cc/Makefile.am
src/lib/config/Makefile.am
src/lib/dhcp/Makefile.am
src/lib/dhcpsrv/Makefile.am
src/lib/dns/Makefile.am
src/lib/eval/Makefile.am
src/lib/hooks/Makefile.am
src/lib/http/Makefile.am
src/lib/process/Makefile.am
src/lib/stats/Makefile.am

Simple merge
Simple merge
index ffbf4cdf07339c711fb200a86c07b20d70a524c7,1e8e0fe5d0438b23952941f88fbd197984f17e67..7031653e736525ecc4c5fb8e79d96ff8bdab300e
@@@ -16,18 -16,12 +16,18 @@@ libkea_cc_la_LIBADD += $(top_builddir)/
  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 2:0:0
+ libkea_cc_la_LDFLAGS = -no-undefined -version-info 3:0:0
  
 -# Since data.h is now used in the hooks interface, it needs to be
 -# installed on target system.
 +# Specify the headers for copying into the installation directory tree.
  libkea_cc_includedir = $(pkgincludedir)/cc
 -libkea_cc_include_HEADERS = cfg_to_element.h data.h dhcp_config_error.h
 +libkea_cc_include_HEADERS = \
 +      cfg_to_element.h \
 +      command_interpreter.h \
 +      data.h \
 +      dhcp_config_error.h \
 +      json_feed.h \
 +      simple_parser.h
 +
  
  EXTRA_DIST = cc.dox
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge