BIND 10 trac3092, updated. 9823dc9e0a2dc618d3eb6eacbfe6ee29cdaf0500 [3092] Install some .h files in installation directory
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Aug 14 09:12:48 UTC 2013
The branch, trac3092 has been updated
via 9823dc9e0a2dc618d3eb6eacbfe6ee29cdaf0500 (commit)
from d581f79243723a01240da4b7b5adb8028d016e76 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9823dc9e0a2dc618d3eb6eacbfe6ee29cdaf0500
Author: Stephen Morris <stephen at isc.org>
Date: Wed Aug 14 10:11:10 2013 +0100
[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.
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 ++++
src/lib/dhcp/Makefile.am | 30 ++++++++++++++++++++++++++++++
src/lib/hooks/Makefile.am | 7 +++++++
src/lib/log/Makefile.am | 11 +++++++++++
src/lib/log/compiler/Makefile.am | 2 +-
5 files changed, 53 insertions(+), 1 deletion(-)
-----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 392b985..8211906 100644
--- 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 114c301..f73c02d 100644
--- 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 838564a..5fe7ad5 100644
--- 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 6056fb5..9febc95 100644
--- 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 f4435d8..ce70672 100644
--- 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
More information about the bind10-changes
mailing list