From: Francis Dupont Date: Thu, 19 Oct 2017 15:46:35 +0000 (+0200) Subject: [5372] Added some missing? headers and sort file name lists X-Git-Tag: trac5266_base~1^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b258be837fb7a7b336c8b30b5d18536856ed7a4;p=thirdparty%2Fkea.git [5372] Added some missing? headers and sort file name lists --- diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am index cf863cc170..3761d10c46 100644 --- a/src/lib/asiodns/Makefile.am +++ b/src/lib/asiodns/Makefile.am @@ -39,6 +39,7 @@ 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 = \ + asiodns_messages.h \ io_fetch.h \ logger.h diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am index 8ac6944244..c92123220d 100644 --- a/src/lib/asiolink/Makefile.am +++ b/src/lib/asiolink/Makefile.am @@ -47,8 +47,8 @@ libkea_asiolink_la_LIBADD += $(BOOST_LIBS) # 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 \ dummy_io_cb.h \ interval_timer.h \ io_acceptor.h \ diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am index d914b3835c..ffbf4cdf07 100644 --- a/src/lib/cc/Makefile.am +++ b/src/lib/cc/Makefile.am @@ -21,10 +21,10 @@ libkea_cc_la_LDFLAGS = -no-undefined -version-info 2:0:0 # Specify the headers for copying into the installation directory tree. libkea_cc_includedir = $(pkgincludedir)/cc libkea_cc_include_HEADERS = \ - data.h \ cfg_to_element.h \ - dhcp_config_error.h \ command_interpreter.h \ + data.h \ + dhcp_config_error.h \ json_feed.h \ simple_parser.h diff --git a/src/lib/cfgrpt/Makefile.am b/src/lib/cfgrpt/Makefile.am index beed7c3678..44b2d3ae84 100644 --- a/src/lib/cfgrpt/Makefile.am +++ b/src/lib/cfgrpt/Makefile.am @@ -21,3 +21,9 @@ report_file = $(abs_top_builddir)/config.report # Generate config_report.cc config_report.cc: $(report_file) ${SHELL} $(top_srcdir)/tools/mk_cfgrpt.sh $(report_file) $(top_builddir)/src/lib/cfgrpt/config_report.cc + +# Specify the headers for copying into the installation directory tree. The +# following headers are anticipated to be useful for the user libraries. +libkea_cfgrpt_includedir = $(pkgincludedir)/cfgrpt +libkea_cfgrpt_include_HEADERS = \ + config_report.h diff --git a/src/lib/cryptolink/Makefile.am b/src/lib/cryptolink/Makefile.am index d6e0d1e0a0..0831fb98f3 100644 --- a/src/lib/cryptolink/Makefile.am +++ b/src/lib/cryptolink/Makefile.am @@ -34,9 +34,9 @@ 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 + crypto_hmac.h \ + cryptolink.h if HAVE_BOTAN libkea_cryptolink_include_HEADERS += \ diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am index 855e739c00..b10b6dd5e8 100644 --- a/src/lib/dhcp/Makefile.am +++ b/src/lib/dhcp/Makefile.am @@ -85,14 +85,15 @@ libkea_dhcp___include_HEADERS = \ classify.h \ dhcp4.h \ dhcp6.h \ + docsis3_option_defs.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 \ + option.h \ option4_addrlst.h \ option4_client_fqdn.h \ option6_addrlst.h \ @@ -102,7 +103,6 @@ libkea_dhcp___include_HEADERS = \ option6_iaprefix.h \ option6_pdexclude.h \ option6_status_code.h \ - option.h \ option_custom.h \ option_data_types.h \ option_definition.h \ @@ -123,7 +123,7 @@ libkea_dhcp___include_HEADERS = \ pkt_filter_inet.h \ pkt_filter_inet6.h \ protocol_util.h \ - std_option_defs.h + std_option_defs.h \ if OS_LINUX libkea_dhcp___include_HEADERS += \ diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index bfdc8f0006..2fae5665d4 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -248,18 +248,18 @@ libkea_dhcpsrv_include_HEADERS = \ cfg_4o6.h \ cfg_db_access.h \ cfg_duid.h \ + cfg_expiration.h \ + cfg_host_operations.h \ cfg_hosts.h \ cfg_hosts_util.h \ cfg_iface.h \ - cfg_expiration.h \ - cfg_host_operations.h \ + cfg_mac_source.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 \ @@ -301,11 +301,17 @@ libkea_dhcpsrv_include_HEADERS = \ utils.h \ writable_host_data_source.h +if HAVE_CQL +libkea_dhcpsrv_include_HEADERS += \ + cql_connection.h \ + cql_lease_mgr.h +endif + if HAVE_MYSQL libkea_dhcpsrv_include_HEADERS += \ - mysql_lease_mgr.h \ mysql_connection.h \ - mysql_host_data_source.h + mysql_host_data_source.h \ + mysql_lease_mgr.h endif if HAVE_PGSQL @@ -316,12 +322,6 @@ libkea_dhcpsrv_include_HEADERS += \ 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 = \ @@ -331,6 +331,7 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ parsers/duid_config_parser.h \ parsers/expiration_config_parser.h \ parsers/host_reservation_parser.h \ + parsers/host_reservations_list_parser.h \ parsers/ifaces_config_parser.h \ parsers/option_data_parser.h \ parsers/shared_network_parser.h \ diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am index 7d197c9c89..ac80a93d93 100644 --- a/src/lib/dns/Makefile.am +++ b/src/lib/dns/Makefile.am @@ -178,27 +178,40 @@ s-rdatacode: Makefile $(EXTRA_DIST) libdns___includedir = $(pkgincludedir)/dns libdns___include_HEADERS = \ + dns_fwd.h \ edns.h \ exceptions.h \ - dns_fwd.h \ labelsequence.h \ - message.h \ - masterload.h \ master_lexer.h \ + master_lexer_inputsource.h \ + master_lexer_state.h \ master_loader.h \ master_loader_callbacks.h \ + masterload.h \ + message.h \ messagerenderer.h \ name.h \ - question.h \ + nsec3hash.h \ opcode.h \ + question.h \ rcode.h \ rdata.h \ + rdata_pimpl_holder.h \ + rdataclass.h \ + rdatafields.h \ + rrclass.h \ + rrcollator.h \ rrparamregistry.h \ rrset.h \ - rrset_collection_base.h \ rrset_collection.h \ + rrset_collection_base.h \ rrttl.h \ + rrtype.h \ + serial.h \ + tsig.h \ + tsigerror.h \ tsigkey.h \ + tsigrecord.h \ zone_checker.h # Purposely not installing these headers: # name_internal.h: used only internally, and not actually DNS specific diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am index 8ed08099fb..6c03352c08 100644 --- a/src/lib/eval/Makefile.am +++ b/src/lib/eval/Makefile.am @@ -107,11 +107,11 @@ endif # Specify the headers for copying into the installation directory tree. libkea_eval_includedir = $(pkgincludedir)/eval libkea_eval_include_HEADERS = \ + eval_context.h \ + eval_context_decl.h \ eval_log.h \ + eval_messages.h \ evaluate.h \ - token.h \ parser.h \ - eval_context.h \ - eval_context_decl.h \ - eval_messages.h - + token.h +# does not include *.hh generated headers as they come with lexer and parser. diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am index f9532a9d01..77251cb872 100644 --- a/src/lib/hooks/Makefile.am +++ b/src/lib/hooks/Makefile.am @@ -65,10 +65,10 @@ libkea_hooks_include_HEADERS = \ callout_handle.h \ callout_manager.h \ hooks.h \ + hooks_config.h \ hooks_log.h \ hooks_manager.h \ hooks_messages.h \ - hooks_config.h \ hooks_parser.h \ libinfo.h \ library_handle.h \ diff --git a/src/lib/http/Makefile.am b/src/lib/http/Makefile.am index 45de0d79f1..28b42078f6 100644 --- a/src/lib/http/Makefile.am +++ b/src/lib/http/Makefile.am @@ -62,9 +62,9 @@ libkea_http_include_HEADERS = \ connection.h \ connection_pool.h \ date_time.h \ - http_log.h \ header_context.h \ http_acceptor.h \ + http_log.h \ http_messages.h \ http_types.h \ listener.h \ diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am index a77fd9cf84..2da452a169 100644 --- a/src/lib/log/Makefile.am +++ b/src/lib/log/Makefile.am @@ -53,9 +53,10 @@ libkea_log_la_LDFLAGS = -no-undefined -version-info 3:0:0 # Specify the headers for copying into the installation directory tree. libkea_log_includedir = $(pkgincludedir)/log libkea_log_include_HEADERS = \ - logimpl_messages.h \ + buffer_appender_impl.h \ log_dbglevels.h \ log_formatter.h \ + log_messages.h \ logger.h \ logger_impl.h \ logger_level.h \ @@ -66,14 +67,17 @@ libkea_log_include_HEADERS = \ logger_specification.h \ logger_support.h \ logger_unittest_support.h \ - log_messages.h \ + logimpl_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 - + output_option.h +libkea_log_interprocess_includedir = $(pkgincludedir)/log/interprocess +libkea_log_interprocess_include_HEADERS = \ + interprocess/interprocess_sync.h \ + interprocess/interprocess_sync_file.h \ + interprocess/interprocess_sync_null.h diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am index 68aebb1dd6..c6ff09afab 100644 --- a/src/lib/process/Makefile.am +++ b/src/lib/process/Makefile.am @@ -65,9 +65,9 @@ libkea_process_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) # Specify the headers for copying into the installation directory tree. libkea_process_includedir = $(pkgincludedir)/process libkea_process_include_HEADERS = \ - d_log.h \ d_cfg_mgr.h \ d_controller.h \ + d_log.h \ d_process.h \ io_service_signal.h \ process_messages.h diff --git a/src/lib/stats/Makefile.am b/src/lib/stats/Makefile.am index dd43461b13..2648c62553 100644 --- a/src/lib/stats/Makefile.am +++ b/src/lib/stats/Makefile.am @@ -19,7 +19,7 @@ libkea_stats_la_LIBADD += $(BOOST_LIBS) libkea_stats_includedir = $(pkgincludedir)/stats libkea_stats_include_HEADERS = \ - observation.h \ context.h \ + observation.h \ stats_mgr.h diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am index 971566586d..7c0bac0096 100644 --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am @@ -48,9 +48,9 @@ libkea_util_includedir = $(pkgincludedir)/util libkea_util_include_HEADERS = \ boost_time_utils.h \ buffer.h \ - io_utilities.h \ csv_file.h \ filename.h \ + io_utilities.h \ labeled_value.h \ memory_segment.h \ memory_segment_local.h \ @@ -73,13 +73,26 @@ 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/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