From: Marcin Siodelski Date: Fri, 21 Oct 2016 16:43:15 +0000 (+0200) Subject: [5055] Install selected headers from Kea libraries. X-Git-Tag: trac5057_base~3^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95e9be39076f691faddc923a3cb6227b60786ec2;p=thirdparty%2Fkea.git [5055] Install selected headers from Kea libraries. --- diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am index eb293e6b22..ab1ee62fc1 100644 --- a/src/lib/asiolink/Makefile.am +++ b/src/lib/asiolink/Makefile.am @@ -41,4 +41,17 @@ libkea_asiolink_la_LIBADD += $(BOOST_LIBS) # IOAddress is sometimes used in user-library code libkea_asiolink_includedir = $(pkgincludedir)/asiolink -libkea_asiolink_include_HEADERS = io_address.h +libkea_asiolink_include_HEADERS = \ + asiolink.h \ + asio_wrapper.h \ + interval_timer.h \ + io_address.h \ + io_asio_socket.h \ + io_endpoint.h \ + io_error.h \ + io_service.h \ + io_socket.h \ + tcp_endpoint.h \ + tcp_socket.h \ + udp_endpoint.h \ + udp_socket.h diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am index 820f448e72..306f65c256 100644 --- a/src/lib/dhcp_ddns/Makefile.am +++ b/src/lib/dhcp_ddns/Makefile.am @@ -48,3 +48,9 @@ libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-thread libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) + +# Specify the headers for copying into the installation directory tree. +libkea_dhcp_ddns_include_HEADERS = \ + ncr_io.h \ + ncr_msg.h \ + ncr_udp.h diff --git a/src/lib/dhcp_ddns/ncr_msg.cc b/src/lib/dhcp_ddns/ncr_msg.cc index 289d83177e..f579a0274a 100644 --- a/src/lib/dhcp_ddns/ncr_msg.cc +++ b/src/lib/dhcp_ddns/ncr_msg.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,6 +10,7 @@ #include #include #include +#include #include diff --git a/src/lib/dhcp_ddns/ncr_msg.h b/src/lib/dhcp_ddns/ncr_msg.h index 484778e420..065e1181bc 100644 --- a/src/lib/dhcp_ddns/ncr_msg.h +++ b/src/lib/dhcp_ddns/ncr_msg.h @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index f763340e9d..13cfde64fc 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -218,6 +218,21 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox # Specification file EXTRA_DIST += logging.spec +# Specify the headers for copying into the installation directory tree. The +# following headers are anticipated to be useful for the user libraries. +libkea_dhcpsrv_include_HEADERS = \ + cfg_option.h \ + cfg_4o6.h \ + d2_client_cfg.h \ + d2_client_mgr.h \ + key_from_key.h \ + lease.h \ + ncr_generator.h \ + pool.h \ + subnet.h \ + subnet_id.h \ + triplet.h \ + install-data-local: $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir) diff --git a/src/lib/dhcpsrv/client_class_def.h b/src/lib/dhcpsrv/client_class_def.h index 51fb7e2544..201b22c785 100644 --- a/src/lib/dhcpsrv/client_class_def.h +++ b/src/lib/dhcpsrv/client_class_def.h @@ -8,7 +8,6 @@ #define CLIENT_CLASS_DEF_H #include -#include #include #include diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h index d1d6d48403..fe2e330e51 100644 --- a/src/lib/dhcpsrv/subnet.h +++ b/src/lib/dhcpsrv/subnet.h @@ -13,32 +13,16 @@ #include #include #include +#include #include +#include -#include #include namespace isc { namespace dhcp { -/// @brief a base class for Subnet4 and Subnet6 -/// -/// This class presents a common base for IPv4 and IPv6 subnets. -/// In a physical sense, a subnet defines a single network link with all devices -/// attached to it. In most cases all devices attached to a single link can -/// share the same parameters. Therefore Subnet holds several values that are -/// typically shared by all hosts: renew timer (T1), rebind timer (T2) and -/// leased addresses lifetime (valid-lifetime). It also holds the set -/// of DHCP option instances configured for the subnet. These options are -/// included in DHCP messages being sent to clients which are connected -/// to the particular subnet. -/// -/// @todo: Implement support for options here - -/// @brief Unique identifier for a subnet (both v4 and v6) -typedef uint32_t SubnetID; - class Subnet { public: diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am index 708890275c..c9545e5d51 100644 --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am @@ -42,4 +42,11 @@ libkea_util_la_LDFLAGS = -no-undefined -version-info 2:0:0 CLEANFILES = *.gcno *.gcda libkea_util_includedir = $(includedir)/$(PACKAGE_NAME)/util -libkea_util_include_HEADERS = buffer.h io_utilities.h strutil.h staged_value.h +libkea_util_include_HEADERS = \ + buffer.h \ + io_utilities.h \ + optional_value.h \ + pointer_util.h \ + stopwatch.h \ + strutil.h \ + staged_value.h