Merge remote-tracking branch 'isc-kea/master' into HEAD

8 files changed, 59 insertions, 11 deletions

diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 64af9ebf0e..7c0bac0096 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -43,12 +43,56 @@ libkea_util_la_LDFLAGS  = -no-undefined -version-info 2:1:0
 
 CLEANFILES = *.gcno *.gcda
 
+# Specify the headers for copying into the installation directory tree.
 libkea_util_includedir = $(pkgincludedir)/util
 libkea_util_include_HEADERS = \
-    buffer.h \
-    io_utilities.h \
-    optional_value.h \
-    pointer_util.h \
-    stopwatch.h \
-    strutil.h \
-    staged_value.h
+	boost_time_utils.h \
+	buffer.h \
+	csv_file.h \
+	filename.h \
+	io_utilities.h \
+	labeled_value.h \
+	memory_segment.h \
+	memory_segment_local.h \
+	optional_value.h \
+	pid_file.h \
+	pointer_util.h \
+	process_spawn.h \
+	range_utilities.h \
+	signal_set.h \
+	staged_value.h \
+	state_model.h \
+	stopwatch.h \
+	stopwatch_impl.h \
+	strutil.h \
+	time_utilities.h \
+	versioned_csv_file.h \
+	watch_socket.h
+
+libkea_util_encode_includedir = $(pkgincludedir)/util/encode
+libkea_util_encode_include_HEADERS = \
+	encode/base16_from_binary.h \
+	encode/base32hex.h \
+	encode/base32hex_from_binary.h \
+	encode/base64.h \
+	encode/binary_from_base16.h \
+	encode/binary_from_base32hex.h \
+	encode/hex.h
+
+libkea_util_io_includedir = $(pkgincludedir)/util/io
+libkea_util_io_include_HEADERS = \
+	io/fd.h \
+	io/fd_share.h \
+	io/pktinfo_utilities.h \
+	io/sockaddr_util.h \
+	io/socketsession.h
+
+libkea_util_random_includedir = $(pkgincludedir)/util/random
+libkea_util_random_include_HEADERS = \
+	random/qid_gen.h \
+	random/random_number_generator.h
+
+libkea_util_threads_includedir = $(pkgincludedir)/util/threads
+libkea_util_threads_include_HEADERS = \
+	threads/sync.h \
+	threads/thread.h
diff --git a/src/lib/util/io/Makefile.am b/src/lib/util/io/Makefile.am
index c91f368bf7..6c046fe966 100644
--- a/src/lib/util/io/Makefile.am
+++ b/src/lib/util/io/Makefile.am
@@ -9,5 +9,6 @@ libkea_util_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
 libkea_util_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
 libkea_util_io_la_SOURCES += pktinfo_utilities.h
 libkea_util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_util_io_la_LDFLAGS = -no-undefined -version-info 0:0:0
 
 CLEANFILES = *.gcno *.gcda
diff --git a/src/lib/util/python/Makefile.am b/src/lib/util/python/Makefile.am
index dd584be2b2..460bf1aa00 100644
--- a/src/lib/util/python/Makefile.am
+++ b/src/lib/util/python/Makefile.am
@@ -1,2 +1,3 @@
 noinst_SCRIPTS = const2hdr.py gen_wiredata.py
 EXTRA_DIST = const2hdr.py
+DISTCLEANFILES = gen_wiredata.py
diff --git a/src/lib/util/python/const2hdr.py b/src/lib/util/python/const2hdr.py
index 1a2b7b9336..e89a735459 100644
--- a/src/lib/util/python/const2hdr.py
+++ b/src/lib/util/python/const2hdr.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015 Internet Systems Consortium.
+# Copyright (C) 2013-2017 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
diff --git a/src/lib/util/python/gen_wiredata.py.in b/src/lib/util/python/gen_wiredata.py.in
index 4c9361285e..ba22dc2a04 100644
--- a/src/lib/util/python/gen_wiredata.py.in
+++ b/src/lib/util/python/gen_wiredata.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 
-# Copyright (C) 2010-2016 Internet Systems Consortium.
+# Copyright (C) 2010-2017 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
diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am
index 6bd1727ffb..301d94f2bb 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -17,6 +17,8 @@ CLEANFILES = *.gcno *.gcda
 # CSV files are created by unit tests for CSVFile class.
 CLEANFILES += *.csv
 
+DISTCLEANFILES = process_spawn_app.sh
+
 noinst_SCRIPTS = process_spawn_app.sh
 
 TESTS_ENVIRONMENT = \
diff --git a/src/lib/util/tests/state_model_unittest.cc b/src/lib/util/tests/state_model_unittest.cc
index cde06b67f5..c6b2b67339 100644
--- a/src/lib/util/tests/state_model_unittest.cc
+++ b/src/lib/util/tests/state_model_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 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
diff --git a/src/lib/util/tests/watch_socket_unittests.cc b/src/lib/util/tests/watch_socket_unittests.cc
index 13ee4c16eb..0dd8dea169 100644
--- a/src/lib/util/tests/watch_socket_unittests.cc
+++ b/src/lib/util/tests/watch_socket_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2017 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