[5372] Updated Makefiles.am to install all headers.

diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am
index a9a18e8fab9fb3abe22bf238abfb0f84c55017d9..cf863cc1701987406dbf85142979177bc8579270 100644 (file)
--- a/src/lib/asiodns/Makefile.am
+++ b/src/lib/asiodns/Makefile.am
@@ -35,3 +35,10 @@ libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_asiodns_la_LIBADD += $(BOOST_LIBS)
 libkea_asiodns_la_LIBADD += $(LOG4CPLUS_LIBS)
+
+# Specify the headers for copying into the installation directory tree.
+libkea_asiodns_includedir = $(pkgincludedir)/asiodns
+libkea_asiodns_include_HEADERS = \
+       io_fetch.h \
+       logger.h
+

diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index 073eaef0a4bd5c95ab8d99d37bd1d4a4f9eef7d9..8ac694424411c5bf66ed18924b440ac776877bca 100644 (file)
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -44,19 +44,25 @@ libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_asiolink_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_asiolink_la_LIBADD += $(BOOST_LIBS)
 
-# IOAddress is sometimes used in user-library code
+# Specify the headers for copying into the installation directory tree.
 libkea_asiolink_includedir = $(pkgincludedir)/asiolink
 libkea_asiolink_include_HEADERS = \
-    asiolink.h \
-    asio_wrapper.h \
+       asiolink.h \
+       asio_wrapper.h \
+       dummy_io_cb.h \
        interval_timer.h \
-    io_address.h \
+       io_acceptor.h \
+       io_address.h \
        io_asio_socket.h \
        io_endpoint.h \
        io_error.h \
        io_service.h \
        io_socket.h \
+       tcp_acceptor.h \
        tcp_endpoint.h \
-    tcp_socket.h \
+       tcp_socket.h \
        udp_endpoint.h \
-    udp_socket.h
+       udp_socket.h \
+       unix_domain_socket.h \
+       unix_domain_socket_acceptor.h \
+       unix_domain_socket_endpoint.h

diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am
index 0cf16347738038cdc675411f1e6eff96f3f49d6c..d914b3835c06098273f69e06efe408ab4c9fb01e 100644 (file)
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@ -18,10 +18,16 @@ libkea_cc_la_LIBADD += $(BOOST_LIBS)
 
 libkea_cc_la_LDFLAGS = -no-undefined -version-info 2: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 = \
+       data.h \
+       cfg_to_element.h \
+       dhcp_config_error.h \
+       command_interpreter.h \
+       json_feed.h \
+       simple_parser.h
+
 
 EXTRA_DIST = cc.dox
 

diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
index dc15eea801c13b6d2f5b0846fb060807573e5cb5..04473a68ac9cfafe2f3e8ba188cb5bb12e70459d 100644 (file)
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -43,3 +43,18 @@ nodist_libkea_cfgclient_la_SOURCES  = config_messages.h config_messages.cc
 EXTRA_DIST = config_messages.mes command-socket.dox
 
 CLEANFILES = *.gcno *.gcda config_messages.h config_messages.cc s-messages
+
+# Specify the headers for copying into the installation directory tree.
+libkea_cfgclient_includedir = $(pkgincludedir)/config
+libkea_cfgclient_include_HEADERS = \
+       base_command_mgr.h \
+       client_connection.h \
+       cmds_impl.h \
+       command_mgr.h \
+       config_data.h \
+       config_log.h \
+       config_messages.h \
+       hooked_command_mgr.h \
+       module_spec.h
+
+

diff --git a/src/lib/cryptolink/Makefile.am b/src/lib/cryptolink/Makefile.am
index 2858aefb007c1594d37c925324ddf32aa4a28623..d6e0d1e0a04111dd57dbd6c62d273079ce96483d 100644 (file)
--- a/src/lib/cryptolink/Makefile.am
+++ b/src/lib/cryptolink/Makefile.am
@@ -29,3 +29,22 @@ libkea_cryptolink_la_LDFLAGS = $(CRYPTO_LDFLAGS)
 libkea_cryptolink_la_LDFLAGS += -no-undefined -version-info 2:0:0
 libkea_cryptolink_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_cryptolink_la_LIBADD += $(CRYPTO_LIBS)
+
+
+# Specify the headers for copying into the installation directory tree.
+libkea_cryptolink_includedir = $(pkgincludedir)/cryptolink
+libkea_cryptolink_include_HEADERS = \
+       cryptolink.h \
+       crypto_hash.h \
+       crypto_hmac.h
+
+if HAVE_BOTAN
+libkea_cryptolink_include_HEADERS += \
+       botan_common.h
+endif
+
+if HAVE_OPENSSL
+libkea_cryptolink_include_HEADERS += \
+       openssl_common.h \
+       openssl_compat.h
+endif

diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index 5dde6bd042b62e6c59038d31a4a86e7396866557..855e739c0009600ce9c567c57602cf21a215a06d 100644 (file)
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -82,47 +82,55 @@ EXTRA_DIST  = README libdhcp++.dox
 # written libraries may need access to all libdhcp++ headers.
 libkea_dhcp___includedir = $(pkgincludedir)/dhcp
 libkea_dhcp___include_HEADERS = \
-    classify.h \
-    dhcp4.h \
-    dhcp6.h \
-    docsis3_option_defs.h \
-    duid.h \
-    duid_factory.h \
-    hwaddr.h \
-    iface_mgr.h \
-    iface_mgr_error_handler.h \
-    libdhcp++.h \
-    opaque_data_tuple.h \
-    option4_addrlst.h \
-    option4_client_fqdn.h \
-    option6_addrlst.h \
-    option6_client_fqdn.h \
-    option6_ia.h \
-    option6_iaaddr.h \
-    option6_iaprefix.h \
-    option6_pdexclude.h \
-    option6_status_code.h \
-    option.h \
-    option_custom.h \
-    option_data_types.h \
-    option_definition.h \
-    option_int.h \
-    option_int_array.h \
-    option_opaque_data_tuples.h \
-    option_space.h \
-    option_space_container.h \
-    option_string.h \
-    option_vendor.h \
-    option_vendor_class.h \
-    pkt.h \
-    pkt4.h \
-    pkt4o6.h \
-    pkt6.h \
-    pkt_filter.h \
-    pkt_filter6.h \
-    pkt_filter_bpf.h \
-    pkt_filter_inet.h \
-    pkt_filter_inet6.h \
-    pkt_filter_lpf.h \
-    protocol_util.h \
-    std_option_defs.h
+       classify.h \
+       dhcp4.h \
+       dhcp6.h \
+       duid.h \
+       duid_factory.h \
+       docsis3_option_defs.h \
+       hwaddr.h \
+       iface_mgr.h \
+       iface_mgr_error_handler.h \
+       libdhcp++.h \
+       opaque_data_tuple.h \
+       option4_addrlst.h \
+       option4_client_fqdn.h \
+       option6_addrlst.h \
+       option6_client_fqdn.h \
+       option6_ia.h \
+       option6_iaaddr.h \
+       option6_iaprefix.h \
+       option6_pdexclude.h \
+       option6_status_code.h \
+       option.h \
+       option_custom.h \
+       option_data_types.h \
+       option_definition.h \
+       option_int.h \
+       option_int_array.h \
+       option_opaque_data_tuples.h \
+       option_space.h \
+       option_space_container.h \
+       option_string.h \
+       option_vendor.h \
+       option_vendor_class.h \
+       pkt.h \
+       pkt4.h \
+       pkt4o6.h \
+       pkt6.h \
+       pkt_filter.h \
+       pkt_filter6.h \
+       pkt_filter_inet.h \
+       pkt_filter_inet6.h \
+       protocol_util.h \
+       std_option_defs.h
+
+if OS_LINUX
+libkea_dhcp___include_HEADERS += \
+       pkt_filter_lpf.h
+endif
+
+if OS_BSD
+libkea_dhcp___include_HEADERS += \
+       pkt_filter_bpf.h
+endif

diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
index 6ebb2d751f5042721d8bc245089e34293fc8e1c5..0a8db5e213b008fd0dea8992c4b8f31f01f6e123 100644 (file)
--- a/src/lib/dhcp_ddns/Makefile.am
+++ b/src/lib/dhcp_ddns/Makefile.am
@@ -52,6 +52,8 @@ libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 # Specify the headers for copying into the installation directory tree.
 libkea_dhcp_ddns_includedir = $(pkgincludedir)/dhcp_ddns
 libkea_dhcp_ddns_include_HEADERS = \
-   ncr_io.h \
-   ncr_msg.h \
-   ncr_udp.h
+       dhcp_ddns_log.h \
+       dhcp_ddns_messages.h \
+       ncr_io.h \
+       ncr_msg.h \
+       ncr_udp.h

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index 0ab949294bd2352937997a7c6520b13bc2c77a78..bfdc8f000666ddf32b41e965001ef5bea18ec132 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -188,7 +188,7 @@ libkea_dhcpsrv_la_SOURCES += parsers/simple_parser4.h
 libkea_dhcpsrv_la_SOURCES += parsers/simple_parser6.cc
 libkea_dhcpsrv_la_SOURCES += parsers/simple_parser6.h
 
-nodist_libkea_dhcpsrv_la_SOURCES = alloc_engine__messages.h
+nodist_libkea_dhcpsrv_la_SOURCES = alloc_engine_messages.h
 nodist_libkea_dhcpsrv_la_SOURCES += alloc_engine_messages.cc
 nodist_libkea_dhcpsrv_la_SOURCES += dhcpsrv_messages.h dhcpsrv_messages.cc
 nodist_libkea_dhcpsrv_la_SOURCES += hosts_messages.h hosts_messages.cc
@@ -235,21 +235,109 @@ 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.
+# Specify the headers for copying into the installation directory tree.
 libkea_dhcpsrv_includedir = $(pkgincludedir)/dhcpsrv
 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
+       addr_utilities.h \
+       alloc_engine.h \
+       alloc_engine_log.h \
+       alloc_engine_messages.h \
+       assignable_network.h \
+       base_host_data_source.h \
+       callout_handle_store.h \
+       cfg_4o6.h \
+       cfg_db_access.h \
+       cfg_duid.h \
+       cfg_hosts.h \
+       cfg_hosts_util.h \
+       cfg_iface.h \
+       cfg_expiration.h \
+       cfg_host_operations.h \
+       cfg_option.h \
+       cfg_option_def.h \
+       cfg_rsoo.h \
+       cfg_shared_networks.h \
+       cfg_subnets4.h \
+       cfg_subnets6.h \
+       cfg_mac_source.h \
+       cfgmgr.h \
+       client_class_def.h \
+       csv_lease_file4.h \
+       csv_lease_file6.h \
+       d2_client_cfg.h \
+       d2_client_mgr.h \
+       daemon.h \
+       database_connection.h \
+       db_exceptions.h \
+       dhcp4o6_ipc.h \
+       dhcpsrv_log.h \
+       dhcpsrv_messages.h \
+       host.h \
+       host_container.h \
+       host_data_source_factory.h \
+       host_mgr.h \
+       hosts_log.h \
+       hosts_messages.h \
+       key_from_key.h \
+       lease.h \
+       lease_file_loader.h \
+       lease_file_stats.h \
+       lease_mgr.h \
+       lease_mgr_factory.h \
+       logging.h \
+       logging_info.h \
+       memfile_lease_mgr.h \
+       memfile_lease_storage.h \
+       ncr_generator.h \
+       network.h \
+       pool.h \
+       shared_network.h \
+       srv_config.h \
+       subnet.h \
+       subnet_id.h \
+       subnet_selector.h \
+       timer_mgr.h \
+       triplet.h \
+       utils.h \
+       writable_host_data_source.h
+
+if HAVE_MYSQL
+libkea_dhcpsrv_include_HEADERS += \
+       mysql_lease_mgr.h \
+       mysql_connection.h \
+       mysql_host_data_source.h
+endif
+
+if HAVE_PGSQL
+libkea_dhcpsrv_include_HEADERS += \
+       pgsql_connection.h \
+       pgsql_exchange.h \
+       pgsql_host_data_source.h \
+       pgsql_lease_mgr.h
+endif
+
+if HAVE_CQL
+libkea_dhcpsrv_include_HEADERS += \
+       cql_lease_mgr.h \
+       cql_connection.h
+endif
+
+# Specify parsers' headers for copying into installation directory tree.
+libkea_dhcpsrv_parsers_includedir = $(pkgincludedir)/dhcpsrv/parsers
+libkea_dhcpsrv_parsers_include_HEADERS = \
+       parsers/client_class_def_parser.h \
+       parsers/dbaccess_parser.h \
+       parsers/dhcp_parsers.h \
+       parsers/duid_config_parser.h \
+       parsers/expiration_config_parser.h \
+       parsers/host_reservation_parser.h \
+       parsers/ifaces_config_parser.h \
+       parsers/option_data_parser.h \
+       parsers/shared_network_parser.h \
+       parsers/shared_networks_list_parser.h \
+       parsers/simple_parser4.h \
+       parsers/simple_parser6.h
+
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)

diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index b6fc5e02affa7e2e9b0ff6fa2ee7da53647ea2f0..8ed08099fb3042cd3982a55d393ee0c842c5d524 100644 (file)
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -102,3 +102,16 @@ parser location.hh position.hh stack.hh parser.cc parser.h lexer.cc:
        @echo Parser generation disabled. Configure with --enable-generate-parser to enable it.
 
 endif
+
+
+# Specify the headers for copying into the installation directory tree.
+libkea_eval_includedir = $(pkgincludedir)/eval
+libkea_eval_include_HEADERS = \
+       eval_log.h \
+       evaluate.h \
+       token.h \
+       parser.h \
+       eval_context.h \
+       eval_context_decl.h \
+       eval_messages.h
+

diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am
index b2daa2b63bed22414c7acbe69c8c0206ec01960e..f9532a9d01941509468dc0576df5feccbaf7ccfa 100644 (file)
--- a/src/lib/hooks/Makefile.am
+++ b/src/lib/hooks/Makefile.am
@@ -59,14 +59,22 @@ libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.l
 libkea_hooks_la_LIBADD += $(BOOST_LIBS)
 libkea_hooks_la_LIBADD += $(LOG4CPLUS_LIBS)
 
-# 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. CalloutManager may be required by
-# users testing statically linked KEA binaries.
+# Specify the headers for copying into the installation directory tree.
 libkea_hooks_includedir = $(pkgincludedir)/hooks
 libkea_hooks_include_HEADERS = \
-    callout_handle.h \
-    callout_manager.h \
-    library_handle.h \
-    hooks.h \
-    server_hooks.h
+       callout_handle.h \
+       callout_manager.h \
+       hooks.h \
+       hooks_log.h \
+       hooks_manager.h \
+       hooks_messages.h \
+       hooks_config.h \
+       hooks_parser.h \
+       libinfo.h \
+       library_handle.h \
+       library_manager.h \
+       library_manager_collection.h \
+       pointer_converter.h \
+       server_hooks.h
+
+

diff --git a/src/lib/http/Makefile.am b/src/lib/http/Makefile.am
index 588b138ad1af02073f7467974ef98ecd21de0f3d..45de0d79f1623345e359c3c517561d775e068418 100644 (file)
--- a/src/lib/http/Makefile.am
+++ b/src/lib/http/Makefile.am
@@ -57,6 +57,24 @@ libkea_http_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_http_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS)
 
 # Specify the headers for copying into the installation directory tree.
-libkea_process_includedir = $(pkgincludedir)/http
-libkea_process_include_HEADERS = \
-       http_log.h
+libkea_http_includedir = $(pkgincludedir)/http
+libkea_http_include_HEADERS = \
+       connection.h \
+       connection_pool.h \
+       date_time.h \
+       http_log.h \
+       header_context.h \
+       http_acceptor.h \
+       http_messages.h \
+       http_types.h \
+       listener.h \
+       post_request.h \
+       post_request_json.h \
+       request.h \
+       request_context.h \
+       request_parser.h \
+       response.h \
+       response_creator.h \
+       response_creator_factory.h \
+       response_json.h
+

diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index f276564f3440e30d41a384bea146edd707a9a314..a77fd9cf84a8275cfa95c0ce638bc61f50eef909 100644 (file)
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -50,15 +50,30 @@ libkea_log_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_log_la_LIBADD  += $(LOG4CPLUS_LIBS)
 libkea_log_la_LDFLAGS = -no-undefined -version-info 3:0:0
 
-# Specify the headers for copying into the installation directory tree. User-
-# written libraries only need the definitions for logger.h and dependencies.
+# Specify the headers for copying into the installation directory tree.
 libkea_log_includedir = $(pkgincludedir)/log
 libkea_log_include_HEADERS = \
-    log_dbglevels.h \
-    log_formatter.h \
-    logger.h \
-    logger_level.h \
-    macros.h \
-    message_initializer.h \
-    message_types.h
+       logimpl_messages.h \
+       log_dbglevels.h \
+       log_formatter.h \
+       logger.h \
+       logger_impl.h \
+       logger_level.h \
+       logger_level_impl.h \
+       logger_manager.h \
+       logger_manager_impl.h \
+       logger_name.h \
+       logger_specification.h \
+       logger_support.h \
+       logger_unittest_support.h \
+       log_messages.h \
+       macros.h \
+       message_dictionary.h \
+       message_exception.h \
+       message_initializer.h \
+       message_reader.h \
+       message_types.h \
+       output_option.h \
+       buffer_appender_impl.h
+
 

diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am
index d6ed1c7d1f2a1849cbc20620a9e948a1c3c1cf1e..68aebb1dd6f6c2dbf223a40bc0a9295a5f3af4ab 100644 (file)
--- a/src/lib/process/Makefile.am
+++ b/src/lib/process/Makefile.am
@@ -69,4 +69,5 @@ libkea_process_include_HEADERS = \
        d_cfg_mgr.h \
        d_controller.h \
        d_process.h \
-       io_service_signal.h
+       io_service_signal.h \
+       process_messages.h

diff --git a/src/lib/stats/Makefile.am b/src/lib/stats/Makefile.am
index 5534898ae03f5cefbd014a0ac822cd913ba68ee9..dd43461b13f4add17ef55dd3c391fe25dba50aeb 100644 (file)
--- a/src/lib/stats/Makefile.am
+++ b/src/lib/stats/Makefile.am
@@ -18,4 +18,8 @@ libkea_stats_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.l
 libkea_stats_la_LIBADD += $(BOOST_LIBS)
 
 libkea_stats_includedir = $(pkgincludedir)/stats
-libkea_stats_include_HEADERS = stats_mgr.h
+libkea_stats_include_HEADERS = \
+       observation.h \
+       context.h \
+       stats_mgr.h
+

diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 64af9ebf0e1a93d19a8f46360e5c0a8e3d0433f6..971566586df6a965e8c86a3733fd46dd8a50b1c9 100644 (file)
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -43,12 +43,43 @@ 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 \
+       io_utilities.h \
+       csv_file.h \
+       filename.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/base64.h \
+       encode/base32hex_from_binary.h \
+       encode/binary_from_base32hex.h \
+       encode/binary_from_base16.h \
+       encode/hex.h
+
+libkea_util_random_includedir = $(pkgincludedir)/util/random
+libkea_util_random_include_HEADERS = \
+       random/qid_gen.h \
+       random/random_number_generator.h