[3092] Install some .h files in installation directory

These files are to allow the authors of hooks callouts to compile
their code.  At the moment only the DHCP files are installed; the
DNS files will be added once hooks have been added to the DNS servers.

diff --git a/Makefile.am b/Makefile.am
index 392b9855e521176d16e01653d8b2754c37add5af..8211906adc74a7e7882a06a31ca3c50e0f0e9cb3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -435,6 +435,10 @@ pkgconfig_DATA = dns++.pc
 
 CLEANFILES = $(abs_top_builddir)/logger_lockfile
 
+# config.h may be included by headers supplied for building user-written
+# hooks libraries, so we need to include it in the distribution.
+pkginclude_HEADERS = config.h
+
 if HAVE_GTEST_SOURCE
 noinst_LIBRARIES = libgtest.a
 libgtest_a_CXXFLAGS = $(GTEST_INCLUDES) $(AM_CXXFLAGS)

diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index 114c301f2a96c58ac2af769473c5953fddadb6fe..f73c02d27c33ca24c6bc26325ceec5cc6cc90e98 100644 (file)
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -55,6 +55,36 @@ libb10_dhcp___la_LDFLAGS  = -no-undefined -version-info 2:0:0
 
 EXTRA_DIST  = README libdhcp++.dox
 
+# Specify the headers for copying into the installation directory tree. User-
+# written libraries may need access to all libdhcp++ headers.
+libb10_dhcp___includedir = $(pkgincludedir)/dhcp
+libb10_dhcp___include_HEADERS = \
+    dhcp4.h \
+    dhcp6.h \
+    duid.h \
+    hwaddr.h \
+    iface_mgr.h \
+    libdhcp++.h \
+    option.h \
+    option4_addrlst.h \
+    option6_addrlst.h \
+    option6_ia.h \
+    option6_iaaddr.h \
+    option_custom.h \
+    option_data_types.h \
+    option_definition.h \
+    option_int.h \
+    option_int_array.h \
+    option_space.h \
+    option_string.h \
+    pkt4.h \
+    pkt6.h \
+    pkt_filter.h \
+    pkt_filter_inet.h \
+    pkt_filter_lpf.h \
+    protocol_util.h \
+    std_option_defs.h
+
 if USE_CLANGPP
 # Disable unused parameter warning caused by some of the
 # Boost headers when compiling with clang.

diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am
index 838564a82a69ad19d9ad7f520b99c9c45aedfd87..5fe7ad530b16e695cb4779b439d8c69af7704ffa 100644 (file)
--- a/src/lib/hooks/Makefile.am
+++ b/src/lib/hooks/Makefile.am
@@ -48,6 +48,13 @@ libb10_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
 libb10_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libb10-util.la
 libb10_hooks_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 
+# Specify the headers for copying into the installation directory tree. User-
+# written libraries only need the definitions from the headers for the
+# CalloutHandle and LibraryHandle objects.
+libb10_hooks_includedir = $(pkgincludedir)/hooks
+libb10_hooks_include_HEADERS = \
+    callout_handle.h \
+    library_handle.h
 
 if USE_CLANGPP
 # Disable unused parameter warning caused by some of the

diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index 6056fb5f57ea63c62a2d9888bdfe301294e3a0ff..9febc95a3bed75e1dc2d9e5483b01e77e07035e3 100644 (file)
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -51,3 +51,14 @@ libb10_log_la_LIBADD   = $(top_builddir)/src/lib/util/libb10-util.la
 libb10_log_la_LIBADD  += interprocess/libb10-log_interprocess.la
 libb10_log_la_LIBADD  += $(LOG4CPLUS_LIBS)
 libb10_log_la_LDFLAGS = -no-undefined -version-info 1:0:0
+
+# Specify the headers for copying into the installation directory tree. User-
+# written libraries only need the definitions for logger.h and dependencies.
+libb10_log_includedir = $(pkgincludedir)/log
+libb10_log_include_HEADERS = \
+    log_formatter.h \
+    logger.h \
+    logger_level.h \
+    macros.h \
+    message_types.h
+

diff --git a/src/lib/log/compiler/Makefile.am b/src/lib/log/compiler/Makefile.am
index f4435d839a8dc284032b7f27b785a64845abf997..ce7067290e665aa00bb975122427b3b31b6293af 100644 (file)
--- a/src/lib/log/compiler/Makefile.am
+++ b/src/lib/log/compiler/Makefile.am
@@ -11,7 +11,7 @@ endif
 
 CLEANFILES = *.gcno *.gcda
 
-noinst_PROGRAMS = message
+bin_PROGRAMS = message
 
 message_SOURCES = message.cc
 message_LDADD   = $(top_builddir)/src/lib/log/libb10-log.la