From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 23 Oct 2017 14:22:02 +0000 (+0200)
Subject: [master] Merge branch 'trac5375'
X-Git-Tag: Kea-1.3.0~2^2~22^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70c0fc164c89716419b6ee42da3ca0d4be938a30;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5375'
---

70c0fc164c89716419b6ee42da3ca0d4be938a30
diff --cc src/lib/cc/Makefile.am
index ffbf4cdf07,1e8e0fe5d0..7031653e73
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@@ -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