[#3443] Extra additions to the additions to the Meson Proof of Concept

diff --git a/compiler-checks/have-generic-tls-method.cc b/compiler-checks/have-generic-tls-method.cc
index 98b2b2f96f6623c75ba37ab6fe5464255f7d80b8..7f10e8ccdd4a2a4ee3b0c657b156e027189427f0 100644 (file)
--- a/compiler-checks/have-generic-tls-method.cc
+++ b/compiler-checks/have-generic-tls-method.cc
@@ -2,4 +2,5 @@
 
 int main() {
     auto _(boost::asio::ssl::context::tls);
+    return 0;
 }

diff --git a/compiler-checks/have-sa-len.cc b/compiler-checks/have-sa-len.cc
index 12f96c9532b396a0f02c589fe9bfbf83554310c1..b7d2e95249b43d59d368dd748912ab17c0ca13d5 100644 (file)
--- a/compiler-checks/have-sa-len.cc
+++ b/compiler-checks/have-sa-len.cc
@@ -4,4 +4,5 @@
 int main() {
     struct sockaddr sa;
     sa.sa_len = 0;
+    return 0;
 }

diff --git a/compiler-checks/mysql-my-bool.cc b/compiler-checks/mysql-my-bool.cc
index a9f7206b9cee5867dc2b17e5476e2a53280566e8..71b76a672f21552fa30121025e3aa64790250fe6 100644 (file)
--- a/compiler-checks/mysql-my-bool.cc
+++ b/compiler-checks/mysql-my-bool.cc
@@ -2,4 +2,5 @@
 
 int main() {
     my_bool _(0);
+    return 0;
 }

diff --git a/compiler-checks/stream-truncated-error.cc b/compiler-checks/stream-truncated-error.cc
index 4eaff237bb353bbe0741b2abead369a966929c9e..e7639926f2befb4d5db14d346e1a8fd932ee3c0d 100644 (file)
--- a/compiler-checks/stream-truncated-error.cc
+++ b/compiler-checks/stream-truncated-error.cc
@@ -2,4 +2,5 @@
 
 int main() {
     auto _(boost::asio::ssl::error::stream_truncated);
+    return 0;
 }

diff --git a/meson.build b/meson.build
index 9ec21de3b7d557a46b231852059fde1efc64cd02..ab6c2cce46ebd7232a33e28acccd899426156f10 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -115,6 +115,7 @@ conf_data = configuration_data(
 boost = dependency('boost', version: '>=1.66')
 gtest = dependency('gtest', required: false)
 log4cplus = dependency('log4cplus')
+threads = dependency('threads')
 
 # Cryptography
 crypto = disabler()
@@ -135,10 +136,7 @@ elif botan.found()
     conf_data.set('WITH_BOTAN', true)
     message('Using Botan.')
     message('Checking Botan Boost support.')
-    cpp.has_header(
-        'botan/asio_stream.h',
-        dependencies: botan,
-        required: true)
+    cpp.has_header('botan/asio_stream.h', dependencies: [botan], required: true)
 endif
 if not crypto.found()
     error('Build failed: Could not find neither botan nor openssl libraries.')
@@ -213,7 +211,7 @@ foreach dep : ['yang', 'yang-cpp', 'sysrepo', 'sysrepo-cpp']
         if lib.found()
             netconf_deps = netconf_deps + {
                 dep: declare_dependency(
-                    dependencies: lib,
+                    dependencies: [lib],
                     include_directories: include_directories(
                         f'/opt/@dep@/include',
                     ),
@@ -309,6 +307,8 @@ configure_file(
     input: 'meson-config.h.in',
     output: 'config.h',
     configuration: conf_data,
+    install: true,
+    install_dir: 'include/kea',
 )
 
 # TODO: Change to kea_version.h.in when autotools are removed.
@@ -316,6 +316,8 @@ configure_file(
     input: 'meson-kea_version.h.in',
     output: 'kea_version.h',
     configuration: conf_data,
+    install: true,
+    install_dir: 'include/kea',
 )
 
 #### Default Includes

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 0642a57de36819b11343c9925d555945f049f9b0..bc7f2502b30d5f9a9a4ce46209392c2df73b1d76 100755 (executable)
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 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/bin/admin/meson.build b/src/bin/admin/meson.build
index 3576c8d0c4affd20a5c8b02e114dcc109857db35..241631a3dff19f76d43533dc25fc3dfca8309f66 100644 (file)
--- a/src/bin/admin/meson.build
+++ b/src/bin/admin/meson.build
@@ -13,11 +13,7 @@ kea_admin_conf_data.set('variables', 'variables')
 configure_file(
     input: 'kea-admin.in',
     output: 'kea-admin',
-    configuration: kea_admin_conf_data
-)
-configure_file(
-    input: 'admin-utils.sh.in',
-    output: 'admin-utils.sh',
-    copy: true
+    configuration: kea_admin_conf_data,
 )
+configure_file(input: 'admin-utils.sh.in', output: 'admin-utils.sh', copy: true)
 # install?

diff --git a/src/bin/dhcp4/meson.build b/src/bin/dhcp4/meson.build
index 3dc437661f298bc19589a32fec6287e572022304..106faa565e3402a2aeae8710edf06a541846fefa 100644 (file)
--- a/src/bin/dhcp4/meson.build
+++ b/src/bin/dhcp4/meson.build
@@ -21,5 +21,5 @@ executable(
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'sbin',
-    link_with: LIBS_BUILT_SO_FAR + [dhcp4_lib],
+    link_with: [dhcp4_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/bin/dhcp6/meson.build b/src/bin/dhcp6/meson.build
index 146eb9765e851f5edd31b374616c964b8ba3ae39..f27f128f76b87c406baec2285e12d7d3c14f01f2 100644 (file)
--- a/src/bin/dhcp6/meson.build
+++ b/src/bin/dhcp6/meson.build
@@ -1,26 +1,16 @@
 dhcp6_lib = static_library(
     'dhcp6',
     'client_handler.cc',
-    'client_handler.h',
     'ctrl_dhcp6_srv.cc',
-    'ctrl_dhcp6_srv.h',
     'dhcp6to4_ipc.cc',
-    'dhcp6to4_ipc.h',
     'dhcp6_lexer.cc',
     'dhcp6_log.cc',
-    'dhcp6_log.h',
     'dhcp6_messages.cc',
-    'dhcp6_messages.h',
     'dhcp6_parser.cc',
-    'dhcp6_parser.h',
     'dhcp6_srv.cc',
-    'dhcp6_srv.h',
     'json_config_parser.cc',
-    'json_config_parser.h',
     'main.cc',
     'parser_context.cc',
-    'parser_context.h',
-    'parser_context_decl.h',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
@@ -32,5 +22,5 @@ executable(
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'sbin',
-    link_with: LIBS_BUILT_SO_FAR + [dhcp6_lib],
+    link_with: [dhcp6_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/bin/lfc/meson.build b/src/bin/lfc/meson.build
index f8bb3160ad9983c6bdacdff9b86c11392b18ac0a..33045efc99e66da93adf040636272a6fdad5fe08 100644 (file)
--- a/src/bin/lfc/meson.build
+++ b/src/bin/lfc/meson.build
@@ -1,19 +1,18 @@
 lfc_lib = static_library(
     'lfc',
     'lfc_controller.cc',
-    'lfc_controller.h',
     'lfc_log.cc',
-    'lfc_log.h',
     'lfc_messages.cc',
-    'lfc_messages.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 executable(
     'kea-lfc',
     'main.cc',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'sbin',
-    link_with: LIBS_BUILT_SO_FAR + [lfc_lib],
+    link_with: [lfc_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/bin/perfdhcp/meson.build b/src/bin/perfdhcp/meson.build
index fa73e45f164166550e1740b9e70d868d61d6f398..fb5a9c7505a48d65aa95e62062aa1d8f7e9db5fc 100644 (file)
--- a/src/bin/perfdhcp/meson.build
+++ b/src/bin/perfdhcp/meson.build
@@ -1,38 +1,26 @@
 perfdhcplib_lib = static_library(
     'perfdhcplib',
-    'abstract_scen.h',
     'avalanche_scen.cc',
-    'avalanche_scen.h',
     'basic_scen.cc',
-    'basic_scen.h',
     'command_options.cc',
-    'command_options.h',
-    'localized_option.h',
-    'packet_storage.h',
     'perf_pkt4.cc',
-    'perf_pkt4.h',
     'perf_pkt6.cc',
-    'perf_pkt6.h',
     'perf_socket.cc',
-    'perf_socket.h',
     'pkt_transform.cc',
-    'pkt_transform.h',
     'rate_control.cc',
-    'rate_control.h',
     'receiver.cc',
-    'receiver.h',
     'stats_mgr.cc',
-    'stats_mgr.h',
     'test_control.cc',
-    'test_control.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 executable(
     'perfdhcp',
     'main.cc',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'sbin',
-    link_with: LIBS_BUILT_SO_FAR + [perfdhcplib_lib],
+    link_with: [perfdhcplib_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/hooks/dhcp/bootp/meson.build b/src/hooks/dhcp/bootp/meson.build
index 2e821d6951281f176bf15628a14b4a03cf1ddcae..3beb92194b403deb4c0e282fc4012d982b08714f 100644 (file)
--- a/src/hooks/dhcp/bootp/meson.build
+++ b/src/hooks/dhcp/bootp/meson.build
@@ -2,13 +2,12 @@ dhcp_bootp_lib = library(
     'dhcp_bootp',
     'bootp_callouts.cc',
     'bootp_log.cc',
-    'bootp_log.h',
     'bootp_messages.cc',
-    'bootp_messages.h',
     'version.cc',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
-    name_suffix: 'so'
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/flex_option/meson.build b/src/hooks/dhcp/flex_option/meson.build
index 881a163f534e3a3f29d111ee7d7d0626dc65f039..6c0903aea99207a9c5a24e54326732707c3c5d3b 100644 (file)
--- a/src/hooks/dhcp/flex_option/meson.build
+++ b/src/hooks/dhcp/flex_option/meson.build
@@ -1,16 +1,14 @@
 dhcp_flex_option_lib = library(
     'dhcp_flex_option',
     'flex_option.cc',
-    'flex_option.h',
     'flex_option_callouts.cc',
     'flex_option_log.cc',
-    'flex_option_log.h',
     'flex_option_messages.cc',
-    'flex_option_messages.h',
     'version.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/high_availability/meson.build b/src/hooks/dhcp/high_availability/meson.build
index 99730a78d85f0cbdb5bdddbaf2ecb6f9e133dceb..6f64bfa279a672f31f2113289835076badd8ba05 100644 (file)
--- a/src/hooks/dhcp/high_availability/meson.build
+++ b/src/hooks/dhcp/high_availability/meson.build
@@ -1,36 +1,23 @@
 dhcp_high_availability_lib = library(
     'dhcp_high_availability',
     'command_creator.cc',
-    'command_creator.h',
     'communication_state.cc',
-    'communication_state.h',
     'ha_callouts.cc',
     'ha_config.cc',
-    'ha_config.h',
     'ha_config_parser.cc',
-    'ha_config_parser.h',
     'ha_impl.cc',
-    'ha_impl.h',
     'ha_log.cc',
-    'ha_log.h',
     'ha_messages.cc',
-    'ha_messages.h',
-    'ha_relationship_mapper.h',
-    'ha_server_type.h',
     'ha_service.cc',
-    'ha_service.h',
     'ha_service_states.cc',
-    'ha_service_states.h',
     'lease_sync_filter.cc',
-    'lease_sync_filter.h',
     'lease_update_backlog.cc',
-    'lease_update_backlog.h',
     'query_filter.cc',
-    'query_filter.h',
     'version.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/lease_cmds/meson.build b/src/hooks/dhcp/lease_cmds/meson.build
index e686d8963b1eec270629e2d242363f7344a5dc99..4c72e45b5dad1a170199f12d128a1575852b6dad 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/meson.build
+++ b/src/hooks/dhcp/lease_cmds/meson.build
@@ -1,19 +1,15 @@
 dhcp_lease_cmds_lib = library(
     'dhcp_lease_cmds',
     'lease_cmds.cc',
-    'lease_cmds.h',
     'lease_cmds_callouts.cc',
-    'lease_cmds_exceptions.h',
     'lease_cmds_log.cc',
-    'lease_cmds_log.h',
     'lease_cmds_messages.cc',
-    'lease_cmds_messages.h',
     'lease_parser.cc',
-    'lease_parser.h',
     'version.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/mysql/meson.build b/src/hooks/dhcp/mysql/meson.build
index 63a6581f6bc8fd5c3b0b70e2c297c28134208dce..96550fe9c1ffa228c325302e3f0fca1ccddcdb56 100644 (file)
--- a/src/hooks/dhcp/mysql/meson.build
+++ b/src/hooks/dhcp/mysql/meson.build
@@ -6,32 +6,21 @@ dhcp_mysql_lib = library(
     'dhcp_mysql',
     'mysql_callouts.cc',
     'mysql_cb_dhcp4.cc',
-    'mysql_cb_dhcp4.h',
     'mysql_cb_dhcp6.cc',
-    'mysql_cb_dhcp6.h',
     'mysql_cb_impl.cc',
-    'mysql_cb_impl.h',
     'mysql_cb_log.cc',
-    'mysql_cb_log.h',
     'mysql_cb_messages.cc',
-    'mysql_cb_messages.h',
     'mysql_hb_log.cc',
-    'mysql_hb_log.h',
     'mysql_hb_messages.cc',
-    'mysql_hb_messages.h',
     'mysql_host_data_source.cc',
-    'mysql_host_data_source.h',
     'mysql_lb_log.cc',
-    'mysql_lb_log.h',
     'mysql_lb_messages.cc',
-    'mysql_lb_messages.h',
     'mysql_lease_mgr.cc',
-    'mysql_lease_mgr.h',
-    'mysql_query_macros_dhcp.h',
     'version.cc',
     dependencies: [crypto, mysql],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/perfmon/meson.build b/src/hooks/dhcp/perfmon/meson.build
index 180afeb952199b12b069cd3b62d5e79982a6db63..2a88bb15a3e135f6b125dd03fa43ddd4b1e4ec93 100644 (file)
--- a/src/hooks/dhcp/perfmon/meson.build
+++ b/src/hooks/dhcp/perfmon/meson.build
@@ -1,26 +1,19 @@
 dhcp_perfmon_lib = library(
     'dhcp_perfmon',
     'alarm.cc',
-    'alarm.h',
     'alarm_store.cc',
-    'alarm_store.h',
     'monitored_duration.cc',
-    'monitored_duration.h',
     'monitored_duration_store.cc',
-    'monitored_duration_store.h',
     'perfmon_callouts.cc',
     'perfmon_config.cc',
-    'perfmon_config.h',
     'perfmon_log.cc',
-    'perfmon_log.h',
     'perfmon_messages.cc',
-    'perfmon_messages.h',
     'perfmon_mgr.cc',
-    'perfmon_mgr.h',
     'version.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/pgsql/meson.build b/src/hooks/dhcp/pgsql/meson.build
index a23a5a00259ca55fd871a2dcc143e0065c16a8ea..4a37c10aa69d18c278c52df9dc2408f4b76ab3b9 100644 (file)
--- a/src/hooks/dhcp/pgsql/meson.build
+++ b/src/hooks/dhcp/pgsql/meson.build
@@ -6,32 +6,21 @@ dhcp_pgsql_lib = library(
     'dhcp_pgsql',
     'pgsql_callouts.cc',
     'pgsql_cb_dhcp4.cc',
-    'pgsql_cb_dhcp4.h',
     'pgsql_cb_dhcp6.cc',
-    'pgsql_cb_dhcp6.h',
     'pgsql_cb_impl.cc',
-    'pgsql_cb_impl.h',
     'pgsql_cb_log.cc',
-    'pgsql_cb_log.h',
     'pgsql_cb_messages.cc',
-    'pgsql_cb_messages.h',
     'pgsql_hb_log.cc',
-    'pgsql_hb_log.h',
     'pgsql_hb_messages.cc',
-    'pgsql_hb_messages.h',
     'pgsql_host_data_source.cc',
-    'pgsql_host_data_source.h',
     'pgsql_lb_log.cc',
-    'pgsql_lb_log.h',
     'pgsql_lb_messages.cc',
-    'pgsql_lb_messages.h',
     'pgsql_lease_mgr.cc',
-    'pgsql_lease_mgr.h',
-    'pgsql_query_macros_dhcp.h',
     'version.cc',
     dependencies: [crypto, postgresql],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/run_script/meson.build b/src/hooks/dhcp/run_script/meson.build
index 36575ca96c1ed6ac3071c5c72ab1059775e8627f..9d23d27d0922168b7ff415d8320dbcf2c1a16717 100644 (file)
--- a/src/hooks/dhcp/run_script/meson.build
+++ b/src/hooks/dhcp/run_script/meson.build
@@ -1,16 +1,14 @@
 dhcp_run_script_lib = library(
     'dhcp_run_script',
     'run_script.cc',
-    'run_script.h',
     'run_script_callouts.cc',
     'run_script_log.cc',
-    'run_script_log.h',
     'run_script_messages.cc',
-    'run_script_messages.h',
     'version.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/stat_cmds/meson.build b/src/hooks/dhcp/stat_cmds/meson.build
index 1b1aa75c4489e513567e872469da3b48c994bcda..fcada06574b2e4e47c257f14d1f8db43f5f7f764 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/meson.build
+++ b/src/hooks/dhcp/stat_cmds/meson.build
@@ -1,16 +1,14 @@
 dhcp_stat_cmds_lib = library(
     'dhcp_stat_cmds',
     'stat_cmds.cc',
-    'stat_cmds.h',
     'stat_cmds_callouts.cc',
     'stat_cmds_log.cc',
-    'stat_cmds_log.h',
     'stat_cmds_messages.cc',
-    'stat_cmds_messages.h',
     'version.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/user_chk/meson.build b/src/hooks/dhcp/user_chk/meson.build
index 373d5cf8513b3f05b2518b0aeb1c6fc8a3bf6844..60160b8f8e559901beb278472ca5313328e8a011 100644 (file)
--- a/src/hooks/dhcp/user_chk/meson.build
+++ b/src/hooks/dhcp/user_chk/meson.build
@@ -5,20 +5,15 @@ dhcp_user_chk_lib = library(
     'pkt_send_co.cc',
     'subnet_select_co.cc',
     'user.cc',
-    'user.h',
-    'user_chk.h',
     'user_chk_log.cc',
-    'user_chk_log.h',
     'user_chk_messages.cc',
-    'user_chk_messages.h',
-    'user_data_source.h',
     'user_file.cc',
-    'user_file.h',
     'user_registry.cc',
-    'user_registry.h',
     'version.cc',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
+    name_suffix: 'so',
 )

diff --git a/src/lib/asiodns/meson.build b/src/lib/asiodns/meson.build
index fa08da6eed1841c657677f9c7d5d8cf664613bac..9eba4c68ea9818a094b8cb1eef8ce1c13b560015 100644 (file)
--- a/src/lib/asiodns/meson.build
+++ b/src/lib/asiodns/meson.build
@@ -1,11 +1,9 @@
 kea_asiodns_lib = library(
     'kea-asiodns',
     'asiodns_messages.cc',
-    'asiodns_messages.h',
     'io_fetch.cc',
-    'io_fetch.h',
     'logger.cc',
-    'logger.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -13,3 +11,5 @@ kea_asiodns_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_asiodns_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_asiodns_headers = ['asiodns_messages.h', 'io_fetch.h', 'logger.h']
+install_headers(kea_asiodns_headers, preserve_path: true, subdir: 'kea/asiodns')

diff --git a/src/lib/asiodns/tests/meson.build b/src/lib/asiodns/tests/meson.build
index e628016d9e7c212f1d521ff549eb667cd7fbaa4a..8f088f58210d019c8d1b74d6c96c677b04eb9774 100644 (file)
--- a/src/lib/asiodns/tests/meson.build
+++ b/src/lib/asiodns/tests/meson.build
@@ -4,6 +4,6 @@ kea_asiodns_tests = executable(
     'run_unittests.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_testutils_lib, kea_util_unittests_lib],
+    link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_asiodns_tests', kea_asiodns_tests, protocol: 'gtest')

diff --git a/src/lib/asiolink/meson.build b/src/lib/asiolink/meson.build
index 6169eec1ddd5f50136e346804445886ccff5f8e2..fcbb94117c0683939d53af1460a68caff19858f0 100644 (file)
--- a/src/lib/asiolink/meson.build
+++ b/src/lib/asiolink/meson.build
@@ -1,38 +1,49 @@
 kea_asiolink_lib = library(
     'kea-asiolink',
     'addr_utilities.cc',
+    'botan_tls.cc',
+    'common_tls.cc',
+    'interval_timer.cc',
+    'io_address.cc',
+    'io_endpoint.cc',
+    'io_service.cc',
+    'io_service_mgr.cc',
+    'io_service_signal.cc',
+    'io_service_thread_pool.cc',
+    'io_socket.cc',
+    'openssl_tls.cc',
+    'process_spawn.cc',
+    'unix_domain_socket.cc',
+    dependencies: [crypto, threads],
+    include_directories: [include_directories('.')] + INCLUDES,
+    install: true,
+    install_dir: 'lib',
+    link_with: LIBS_BUILT_SO_FAR,
+)
+LIBS_BUILT_SO_FAR = [kea_asiolink_lib] + LIBS_BUILT_SO_FAR
+subdir('testutils')
+subdir('tests')
+kea_asiolink_headers = [
     'addr_utilities.h',
     'asiolink.h',
     'asio_wrapper.h',
-    'botan_tls.cc',
     'botan_tls.h',
     'botan_wrapper.h',
-    'common_tls.cc',
     'common_tls.h',
     'crypto_tls.h',
     'dummy_io_cb.h',
-    'interval_timer.cc',
     'interval_timer.h',
     'io_acceptor.h',
-    'io_address.cc',
     'io_address.h',
     'io_asio_socket.h',
-    'io_endpoint.cc',
     'io_endpoint.h',
     'io_error.h',
-    'io_service.cc',
     'io_service.h',
-    'io_service_mgr.cc',
     'io_service_mgr.h',
-    'io_service_signal.cc',
     'io_service_signal.h',
-    'io_service_thread_pool.cc',
     'io_service_thread_pool.h',
-    'io_socket.cc',
     'io_socket.h',
-    'openssl_tls.cc',
     'openssl_tls.h',
-    'process_spawn.cc',
     'process_spawn.h',
     'tcp_acceptor.h',
     'tcp_endpoint.h',
@@ -41,16 +52,12 @@ kea_asiolink_lib = library(
     'tls_socket.h',
     'udp_endpoint.h',
     'udp_socket.h',
-    'unix_domain_socket.cc',
-    'unix_domain_socket.h',
     'unix_domain_socket_acceptor.h',
     'unix_domain_socket_endpoint.h',
-    dependencies: crypto,
-    include_directories: [include_directories('.')] + INCLUDES,
-    install: true,
-    install_dir: 'lib',
-    link_with: LIBS_BUILT_SO_FAR,
+    'unix_domain_socket.h',
+]
+install_headers(
+    kea_asiolink_headers,
+    preserve_path: true,
+    subdir: 'kea/asiolink',
 )
-LIBS_BUILT_SO_FAR = [kea_asiolink_lib] + LIBS_BUILT_SO_FAR
-subdir('testutils')
-subdir('tests')

diff --git a/src/lib/asiolink/tests/meson.build b/src/lib/asiolink/tests/meson.build
index 4ea0369f86aca1fd8300570fe26a18f91f3c83b0..d84f512aeefbccd52ad82c4045fe255824b01570 100644 (file)
--- a/src/lib/asiolink/tests/meson.build
+++ b/src/lib/asiolink/tests/meson.build
@@ -2,7 +2,7 @@ CURRENT_BUILD_DIR = meson.current_build_dir()
 configure_file(
     input: 'process_spawn_app.sh.in',
     output: 'process_spawn_app.sh',
-    copy: true
+    copy: true,
 )
 kea_asiolink_tests = executable(
     'kea-asiolink-tests',
@@ -28,11 +28,13 @@ kea_asiolink_tests = executable(
     'udp_endpoint_unittest.cc',
     'udp_socket_unittest.cc',
     'unix_domain_socket_unittest.cc',
-    cpp_args: [f'-DTEST_SCRIPT_SH="@CURRENT_BUILD_DIR@/process_spawn_app.sh"',
-               f'-DINVALID_TEST_SCRIPT_SH="@TOP_SOURCE_DIR@/README"',
-               f'-DTEST_CA_DIR="@TEST_CA_DIR@"'],
+    cpp_args: [
+        f'-DTEST_SCRIPT_SH="@CURRENT_BUILD_DIR@/process_spawn_app.sh"',
+        f'-DINVALID_TEST_SCRIPT_SH="@TOP_SOURCE_DIR@/README"',
+        f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
+    ],
     dependencies: [gtest, crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_asiolink_testutils_lib, kea_util_unittests_lib]
+    link_with: [kea_asiolink_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_asiolink_tests', kea_asiolink_tests, protocol: 'gtest')

diff --git a/src/lib/asiolink/tests/process_spawn_app.sh.in b/src/lib/asiolink/tests/process_spawn_app.sh.in
index f1cb4eccb5f060805c541b7507ebb34451d12a04..d499ccfc36433f3b68747f720ba5eab4699829db 100755 (executable)
--- a/src/lib/asiolink/tests/process_spawn_app.sh.in
+++ b/src/lib/asiolink/tests/process_spawn_app.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2025 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/asiolink/testutils/meson.build b/src/lib/asiolink/testutils/meson.build
index b1ed072c56e8cd6ec00222dcd66f665d7f3e3e72..fafe6b9c7d4dc7e85fa2938405c2a3a04bf7966a 100644 (file)
--- a/src/lib/asiolink/testutils/meson.build
+++ b/src/lib/asiolink/testutils/meson.build
@@ -6,5 +6,5 @@ kea_asiolink_testutils_lib = static_library(
     cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"'],
     dependencies: [gtest, crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR
+    link_with: LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/cc/meson.build b/src/lib/cc/meson.build
index 3e44a00272e5533734ab76729a44215219c402b1..ef32b66e7d50fe7f44fd02c6a9f4438d97810da8 100644 (file)
--- a/src/lib/cc/meson.build
+++ b/src/lib/cc/meson.build
@@ -5,29 +5,17 @@ endif
 kea_cc_lib = library(
     'kea-cc',
     'base_stamped_element.cc',
-    'base_stamped_element.h',
-    'cfg_to_element.h',
     'command_interpreter.cc',
-    'command_interpreter.h',
     'data.cc',
-    'data.h',
     'default_credentials.cc',
-    'default_credentials.h',
-    'dhcp_config_error.h',
-    'element_value.h',
     'json_feed.cc',
-    'json_feed.h',
     'server_tag.cc',
-    'server_tag.h',
     'simple_parser.cc',
-    'simple_parser.h',
     'stamped_element.cc',
-    'stamped_element.h',
     'stamped_value.cc',
-    'stamped_value.h',
     'user_context.cc',
-    'user_context.h',
     cpp_args: kea_cc_lib_cpp_args,
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -35,3 +23,19 @@ kea_cc_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_cc_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_cc_headers = [
+    'base_stamped_element.h',
+    'cfg_to_element.h',
+    'command_interpreter.h',
+    'data.h',
+    'default_credentials.h',
+    'dhcp_config_error.h',
+    'element_value.h',
+    'json_feed.h',
+    'server_tag.h',
+    'simple_parser.h',
+    'stamped_element.h',
+    'stamped_value.h',
+    'user_context.h',
+]
+install_headers(kea_cc_headers, preserve_path: true, subdir: 'kea/cc')

diff --git a/src/lib/cc/tests/meson.build b/src/lib/cc/tests/meson.build
index de5f171844b150c78037346f9b27ff1d53620d11..f271113ecf6208bf6d6474ce379d8fec9559c191 100644 (file)
--- a/src/lib/cc/tests/meson.build
+++ b/src/lib/cc/tests/meson.build
@@ -13,6 +13,6 @@ kea_cc_tests = executable(
     'user_context_unittests.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_util_unittests_lib],
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_cc_tests', kea_cc_tests, protocol: 'gtest')

diff --git a/src/lib/config/meson.build b/src/lib/config/meson.build
index 09683a7f59b7b4d84cc4ed3aa820cc394808f257..b4130268f53f618ba93188a4d2bc6b557d310666 100644 (file)
--- a/src/lib/config/meson.build
+++ b/src/lib/config/meson.build
@@ -1,35 +1,18 @@
 kea_config_lib = library(
     'kea-config',
     'base_command_mgr.cc',
-    'base_command_mgr.h',
     'client_connection.cc',
-    'client_connection.h',
-    'cmds_impl.h',
     'cmd_http_listener.cc',
-    'cmd_http_listener.h',
     'cmd_response_creator.cc',
-    'cmd_response_creator.h',
-    'cmd_response_creator_factory.h',
     'command_mgr.cc',
-    'command_mgr.h',
     'config_log.cc',
-    'config_log.h',
     'config_messages.cc',
-    'config_messages.h',
     'hooked_command_mgr.cc',
-    'hooked_command_mgr.h',
     'http_command_config.cc',
-    'http_command_config.h',
     'http_command_mgr.cc',
-    'http_command_mgr.h',
     'http_command_response_creator.cc',
-    'http_command_response_creator.h',
-    'http_command_response_creator_factory.h',
-    'timeouts.h',
     'unix_command_config.cc',
-    'unix_command_config.h',
     'unix_command_mgr.cc',
-    'unix_command_mgr.h',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
@@ -37,3 +20,23 @@ kea_config_lib = library(
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_config_lib] + LIBS_BUILT_SO_FAR
+kea_config_headers = [
+    'base_command_mgr.h',
+    'client_connection.h',
+    'cmd_http_listener.h',
+    'cmd_response_creator_factory.h',
+    'cmd_response_creator.h',
+    'cmds_impl.h',
+    'command_mgr.h',
+    'config_log.h',
+    'config_messages.h',
+    'hooked_command_mgr.h',
+    'http_command_config.h',
+    'http_command_mgr.h',
+    'http_command_response_creator_factory.h',
+    'http_command_response_creator.h',
+    'timeouts.h',
+    'unix_command_config.h',
+    'unix_command_mgr.h',
+]
+install_headers(kea_config_headers, preserve_path: true, subdir: 'kea/config')

diff --git a/src/lib/config_backend/meson.build b/src/lib/config_backend/meson.build
index 3a5a3908825bcc734d78e5fc1e742363a1bb8e66..fd61002779ae3e70add9aebdfdce512aadf68a35 100644 (file)
--- a/src/lib/config_backend/meson.build
+++ b/src/lib/config_backend/meson.build
@@ -1,13 +1,12 @@
-kea_config_backend_lib = library(
-    'kea-config_backend',
+subdir('tests')
+kea_config_backend_headers = [
     'base_config_backend.h',
     'base_config_backend_mgr.h',
     'base_config_backend_pool.h',
     'constants.h',
-    include_directories: [include_directories('.')] + INCLUDES,
-    install: true,
-    install_dir: 'lib',
-    link_with: LIBS_BUILT_SO_FAR,
+]
+install_headers(
+    kea_config_backend_headers,
+    preserve_path: true,
+    subdir: 'kea/config_backend',
 )
-LIBS_BUILT_SO_FAR = [kea_config_backend_lib] + LIBS_BUILT_SO_FAR
-subdir('tests')

diff --git a/src/lib/config_backend/tests/meson.build b/src/lib/config_backend/tests/meson.build
index 0c9692843680fb0f0e6161207edb0e5adfa414ad..1c9f30849f61cc970a88833229379735d841a8ae 100644 (file)
--- a/src/lib/config_backend/tests/meson.build
+++ b/src/lib/config_backend/tests/meson.build
@@ -4,6 +4,6 @@ kea_config_backend_tests = executable(
     'run_unittests.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_testutils_lib, kea_util_unittests_lib],
+    link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_config_backend_tests', kea_config_backend_tests, protocol: 'gtest')

diff --git a/src/lib/cryptolink/meson.build b/src/lib/cryptolink/meson.build
index f1e12f5bfb70aa556451c5a137eebd5eb5ce0ad1..076d1fe6b8644f398d39e0e210b0adc4f914911e 100644 (file)
--- a/src/lib/cryptolink/meson.build
+++ b/src/lib/cryptolink/meson.build
@@ -1,30 +1,16 @@
 sources = []
-if crypto == botan
-    sources += [
-        'botan_common.h',
-        'botan_hash.cc',
-        'botan_hmac.cc',
-        'botan_link.cc',
-    ]
-elif crypto == openssl
-    sources += [
-        'openssl_common.h',
-        'openssl_hash.cc',
-        'openssl_hmac.cc',
-        'openssl_link.cc',
-    ]
+if crypto.name() == botan.name()
+    sources += ['botan_hash.cc', 'botan_hmac.cc', 'botan_link.cc']
+elif crypto.name() == openssl.name()
+    sources += ['openssl_hash.cc', 'openssl_hmac.cc', 'openssl_link.cc']
 endif
 
 kea_cryptolink_lib = library(
     'kea-cryptolink',
     'cryptolink.cc',
-    'cryptolink.h',
     'crypto_hash.cc',
-    'crypto_hash.h',
     'crypto_hmac.cc',
-    'crypto_hmac.h',
     'crypto_rng.cc',
-    'crypto_rng.h',
     sources,
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
@@ -34,3 +20,17 @@ kea_cryptolink_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_cryptolink_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_cryptolink_headers = [
+    'botan_common.h',
+    'crypto_hash.h',
+    'crypto_hmac.h',
+    'cryptolink.h',
+    'crypto_rng.h',
+    'openssl_common.h',
+    'openssl_compat.h',
+]
+install_headers(
+    kea_cryptolink_headers,
+    preserve_path: true,
+    subdir: 'kea/cryptolink',
+)

diff --git a/src/lib/cryptolink/tests/meson.build b/src/lib/cryptolink/tests/meson.build
index c738053e893c7b768cfe48f1a61c73c0795af747..0ec4e6604642e54eb97198fdf116d674e00c3a87 100644 (file)
--- a/src/lib/cryptolink/tests/meson.build
+++ b/src/lib/cryptolink/tests/meson.build
@@ -6,6 +6,6 @@ kea_cryptolink_tests = executable(
     'run_unittests.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_util_unittests_lib],
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_cryptolink_tests', kea_cryptolink_tests, protocol: 'gtest')

diff --git a/src/lib/d2srv/meson.build b/src/lib/d2srv/meson.build
index 6ac4a732f916ea900ff4321683083d8334c72d9b..831380e6d345ae47f5d3586451231740cb8aa981 100644 (file)
--- a/src/lib/d2srv/meson.build
+++ b/src/lib/d2srv/meson.build
@@ -1,27 +1,16 @@
 kea_d2srv_lib = library(
     'kea-d2srv',
     'd2_cfg_mgr.cc',
-    'd2_cfg_mgr.h',
     'd2_config.cc',
-    'd2_config.h',
     'd2_log.cc',
-    'd2_log.h',
     'd2_messages.cc',
-    'd2_messages.h',
     'd2_simple_parser.cc',
-    'd2_simple_parser.h',
     'd2_stats.cc',
-    'd2_stats.h',
     'd2_tsig_key.cc',
-    'd2_tsig_key.h',
     'd2_update_message.cc',
-    'd2_update_message.h',
     'd2_zone.cc',
-    'd2_zone.h',
     'dns_client.cc',
-    'dns_client.h',
     'nc_trans.cc',
-    'nc_trans.h',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
@@ -29,3 +18,17 @@ kea_d2srv_lib = library(
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_d2srv_lib] + LIBS_BUILT_SO_FAR
+kea_d2srv_headers = [
+    'd2_cfg_mgr.h',
+    'd2_config.h',
+    'd2_log.h',
+    'd2_messages.h',
+    'd2_simple_parser.h',
+    'd2_stats.h',
+    'd2_tsig_key.h',
+    'd2_update_message.h',
+    'd2_zone.h',
+    'dns_client.h',
+    'nc_trans.h',
+]
+install_headers(kea_d2srv_headers, preserve_path: true, subdir: 'kea/d2srv')

diff --git a/src/lib/database/meson.build b/src/lib/database/meson.build
index c7fce96d65fbd63e0ecabebbfa500a1957f69269..5b01dcbe2459b4a702b44683727bf627ca4cdd45 100644 (file)
--- a/src/lib/database/meson.build
+++ b/src/lib/database/meson.build
@@ -1,24 +1,15 @@
 kea_database_lib = library(
     'kea-database',
     'audit_entry.cc',
-    'audit_entry.h',
     'backend_selector.cc',
-    'backend_selector.h',
     'database_connection.cc',
-    'database_connection.h',
     'dbaccess_parser.cc',
-    'dbaccess_parser.h',
-    'db_exceptions.h',
     'db_log.cc',
-    'db_log.h',
     'db_messages.cc',
-    'db_messages.h',
     'server.cc',
-    'server.h',
     'server_collection.cc',
-    'server_collection.h',
     'server_selector.cc',
-    'server_selector.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -27,3 +18,20 @@ kea_database_lib = library(
 LIBS_BUILT_SO_FAR = [kea_database_lib] + LIBS_BUILT_SO_FAR
 subdir('testutils')
 subdir('tests')
+kea_database_headers = [
+    'audit_entry.h',
+    'backend_selector.h',
+    'database_connection.h',
+    'dbaccess_parser.h',
+    'db_exceptions.h',
+    'db_log.h',
+    'db_messages.h',
+    'server_collection.h',
+    'server.h',
+    'server_selector.h',
+]
+install_headers(
+    kea_database_headers,
+    preserve_path: true,
+    subdir: 'kea/database',
+)

diff --git a/src/lib/database/tests/meson.build b/src/lib/database/tests/meson.build
index 37b69723e2230f03ffddacb707a00d2bc0d5b791..781e5254d49b5f0bd9f56a09027637734da7c8dc 100644 (file)
--- a/src/lib/database/tests/meson.build
+++ b/src/lib/database/tests/meson.build
@@ -10,6 +10,6 @@ kea_database_tests = executable(
     'server_unittest.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_testutils_lib, kea_util_unittests_lib],
+    link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_database_tests', kea_database_tests, protocol: 'gtest')

diff --git a/src/lib/database/testutils/meson.build b/src/lib/database/testutils/meson.build
index 7459bbd7715c6d636510aec4e22c6c525d259f73..36fca23c40d99ce87c1c3070325514656f4d00c3 100644 (file)
--- a/src/lib/database/testutils/meson.build
+++ b/src/lib/database/testutils/meson.build
@@ -3,5 +3,5 @@ kea_database_testutils_lib = static_library(
     'schema.cc',
     cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"'],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR
+    link_with: LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/dhcp/meson.build b/src/lib/dhcp/meson.build
index 7b072a48003104ba0455274215f3bb0fc7bd3e03..0206596c074a5c62baf5a2bcd2eec98cceba989f 100644 (file)
--- a/src/lib/dhcp/meson.build
+++ b/src/lib/dhcp/meson.build
@@ -1,9 +1,7 @@
 pkt_filter_cc = 'pkt_filter_bpf.cc'
-pkt_filter_h = 'pkt_filter_bpf.h'
 if SYSTEM == 'linux'
     iface_mgr = 'iface_mgr_linux.cc'
     pkt_filter_cc = 'pkt_filter_lpf.cc'
-    pkt_filter_h = 'pkt_filter_lpf.h'
 elif SYSTEM == 'freebsd' or SYSTEM == 'netbsd' or SYSTEM == 'openbsd' or SYSTEM == 'darwin'
     iface_mgr = 'iface_mgr_bsd.cc'
 elif SYSTEM == 'sun'
@@ -15,104 +13,109 @@ endif
 kea_dhcp_lib = library(
     'kea-dhcp',
     'classify.cc',
-    'classify.h',
-    'dhcp4.h',
-    'dhcp6.h',
-    'docsis3_option_defs.h',
     'duid.cc',
-    'duid.h',
     'duid_factory.cc',
-    'duid_factory.h',
     'hwaddr.cc',
-    'hwaddr.h',
     'iface_mgr.cc',
-    'iface_mgr.h',
-    'iface_mgr_error_handler.h',
     iface_mgr,
     'libdhcp++.cc',
-    'libdhcp++.h',
     'opaque_data_tuple.cc',
-    'opaque_data_tuple.h',
     'option.cc',
-    'option.h',
     'option4_addrlst.cc',
-    'option4_addrlst.h',
     'option4_client_fqdn.cc',
-    'option4_client_fqdn.h',
     'option4_dnr.cc',
-    'option4_dnr.h',
     'option6_addrlst.cc',
-    'option6_addrlst.h',
     'option6_auth.cc',
-    'option6_auth.h',
     'option6_client_fqdn.cc',
-    'option6_client_fqdn.h',
     'option6_dnr.cc',
-    'option6_dnr.h',
     'option6_ia.cc',
-    'option6_ia.h',
     'option6_iaaddr.cc',
-    'option6_iaaddr.h',
     'option6_iaprefix.cc',
-    'option6_iaprefix.h',
     'option6_pdexclude.cc',
-    'option6_pdexclude.h',
     'option6_status_code.cc',
-    'option6_status_code.h',
     'option_classless_static_route.cc',
-    'option_classless_static_route.h',
     'option_custom.cc',
-    'option_custom.h',
     'option_data_types.cc',
-    'option_data_types.h',
     'option_definition.cc',
-    'option_definition.h',
-    'option_int.h',
-    'option_int_array.h',
     'option_opaque_data_tuples.cc',
-    'option_opaque_data_tuples.h',
     'option_space.cc',
-    'option_space.h',
-    'option_space_container.h',
     'option_string.cc',
-    'option_string.h',
     'option_vendor.cc',
-    'option_vendor.h',
     'option_vendor_class.cc',
-    'option_vendor_class.h',
-    'packet_queue.h',
-    'packet_queue_mgr.h',
     'packet_queue_mgr4.cc',
-    'packet_queue_mgr4.h',
     'packet_queue_mgr6.cc',
-    'packet_queue_mgr6.h',
-    'packet_queue_ring.h',
     'pkt.cc',
-    'pkt.h',
     'pkt4.cc',
-    'pkt4.h',
     'pkt4o6.cc',
-    'pkt4o6.h',
     'pkt6.cc',
-    'pkt6.h',
     'pkt_filter.cc',
-    'pkt_filter.h',
     'pkt_filter6.cc',
-    'pkt_filter6.h',
     'pkt_filter_inet.cc',
-    'pkt_filter_inet.h',
     'pkt_filter_inet6.cc',
-    'pkt_filter_inet6.h',
     pkt_filter_cc,
-    pkt_filter_h,
-    'pkt_template.h',
     'protocol_util.cc',
-    'protocol_util.h',
-    'socket_info.h',
-    'std_option_defs.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_dhcp_lib] + LIBS_BUILT_SO_FAR
+kea_dhcp_headers = [
+    'classify.h',
+    'dhcp4.h',
+    'dhcp6.h',
+    'docsis3_option_defs.h',
+    'duid_factory.h',
+    'duid.h',
+    'hwaddr.h',
+    'iface_mgr_error_handler.h',
+    'iface_mgr.h',
+    'libdhcp++.h',
+    'opaque_data_tuple.h',
+    'option4_addrlst.h',
+    'option4_client_fqdn.h',
+    'option4_dnr.h',
+    'option6_addrlst.h',
+    'option6_auth.h',
+    'option6_client_fqdn.h',
+    'option6_dnr.h',
+    'option6_iaaddr.h',
+    'option6_ia.h',
+    'option6_iaprefix.h',
+    'option6_pdexclude.h',
+    'option6_status_code.h',
+    'option_classless_static_route.h',
+    'option_custom.h',
+    'option_data_types.h',
+    'option_definition.h',
+    'option.h',
+    'option_int_array.h',
+    'option_int.h',
+    'option_opaque_data_tuples.h',
+    'option_space_container.h',
+    'option_space.h',
+    'option_string.h',
+    'option_vendor_class.h',
+    'option_vendor.h',
+    'packet_queue.h',
+    'packet_queue_mgr4.h',
+    'packet_queue_mgr6.h',
+    'packet_queue_mgr.h',
+    'packet_queue_ring.h',
+    'pkt4.h',
+    'pkt4o6.h',
+    'pkt6.h',
+    'pkt_filter6.h',
+    'pkt_filter_bpf.h',
+    'pkt_filter.h',
+    'pkt_filter_inet6.h',
+    'pkt_filter_inet.h',
+    'pkt_filter_lpf.h',
+    'pkt.h',
+    'pkt_template.h',
+    'protocol_util.h',
+    'socket_info.h',
+    'std_option_defs.h',
+]
+install_headers(kea_dhcp_headers, preserve_path: true, subdir: 'kea/dhcp')

diff --git a/src/lib/dhcp_ddns/meson.build b/src/lib/dhcp_ddns/meson.build
index 4ffd0240cd25276aea1438eef6e25a72f09c16c7..9cbecfe056830cb86bed64109335460f13879302 100644 (file)
--- a/src/lib/dhcp_ddns/meson.build
+++ b/src/lib/dhcp_ddns/meson.build
@@ -1,15 +1,11 @@
 kea_dhcp_ddns_lib = library(
     'kea-dhcp_ddns',
     'dhcp_ddns_log.cc',
-    'dhcp_ddns_log.h',
     'dhcp_ddns_messages.cc',
-    'dhcp_ddns_messages.h',
     'ncr_io.cc',
-    'ncr_io.h',
     'ncr_msg.cc',
-    'ncr_msg.h',
     'ncr_udp.cc',
-    'ncr_udp.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -17,3 +13,15 @@ kea_dhcp_ddns_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_dhcp_ddns_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_dhcp_ddns_headers = [
+    'dhcp_ddns_log.h',
+    'dhcp_ddns_messages.h',
+    'ncr_io.h',
+    'ncr_msg.h',
+    'ncr_udp.h',
+]
+install_headers(
+    kea_dhcp_ddns_headers,
+    preserve_path: true,
+    subdir: 'kea/dhcp_ddns',
+)

diff --git a/src/lib/dhcp_ddns/tests/meson.build b/src/lib/dhcp_ddns/tests/meson.build
index a8aefc11eee6412c9b5e9d1c0b2374886a391b2a..434156a8a41f6969a1ee51c05a2a5ec823788c3a 100644 (file)
--- a/src/lib/dhcp_ddns/tests/meson.build
+++ b/src/lib/dhcp_ddns/tests/meson.build
@@ -6,6 +6,6 @@ kea_dhcp_ddns_tests = executable(
     'test_utils.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_testutils_lib, kea_util_unittests_lib],
+    link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_dhcp_ddns_tests', kea_dhcp_ddns_tests, protocol: 'gtest')

diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build
index e3b39e85042e96317a999b2a43396d930d36ecbe..4208db59eb30fa9dac58484b99761d8792f61abb 100644 (file)
--- a/src/lib/dhcpsrv/meson.build
+++ b/src/lib/dhcpsrv/meson.build
@@ -1,194 +1,90 @@
 kea_dhcpsrv_lib = library(
     'kea-dhcpsrv',
     'allocation_state.cc',
-    'allocation_state.h',
     'allocator.cc',
-    'allocator.h',
     'alloc_engine.cc',
-    'alloc_engine.h',
     'alloc_engine_log.cc',
-    'alloc_engine_log.h',
     'alloc_engine_messages.cc',
-    'alloc_engine_messages.h',
-    'base_host_data_source.h',
-    'cache_host_data_source.h',
-    'callout_handle_store.h',
-    'cb_ctl_dhcp.h',
     'cb_ctl_dhcp4.cc',
-    'cb_ctl_dhcp4.h',
     'cb_ctl_dhcp6.cc',
-    'cb_ctl_dhcp6.h',
     'cfgmgr.cc',
-    'cfgmgr.h',
     'cfg_4o6.cc',
-    'cfg_4o6.h',
     'cfg_consistency.cc',
-    'cfg_consistency.h',
     'cfg_db_access.cc',
-    'cfg_db_access.h',
     'cfg_duid.cc',
-    'cfg_duid.h',
     'cfg_expiration.cc',
-    'cfg_expiration.h',
     'cfg_globals.cc',
-    'cfg_globals.h',
     'cfg_hosts.cc',
-    'cfg_hosts.h',
     'cfg_hosts_util.cc',
-    'cfg_hosts_util.h',
     'cfg_host_operations.cc',
-    'cfg_host_operations.h',
     'cfg_iface.cc',
-    'cfg_iface.h',
     'cfg_mac_source.cc',
-    'cfg_mac_source.h',
     'cfg_multi_threading.cc',
-    'cfg_multi_threading.h',
     'cfg_option.cc',
-    'cfg_option.h',
     'cfg_option_def.cc',
-    'cfg_option_def.h',
     'cfg_rsoo.cc',
-    'cfg_rsoo.h',
     'cfg_shared_networks.cc',
-    'cfg_shared_networks.h',
     'cfg_subnets4.cc',
-    'cfg_subnets4.h',
     'cfg_subnets6.cc',
-    'cfg_subnets6.h',
     'client_class_def.cc',
-    'client_class_def.h',
-    'config_backend_dhcp4.h',
     'config_backend_dhcp4_mgr.cc',
-    'config_backend_dhcp4_mgr.h',
-    'config_backend_dhcp6.h',
     'config_backend_dhcp6_mgr.cc',
-    'config_backend_dhcp6_mgr.h',
     'config_backend_pool_dhcp4.cc',
-    'config_backend_pool_dhcp4.h',
     'config_backend_pool_dhcp6.cc',
-    'config_backend_pool_dhcp6.h',
     'csv_lease_file4.cc',
-    'csv_lease_file4.h',
     'csv_lease_file6.cc',
-    'csv_lease_file6.h',
     'd2_client_cfg.cc',
-    'd2_client_cfg.h',
     'd2_client_mgr.cc',
-    'd2_client_mgr.h',
-    'db_type.h',
     'ddns_params.cc',
-    'ddns_params.h',
     'dhcp4o6_ipc.cc',
-    'dhcp4o6_ipc.h',
-    'dhcpsrv_exceptions.h',
     'dhcpsrv_log.cc',
-    'dhcpsrv_log.h',
     'dhcpsrv_messages.cc',
-    'dhcpsrv_messages.h',
     'flq_allocation_state.cc',
-    'flq_allocation_state.h',
     'flq_allocator.cc',
-    'flq_allocator.h',
     'fuzz_log.cc',
-    'fuzz_log.h',
     'fuzz_messages.cc',
-    'fuzz_messages.h',
     'host.cc',
-    'host.h',
     'hosts_log.cc',
-    'hosts_log.h',
     'hosts_messages.cc',
-    'hosts_messages.h',
-    'host_container.h',
     'host_data_source_factory.cc',
-    'host_data_source_factory.h',
     'host_mgr.cc',
-    'host_mgr.h',
     'ip_range.cc',
-    'ip_range.h',
     'ip_range_permutation.cc',
-    'ip_range_permutation.h',
     'iterative_allocation_state.cc',
-    'iterative_allocation_state.h',
     'iterative_allocator.cc',
-    'iterative_allocator.h',
-    'key_from_key.h',
     'lease.cc',
-    'lease.h',
-    'lease_file_loader.h',
-    'lease_file_stats.h',
     'lease_mgr.cc',
-    'lease_mgr.h',
     'lease_mgr_factory.cc',
-    'lease_mgr_factory.h',
     'memfile_lease_limits.cc',
-    'memfile_lease_limits.h',
     'memfile_lease_mgr.cc',
-    'memfile_lease_mgr.h',
-    'memfile_lease_storage.h',
     'ncr_generator.cc',
-    'ncr_generator.h',
     'network.cc',
-    'network.h',
     'network_state.cc',
-    'network_state.h',
     'packet_fuzzer.cc',
-    'packet_fuzzer.h',
     'parsers/base_network_parser.cc',
-    'parsers/base_network_parser.h',
     'parsers/client_class_def_parser.cc',
-    'parsers/client_class_def_parser.h',
     'parsers/dhcp_parsers.cc',
-    'parsers/dhcp_parsers.h',
     'parsers/dhcp_queue_control_parser.cc',
-    'parsers/dhcp_queue_control_parser.h',
     'parsers/duid_config_parser.cc',
-    'parsers/duid_config_parser.h',
     'parsers/expiration_config_parser.cc',
-    'parsers/expiration_config_parser.h',
-    'parsers/host_reservations_list_parser.h',
     'parsers/host_reservation_parser.cc',
-    'parsers/host_reservation_parser.h',
     'parsers/ifaces_config_parser.cc',
-    'parsers/ifaces_config_parser.h',
     'parsers/multi_threading_config_parser.cc',
-    'parsers/multi_threading_config_parser.h',
     'parsers/option_data_parser.cc',
-    'parsers/option_data_parser.h',
     'parsers/sanity_checks_parser.cc',
-    'parsers/sanity_checks_parser.h',
-    'parsers/shared_networks_list_parser.h',
     'parsers/shared_network_parser.cc',
-    'parsers/shared_network_parser.h',
     'parsers/simple_parser4.cc',
-    'parsers/simple_parser4.h',
     'parsers/simple_parser6.cc',
-    'parsers/simple_parser6.h',
     'pool.cc',
-    'pool.h',
     'random_allocation_state.cc',
-    'random_allocation_state.h',
     'random_allocator.cc',
-    'random_allocator.h',
     'resource_handler.cc',
-    'resource_handler.h',
     'sanity_checker.cc',
-    'sanity_checker.h',
     'shared_network.cc',
-    'shared_network.h',
     'srv_config.cc',
-    'srv_config.h',
     'subnet.cc',
-    'subnet.h',
-    'subnet_id.h',
-    'subnet_selector.h',
     'timer_mgr.cc',
-    'timer_mgr.h',
     'tracking_lease_mgr.cc',
-    'tracking_lease_mgr.h',
-    'utils.h',
-    'writable_host_data_source.h',
     cpp_args: [
         f'-DDHCP_DATA_DIR="@TOP_BUILD_DIR@"',
         f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
@@ -200,3 +96,110 @@ kea_dhcpsrv_lib = library(
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_dhcpsrv_lib] + LIBS_BUILT_SO_FAR
+kea_dhcpsrv_headers = [
+    'allocation_state.h',
+    'allocator.h',
+    'alloc_engine.h',
+    'alloc_engine_log.h',
+    'alloc_engine_messages.h',
+    'base_host_data_source.h',
+    'cache_host_data_source.h',
+    'callout_handle_store.h',
+    'cb_ctl_dhcp4.h',
+    'cb_ctl_dhcp6.h',
+    'cb_ctl_dhcp.h',
+    'cfg_4o6.h',
+    'cfg_consistency.h',
+    'cfg_db_access.h',
+    'cfg_duid.h',
+    'cfg_expiration.h',
+    'cfg_globals.h',
+    'cfg_host_operations.h',
+    'cfg_hosts.h',
+    'cfg_hosts_util.h',
+    'cfg_iface.h',
+    'cfg_mac_source.h',
+    'cfgmgr.h',
+    'cfg_multi_threading.h',
+    'cfg_option_def.h',
+    'cfg_option.h',
+    'cfg_rsoo.h',
+    'cfg_shared_networks.h',
+    'cfg_subnets4.h',
+    'cfg_subnets6.h',
+    'client_class_def.h',
+    'config_backend_dhcp4.h',
+    'config_backend_dhcp4_mgr.h',
+    'config_backend_dhcp6.h',
+    'config_backend_dhcp6_mgr.h',
+    'config_backend_pool_dhcp4.h',
+    'config_backend_pool_dhcp6.h',
+    'csv_lease_file4.h',
+    'csv_lease_file6.h',
+    'd2_client_cfg.h',
+    'd2_client_mgr.h',
+    'db_type.h',
+    'ddns_params.h',
+    'dhcp4o6_ipc.h',
+    'dhcpsrv_exceptions.h',
+    'dhcpsrv_log.h',
+    'dhcpsrv_messages.h',
+    'flq_allocation_state.h',
+    'flq_allocator.h',
+    'fuzz_log.h',
+    'fuzz_messages.h',
+    'host_container.h',
+    'host_data_source_factory.h',
+    'host.h',
+    'host_mgr.h',
+    'hosts_log.h',
+    'hosts_messages.h',
+    'ip_range.h',
+    'ip_range_permutation.h',
+    'iterative_allocation_state.h',
+    'iterative_allocator.h',
+    'key_from_key.h',
+    'lease_file_loader.h',
+    'lease_file_stats.h',
+    'lease.h',
+    'lease_mgr_factory.h',
+    'lease_mgr.h',
+    'memfile_lease_limits.h',
+    'memfile_lease_mgr.h',
+    'memfile_lease_storage.h',
+    'ncr_generator.h',
+    'network.h',
+    'network_state.h',
+    'packet_fuzzer.h',
+    'parsers/base_network_parser.h',
+    'parsers/client_class_def_parser.h',
+    'parsers/dhcp_parsers.h',
+    'parsers/dhcp_queue_control_parser.h',
+    'parsers/duid_config_parser.h',
+    'parsers/expiration_config_parser.h',
+    'parsers/host_reservations_list_parser.h',
+    'parsers/host_reservation_parser.h',
+    'parsers/ifaces_config_parser.h',
+    'parsers/multi_threading_config_parser.h',
+    'parsers/option_data_parser.h',
+    'parsers/sanity_checks_parser.h',
+    'parsers/shared_networks_list_parser.h',
+    'parsers/shared_network_parser.h',
+    'parsers/simple_parser4.h',
+    'parsers/simple_parser6.h',
+    'pool.h',
+    'random_allocation_state.h',
+    'random_allocator.h',
+    'resource_handler.h',
+    'sanity_checker.h',
+    'shared_network.h',
+    'srv_config.h',
+    'subnet.h',
+    'subnet_id.h',
+    'subnet_selector.h',
+    'timer_mgr.h',
+    'tracking_lease_mgr.h',
+    'utils.h',
+    'writable_host_data_source.h',
+]
+install_headers(kea_dhcpsrv_headers, preserve_path: true, subdir: 'kea/dhcpsrv')

diff --git a/src/lib/dns/meson.build b/src/lib/dns/meson.build
index 9eeb42cff4e74d378fe58b5bc36bf13e98113a35..7395b1e436838438a77cf1edf2f45be26cc3a88b 100644 (file)
--- a/src/lib/dns/meson.build
+++ b/src/lib/dns/meson.build
@@ -1,61 +1,32 @@
 kea_dns_lib = library(
     'kea-dns',
     'char_string.cc',
-    'char_string.h',
     'edns.cc',
-    'edns.h',
     'exceptions.cc',
-    'exceptions.h',
     'labelsequence.cc',
-    'labelsequence.h',
     'master_lexer.cc',
-    'master_lexer.h',
     'master_lexer_inputsource.cc',
-    'master_lexer_inputsource.h',
-    'master_lexer_state.h',
     'master_loader.cc',
-    'master_loader.h',
-    'master_loader_callbacks.h',
     'message.cc',
-    'message.h',
     'messagerenderer.cc',
-    'messagerenderer.h',
     'name.cc',
-    'name.h',
-    'name_internal.h',
     'opcode.cc',
-    'opcode.h',
     'question.cc',
-    'question.h',
     'rcode.cc',
-    'rcode.h',
     'rdata.cc',
-    'rdata.h',
     'rdataclass.cc',
-    'rdataclass.h',
     'rrclass.cc',
-    'rrclass.h',
     'rrparamregistry.cc',
-    'rrparamregistry.h',
     'rrset.cc',
-    'rrset.h',
     'rrttl.cc',
-    'rrttl.h',
     'rrtype.cc',
-    'rrtype.h',
     'serial.cc',
-    'serial.h',
     'time_utils.cc',
-    'time_utils.h',
     'tsig.cc',
-    'tsig.h',
     'tsigerror.cc',
-    'tsigerror.h',
     'tsigkey.cc',
-    'tsigkey.h',
     'tsigrecord.cc',
-    'tsigrecord.h',
-    'txt_like.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -63,3 +34,37 @@ kea_dns_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_dns_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_dns_headers = [
+    'char_string.h',
+    'edns.h',
+    'exceptions.h',
+    'labelsequence.h',
+    'master_lexer.h',
+    'master_lexer_inputsource.h',
+    'master_lexer_state.h',
+    'master_loader_callbacks.h',
+    'master_loader.h',
+    'message.h',
+    'messagerenderer.h',
+    'name.h',
+    'opcode.h',
+    'question.h',
+    'rcode.h',
+    'rdataclass.h',
+    'rdata.h',
+    'rrclass.h',
+    'rrparamregistry.h',
+    'rrset.h',
+    'rrttl.h',
+    'rrtype.h',
+    'serial.h',
+    'time_utils.h',
+    'tsigerror.h',
+    'tsig.h',
+    'tsigkey.h',
+    'tsigrecord.h',
+    'txt_like.h',
+]
+# Purposely not installing these headers:
+# * name_internal.h: used only internally, and not actually DNS specific.
+install_headers(kea_dns_headers, preserve_path: true, subdir: 'kea/dns')

diff --git a/src/lib/dns/tests/meson.build b/src/lib/dns/tests/meson.build
index 6080c3507669b356fd788e5fde0a29a75c3c1d20..64b80b714d353887dfd835ae3182541529e01ef7 100644 (file)
--- a/src/lib/dns/tests/meson.build
+++ b/src/lib/dns/tests/meson.build
@@ -29,7 +29,6 @@ kea_dns_tests = executable(
     'rdata_tsig_unittest.cc',
     'rdata_txt_like_unittest.cc',
     'rdata_unittest.cc',
-    'rdata_unittest.h',
     'rrclass_unittest.cc',
     'rrparamregistry_unittest.cc',
     'rrset_unittest.cc',
@@ -49,6 +48,6 @@ kea_dns_tests = executable(
     ],
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_util_unittests_lib],
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_dns_tests', kea_dns_tests, protocol: 'gtest')

diff --git a/src/lib/eval/meson.build b/src/lib/eval/meson.build
index d24d5fae19b6bfd929cb5f6cbf9016fd06119c30..71d6bf864185d326a8bf381a570816f0c33b7cf9 100644 (file)
--- a/src/lib/eval/meson.build
+++ b/src/lib/eval/meson.build
@@ -1,21 +1,14 @@
 kea_eval_lib = library(
     'kea-eval',
     'dependency.cc',
-    'dependency.h',
     'evaluate.cc',
-    'evaluate.h',
     'eval_context.cc',
-    'eval_context.h',
-    'eval_context_decl.h',
     'eval_log.cc',
-    'eval_log.h',
     'eval_messages.cc',
-    'eval_messages.h',
     'lexer.cc',
     'parser.cc',
-    'parser.h',
     'token.cc',
-    'token.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -23,3 +16,14 @@ kea_eval_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_eval_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_eval_headers = [
+    'dependency.h',
+    'eval_context_decl.h',
+    'eval_context.h',
+    'eval_log.h',
+    'eval_messages.h',
+    'evaluate.h',
+    'parser.h',
+    'token.h',
+]
+install_headers(kea_eval_headers, preserve_path: true, subdir: 'kea/eval')

diff --git a/src/lib/eval/tests/meson.build b/src/lib/eval/tests/meson.build
index 42b7d9c3c556607bccefa96aefeeb8b29a9a9f42..46aca6af704dfd1baef76fb3a0353c20e156ba7a 100644 (file)
--- a/src/lib/eval/tests/meson.build
+++ b/src/lib/eval/tests/meson.build
@@ -8,6 +8,6 @@ kea_eval_tests = executable(
     'token_unittest.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_testutils_lib, kea_util_unittests_lib],
+    link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_eval_tests', kea_eval_tests, protocol: 'gtest')

diff --git a/src/lib/exceptions/meson.build b/src/lib/exceptions/meson.build
index 48545739c019bb68f4d7ae031e7b5edf7a74e180..4bc0a2e0c37fbe4cb25eb1e86fa3c24f9a03b91a 100644 (file)
--- a/src/lib/exceptions/meson.build
+++ b/src/lib/exceptions/meson.build
@@ -1,8 +1,6 @@
 kea_exceptions_lib = library(
     'kea-exceptions',
     'exceptions.cc',
-    'exceptions.h',
-    'isc_assert.h',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -10,3 +8,9 @@ kea_exceptions_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_exceptions_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_exceptions_headers = ['exceptions.h', 'isc_assert.h']
+install_headers(
+    kea_exceptions_headers,
+    preserve_path: true,
+    subdir: 'kea/exceptions',
+)

diff --git a/src/lib/hooks/meson.build b/src/lib/hooks/meson.build
index e4cbe77ee18bbfbef2ca88bc923a73c6a1a5c7be..e613807aa035a2981f5968da6ab809f51504eb43 100644 (file)
--- a/src/lib/hooks/meson.build
+++ b/src/lib/hooks/meson.build
@@ -1,38 +1,42 @@
 kea_hooks_lib = library(
     'kea-hooks',
     'callout_handle.cc',
-    'callout_handle.h',
     'callout_handle_associate.cc',
-    'callout_handle_associate.h',
     'callout_manager.cc',
-    'callout_manager.h',
-    'hooks.h',
     'hooks_config.cc',
-    'hooks_config.h',
     'hooks_log.cc',
-    'hooks_log.h',
     'hooks_manager.cc',
-    'hooks_manager.h',
     'hooks_messages.cc',
-    'hooks_messages.h',
     'hooks_parser.cc',
-    'hooks_parser.h',
     'libinfo.cc',
-    'libinfo.h',
     'library_handle.cc',
-    'library_handle.h',
     'library_manager.cc',
-    'library_manager.h',
     'library_manager_collection.cc',
-    'library_manager_collection.h',
-    'parking_lots.h',
-    'pointer_converter.h',
     'server_hooks.cc',
-    'server_hooks.h',
     cpp_args: [f'-DDEFAULT_HOOKS_PATH="@TOP_BUILD_DIR@"'],
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_hooks_lib] + LIBS_BUILT_SO_FAR
+kea_hooks_headers = [
+    'callout_handle_associate.h',
+    'callout_handle.h',
+    'callout_manager.h',
+    'hooks_config.h',
+    'hooks.h',
+    'hooks_log.h',
+    'hooks_manager.h',
+    'hooks_messages.h',
+    'hooks_parser.h',
+    'libinfo.h',
+    'library_handle.h',
+    'library_manager_collection.h',
+    'library_manager.h',
+    'parking_lots.h',
+    'pointer_converter.h',
+    'server_hooks.h',
+]
+install_headers(kea_hooks_headers, preserve_path: true, subdir: 'kea/hooks')

diff --git a/src/lib/http/meson.build b/src/lib/http/meson.build
index 24296959da336ba016a66a1438608ca8c49374cb..7df8fe538fb2eab04403f44f9183e3d11ae50944 100644 (file)
--- a/src/lib/http/meson.build
+++ b/src/lib/http/meson.build
@@ -1,62 +1,30 @@
 kea_http_lib = library(
     'kea-http',
-    'auth_config.h',
     'auth_log.cc',
-    'auth_log.h',
     'auth_messages.cc',
-    'auth_messages.h',
     'basic_auth.cc',
-    'basic_auth.h',
     'basic_auth_config.cc',
-    'basic_auth_config.h',
     'cfg_http_header.cc',
-    'cfg_http_header.h',
     'client.cc',
-    'client.h',
     'connection.cc',
-    'connection.h',
     'connection_pool.cc',
-    'connection_pool.h',
     'date_time.cc',
-    'date_time.h',
-    'header_context.h',
-    'http_acceptor.h',
     'http_header.cc',
-    'http_header.h',
     'http_log.cc',
-    'http_log.h',
     'http_message.cc',
-    'http_message.h',
     'http_messages.cc',
-    'http_messages.h',
     'http_message_parser_base.cc',
-    'http_message_parser_base.h',
-    'http_types.h',
     'listener.cc',
-    'listener.h',
     'listener_impl.cc',
-    'listener_impl.h',
     'post_request.cc',
-    'post_request.h',
     'post_request_json.cc',
-    'post_request_json.h',
     'request.cc',
-    'request.h',
-    'request_context.h',
     'request_parser.cc',
-    'request_parser.h',
     'response.cc',
-    'response.h',
-    'response_context.h',
     'response_creator.cc',
-    'response_creator.h',
-    'response_creator_factory.h',
     'response_json.cc',
-    'response_json.h',
     'response_parser.cc',
-    'response_parser.h',
     'url.cc',
-    'url.h',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
@@ -64,3 +32,38 @@ kea_http_lib = library(
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_http_lib] + LIBS_BUILT_SO_FAR
+kea_http_headers = [
+    'auth_config.h',
+    'auth_log.h',
+    'auth_messages.h',
+    'basic_auth_config.h',
+    'basic_auth.h',
+    'cfg_http_header.h',
+    'client.h',
+    'connection.h',
+    'connection_pool.h',
+    'date_time.h',
+    'header_context.h',
+    'http_acceptor.h',
+    'http_header.h',
+    'http_log.h',
+    'http_message.h',
+    'http_message_parser_base.h',
+    'http_messages.h',
+    'http_types.h',
+    'listener.h',
+    'listener_impl.h',
+    'post_request.h',
+    'post_request_json.h',
+    'request_context.h',
+    'request.h',
+    'request_parser.h',
+    'response_context.h',
+    'response_creator_factory.h',
+    'response_creator.h',
+    'response.h',
+    'response_json.h',
+    'response_parser.h',
+    'url.h',
+]
+install_headers(kea_http_headers, preserve_path: true, subdir: 'kea/http')

diff --git a/src/lib/log/compiler/meson.build b/src/lib/log/compiler/meson.build
index 948de141902251cab07779e415e03e35b0e3725a..c728597c6d68b2e22f94ead4dd86294f4546b2fa 100644 (file)
--- a/src/lib/log/compiler/meson.build
+++ b/src/lib/log/compiler/meson.build
@@ -2,4 +2,5 @@ executable('kea-msg-compiler',
   'message.cc',
   include_directories: [include_directories('.')] + INCLUDES,
   link_with : LIBS_BUILT_SO_FAR,
-  install : true)
+  install : true,
+)

diff --git a/src/lib/log/interprocess/meson.build b/src/lib/log/interprocess/meson.build
index 1fa32b335bcbbde738269e6addfc3c57f5dce52a..2e5f8768a03d129cac640131dfb496b430bbee38 100644 (file)
--- a/src/lib/log/interprocess/meson.build
+++ b/src/lib/log/interprocess/meson.build
@@ -1,10 +1,7 @@
 kea_log_interprocess_lib = library(
     'kea-log-interprocess',
-    'interprocess_sync.h',
     'interprocess_sync_file.cc',
-    'interprocess_sync_file.h',
     'interprocess_sync_null.cc',
-    'interprocess_sync_null.h',
     cpp_args: [f'-DLOCKFILE_DIR="@TOP_BUILD_DIR@"'],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
@@ -13,3 +10,13 @@ kea_log_interprocess_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_log_interprocess_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_log_interprocess_headers = [
+    'interprocess_sync.h',
+    'interprocess_sync_file.h',
+    'interprocess_sync_null.h',
+]
+install_headers(
+    kea_log_interprocess_headers,
+    preserve_path: true,
+    subdir: 'kea/log/interprocess',
+)

diff --git a/src/lib/log/interprocess/tests/meson.build b/src/lib/log/interprocess/tests/meson.build
index 79d7ae7df804b6a15695598da5374cf8e8a41a77..b4bee667cc2224bf52e3c204e89a2e51a3e8fde7 100644 (file)
--- a/src/lib/log/interprocess/tests/meson.build
+++ b/src/lib/log/interprocess/tests/meson.build
@@ -6,6 +6,6 @@ kea_log_interprocess_tests = executable(
     cpp_args: [f'-DTEST_DATA_TOPBUILDDIR="@TOP_BUILD_DIR@"'],
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_util_unittests_lib],
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_log_interprocess_tests', kea_log_interprocess_tests, protocol: 'gtest')

diff --git a/src/lib/log/meson.build b/src/lib/log/meson.build
index ee38b6ef01045d3ada361858994eec0fa6d9e4be..c8116a5b69ced86a4ebf95a5d287a9bec883685c 100644 (file)
--- a/src/lib/log/meson.build
+++ b/src/lib/log/meson.build
@@ -2,47 +2,25 @@ subdir('interprocess')
 kea_log_lib = library(
     'kea-log',
     'buffer_appender_impl.cc',
-    'buffer_appender_impl.h',
     'logger.cc',
-    'logger.h',
     'logger_impl.cc',
-    'logger_impl.h',
     'logger_level.cc',
-    'logger_level.h',
     'logger_level_impl.cc',
-    'logger_level_impl.h',
     'logger_manager.cc',
-    'logger_manager.h',
     'logger_manager_impl.cc',
-    'logger_manager_impl.h',
     'logger_name.cc',
-    'logger_name.h',
-    'logger_specification.h',
     'logger_support.cc',
-    'logger_support.h',
     'logger_unittest_support.cc',
-    'logger_unittest_support.h',
     'logimpl_messages.cc',
-    'logimpl_messages.h',
     'log_dbglevels.cc',
-    'log_dbglevels.h',
     'log_formatter.cc',
-    'log_formatter.h',
     'log_messages.cc',
-    'log_messages.h',
-    'macros.h',
     'message_dictionary.cc',
-    'message_dictionary.h',
-    'message_exception.h',
     'message_initializer.cc',
-    'message_initializer.h',
     'message_reader.cc',
-    'message_reader.h',
-    'message_types.h',
     'output_option.cc',
-    'output_option.h',
     cpp_args: [f'-DTOP_BUILDDIR="@TOP_BUILD_DIR@"'],
-    dependencies: [log4cplus],
+    dependencies: [boost, log4cplus],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -50,3 +28,28 @@ kea_log_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_log_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_log_headers = [
+    'buffer_appender_impl.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',
+    'logimpl_messages.h',
+    'log_messages.h',
+    'macros.h',
+    'message_dictionary.h',
+    'message_exception.h',
+    'message_initializer.h',
+    'message_reader.h',
+    'message_types.h',
+    'output_option.h',
+]
+install_headers(kea_log_headers, preserve_path: true, subdir: 'kea/log')

diff --git a/src/lib/log/tests/meson.build b/src/lib/log/tests/meson.build
index 1c79ef6fbc09171cce3eba863b70d40d317c36e9..445c2e638ea7390bf05917e8c0f94557b21b5a72 100644 (file)
--- a/src/lib/log/tests/meson.build
+++ b/src/lib/log/tests/meson.build
@@ -10,7 +10,6 @@ kea_log_tests = executable(
     'logger_unittest.cc',
     'log_formatter_unittest.cc',
     'log_test_messages.cc',
-    'log_test_messages.h',
     'message_dictionary_unittest.cc',
     'message_reader_unittest.cc',
     'output_option_unittest.cc',
@@ -18,6 +17,6 @@ kea_log_tests = executable(
     cpp_args: [f'-DTEMP_DIR="@TOP_BUILD_DIR@"'],
     dependencies: [gtest, log4cplus],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_util_unittests_lib],
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_log_tests', kea_log_tests, protocol: 'gtest')

diff --git a/src/lib/mysql/meson.build b/src/lib/mysql/meson.build
index 2ca42531b31cd0619ad11fb1a354cdd01f7a3326..2d8e85b072f617d4c0d921dc81fd82921e13dc4b 100644 (file)
--- a/src/lib/mysql/meson.build
+++ b/src/lib/mysql/meson.build
@@ -5,12 +5,9 @@ endif
 kea_mysql_lib = library(
     'kea-mysql',
     'mysql_binding.cc',
-    'mysql_binding.h',
     'mysql_connection.cc',
-    'mysql_connection.h',
-    'mysql_constants.h',
     cpp_args: [f'-DKEA_ADMIN="@KEA_ADMIN@"'],
-    dependencies: [mysql],
+    dependencies: [boost, mysql],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -19,3 +16,9 @@ kea_mysql_lib = library(
 LIBS_BUILT_SO_FAR = [kea_mysql_lib] + LIBS_BUILT_SO_FAR
 subdir('testutils')
 subdir('tests')
+kea_mysql_headers = [
+    'mysql_binding.h',
+    'mysql_connection.h',
+    'mysql_constants.h',
+]
+install_headers(kea_mysql_headers, preserve_path: true, subdir: 'kea/mysql')

diff --git a/src/lib/mysql/tests/meson.build b/src/lib/mysql/tests/meson.build
index eb467af2e9688d324e73a32eb2d67013a14e9c3d..7efaac3ba9a4f1bf3f493efc81e6e53429646607 100644 (file)
--- a/src/lib/mysql/tests/meson.build
+++ b/src/lib/mysql/tests/meson.build
@@ -1,17 +1,16 @@
-LIBS_TESTUTILS = [
+libs_testutils = [
     kea_mysql_testutils_lib,
     kea_database_testutils_lib,
-    kea_testutils_lib
+    kea_testutils_lib,
 ]
 kea_mysql_tests = executable(
     'kea-mysql-tests',
     'mysql_binding_unittest.cc',
     'mysql_connection_unittest.cc',
     'run_unittests.cc',
-    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
-               f'-DKEA_ADMIN="@KEA_ADMIN@"'],
+    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@KEA_ADMIN@"'],
     dependencies: [gtest, mysql],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + LIBS_TESTUTILS + [kea_util_unittests_lib],
+    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
 )
 test('kea_mysql_tests', kea_mysql_tests, protocol: 'gtest')

diff --git a/src/lib/mysql/testutils/meson.build b/src/lib/mysql/testutils/meson.build
index e60db495ade7fcf867be57640d224f33fb66dcc9..3edbda1747e754fa3324169d73bb80de3d00d3e9 100644 (file)
--- a/src/lib/mysql/testutils/meson.build
+++ b/src/lib/mysql/testutils/meson.build
@@ -2,9 +2,11 @@ DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts'
 kea_mysql_testutils_lib = static_library(
     'kea-mysql-testutils',
     'mysql_schema.cc',
-    cpp_args: [f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"',
-               f'-DDATABASE_WIPE_DIR="@DATABASE_SCRIPTS_DIR@"'],
-    dependencies: [mysql],
+    cpp_args: [
+        f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"',
+        f'-DDATABASE_WIPE_DIR="@DATABASE_SCRIPTS_DIR@"',
+    ],
+    dependencies: [boost, mysql],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_database_testutils_lib]
+    link_with: [kea_database_testutils_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/pgsql/meson.build b/src/lib/pgsql/meson.build
index 5beab0dfdc8a1639dfe5b6d87b5af7a586c675b8..7446bfa61a62078b89bc62fb50bb9258b1d43f8f 100644 (file)
--- a/src/lib/pgsql/meson.build
+++ b/src/lib/pgsql/meson.build
@@ -5,14 +5,16 @@ endif
 kea_pgsql_lib = library(
     'kea-pgsql',
     'pgsql_connection.cc',
-    'pgsql_connection.h',
     'pgsql_exchange.cc',
-    'pgsql_exchange.h',
     cpp_args: [f'-DKEA_ADMIN="@KEA_ADMIN@"'],
-    dependencies: [postgresql],
+    dependencies: [boost, postgresql],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_pgsql_lib] + LIBS_BUILT_SO_FAR
+subdir('testutils')
+subdir('tests')
+kea_pgsql_headers = ['pgsql_connection.h', 'pgsql_exchange.h']
+install_headers(kea_pgsql_headers, preserve_path: true, subdir: 'kea/pgsql')

diff --git a/src/lib/pgsql/tests/meson.build b/src/lib/pgsql/tests/meson.build
new file mode 100644 (file)
index 0000000..e3a97d0
--- /dev/null
+++ b/src/lib/pgsql/tests/meson.build
@@ -0,0 +1,17 @@
+libs_testutils = [
+    kea_pgsql_testutils_lib,
+    kea_database_testutils_lib,
+    kea_testutils_lib,
+]
+kea_pgsql_tests = executable(
+    'kea-pgsql-tests',
+    'pgsql_basics.cc',
+    'pgsql_connection_unittest.cc',
+    'pgsql_exchange_unittest.cc',
+    'run_unittests.cc',
+    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@KEA_ADMIN@"'],
+    dependencies: [gtest, postgresql],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+)
+test('kea_pgsql_tests', kea_pgsql_tests, protocol: 'gtest')

diff --git a/src/lib/pgsql/testutils/meson.build b/src/lib/pgsql/testutils/meson.build
new file mode 100644 (file)
index 0000000..06ca630
--- /dev/null
+++ b/src/lib/pgsql/testutils/meson.build
@@ -0,0 +1,12 @@
+DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts'
+kea_pgsql_testutils_lib = static_library(
+    'kea-pgsql-testutils',
+    'pgsql_schema.cc',
+    cpp_args: [
+        f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"',
+        f'-DDATABASE_WIPE_DIR="@DATABASE_SCRIPTS_DIR@"',
+    ],
+    dependencies: [postgresql],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [kea_database_testutils_lib] + LIBS_BUILT_SO_FAR,
+)

diff --git a/src/lib/process/cfgrpt/meson.build b/src/lib/process/cfgrpt/meson.build
index 5052cf57a188e5f2902996ee6c8f2376dcf1b503..7e0a1a410863a60f8ae682a105f797f2c880a91b 100644 (file)
--- a/src/lib/process/cfgrpt/meson.build
+++ b/src/lib/process/cfgrpt/meson.build
@@ -3,15 +3,19 @@ config_report_cc = configure_file(
     output: 'config_report.cc',
     configuration: conf_data,
 )
-
 kea_cfgrpt_lib = library(
     'kea-cfgrpt',
     'cfgrpt.cc',
     config_report_cc,
-    'config_report.h',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_cfgrpt_lib] + LIBS_BUILT_SO_FAR
+kea_cfgrpt_headers = ['config_report.h']
+install_headers(
+    kea_cfgrpt_headers,
+    preserve_path: true,
+    subdir: 'kea/process/cfgrpt',
+)

diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build
index 8aa9124c58d252d27815b611fc2adb25b8feae51..0f6cef14a22aeab56cb435773f044bad95107a4d 100644 (file)
--- a/src/lib/process/meson.build
+++ b/src/lib/process/meson.build
@@ -1,34 +1,38 @@
 subdir('cfgrpt')
 kea_process_lib = library(
     'kea-process',
-    'cb_ctl_base.h',
     'config_base.cc',
-    'config_base.h',
     'config_ctl_info.cc',
-    'config_ctl_info.h',
     'config_ctl_parser.cc',
-    'config_ctl_parser.h',
     'daemon.cc',
-    'daemon.h',
     'd_cfg_mgr.cc',
-    'd_cfg_mgr.h',
     'd_controller.cc',
-    'd_controller.h',
     'd_log.cc',
-    'd_log.h',
-    'd_process.h',
     'logging_info.cc',
-    'logging_info.h',
     'log_parser.cc',
-    'log_parser.h',
     'process_messages.cc',
-    'process_messages.h',
     'redact_config.cc',
-    'redact_config.h',
     cpp_args: [f'-DDATA_DIR="@TOP_BUILD_DIR@"'],
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_process_lib] + LIBS_BUILT_SO_FAR
+kea_process_headers = [
+    'cb_ctl_base.h',
+    'config_base.h',
+    'config_ctl_info.h',
+    'config_ctl_parser.h',
+    'daemon.h',
+    'd_cfg_mgr.h',
+    'd_controller.h',
+    'd_log.h',
+    'd_process.h',
+    'logging_info.h',
+    'log_parser.h',
+    'process_messages.h',
+    'redact_config.h',
+]
+install_headers(kea_process_headers, preserve_path: true, subdir: 'kea/process')

diff --git a/src/lib/stats/meson.build b/src/lib/stats/meson.build
index 51b7f47c38727bfbe627ebd6d6833a9dd4b98545..695d9871bcce152fb509d1f556f515c431b1a7a8 100644 (file)
--- a/src/lib/stats/meson.build
+++ b/src/lib/stats/meson.build
@@ -1,11 +1,9 @@
 kea_stats_lib = library(
     'kea-stats',
     'context.cc',
-    'context.h',
     'observation.cc',
-    'observation.h',
     'stats_mgr.cc',
-    'stats_mgr.h',
+    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
@@ -13,3 +11,5 @@ kea_stats_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_stats_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
+kea_stats_headers = ['context.h', 'observation.h', 'stats_mgr.h']
+install_headers(kea_stats_headers, preserve_path: true, subdir: 'kea/stats')

diff --git a/src/lib/stats/tests/meson.build b/src/lib/stats/tests/meson.build
index 6bb1bbcd1681e8aa97acb4afbeaa39b9f75f17e6..7f25125feae2e885080cb7c77231d7b9bfc48a78 100644 (file)
--- a/src/lib/stats/tests/meson.build
+++ b/src/lib/stats/tests/meson.build
@@ -6,6 +6,6 @@ kea_stats_tests = executable(
     'stats_mgr_unittest.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_testutils_lib, kea_util_unittests_lib],
+    link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_stats_tests', kea_stats_tests, protocol: 'gtest')

diff --git a/src/lib/tcp/meson.build b/src/lib/tcp/meson.build
index 38bd10f242032ce8929462b122eef696a1f76ef2..5ef4f3e1ad4db498c4adaad20e7ca90b4fe258de 100644 (file)
--- a/src/lib/tcp/meson.build
+++ b/src/lib/tcp/meson.build
@@ -1,20 +1,12 @@
 kea_tcp_lib = library(
     'kea-tcp',
     'mt_tcp_listener_mgr.cc',
-    'mt_tcp_listener_mgr.h',
     'tcp_connection.cc',
-    'tcp_connection.h',
-    'tcp_connection_acceptor.h',
     'tcp_connection_pool.cc',
-    'tcp_connection_pool.h',
     'tcp_listener.cc',
-    'tcp_listener.h',
     'tcp_log.cc',
-    'tcp_log.h',
     'tcp_messages.cc',
-    'tcp_messages.h',
     'tcp_stream_msg.cc',
-    'tcp_stream_msg.h',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
@@ -22,3 +14,14 @@ kea_tcp_lib = library(
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_tcp_lib] + LIBS_BUILT_SO_FAR
+kea_tcp_headers = [
+    'mt_tcp_listener_mgr.h',
+    'tcp_connection_acceptor.h',
+    'tcp_connection.h',
+    'tcp_connection_pool.h',
+    'tcp_listener.h',
+    'tcp_log.h',
+    'tcp_messages.h',
+    'tcp_stream_msg.h',
+]
+install_headers(kea_tcp_headers, preserve_path: true, subdir: 'kea/tcp')

diff --git a/src/lib/testutils/meson.build b/src/lib/testutils/meson.build
index bfda8255507f803d61ddd6c6f8492ddecabc0311..719675e4c635a30960e194796764663a570cc98d 100644 (file)
--- a/src/lib/testutils/meson.build
+++ b/src/lib/testutils/meson.build
@@ -8,5 +8,5 @@ kea_testutils_lib = static_library(
     'user_context_utils.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_util_unittests_lib]
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/util/io/meson.build b/src/lib/util/io/meson.build
index 7d89dba876af795df44318eba08509e6c638162d..3d872c7acd62022a9ca8d4e7ebf393382f6a3650 100644 (file)
--- a/src/lib/util/io/meson.build
+++ b/src/lib/util/io/meson.build
@@ -1,9 +1,6 @@
 kea_util_io_lib = library(
     'kea-util-io',
     'fd.cc',
-    'fd.h',
-    'pktinfo_utilities.h',
-    'sockaddr_util.h',
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/util/meson.build b/src/lib/util/meson.build
index 3ad08252d5c345487cddb45f89f86df588ef3d05..1e34d346768b5da40e6288e7662419dfc76b555b 100644 (file)
--- a/src/lib/util/meson.build
+++ b/src/lib/util/meson.build
@@ -19,11 +19,16 @@ kea_util_lib = library(
     'versioned_csv_file.cc',
     'watched_thread.cc',
     'watch_socket.cc',
+    dependencies: [boost, threads],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
     link_with: LIBS_BUILT_SO_FAR,
 )
+subdir('io')
+subdir('unittests')
+LIBS_BUILT_SO_FAR = [kea_util_lib] + LIBS_BUILT_SO_FAR
+subdir('tests')
 kea_util_headers = [
     'bigints.h',
     'boost_time_utils.h',
@@ -35,6 +40,9 @@ kea_util_headers = [
     'encode/encode.h',
     'encode/utf8.h',
     'filesystem.h',
+    'io/fd.h',
+    'io/pktinfo_utilities.h',
+    'io/sockaddr_util.h',
     'hash.h',
     'io.h',
     'labeled_value.h',
@@ -57,10 +65,6 @@ kea_util_headers = [
     'unlock_guard.h',
     'versioned_csv_file.h',
     'watched_thread.h',
-    'watch_socket.h'
+    'watch_socket.h',
 ]
 install_headers(kea_util_headers, preserve_path: true, subdir: 'kea/util')
-subdir('io')
-subdir('unittests')
-LIBS_BUILT_SO_FAR = [kea_util_lib] + LIBS_BUILT_SO_FAR
-subdir('tests')

diff --git a/src/lib/util/tests/meson.build b/src/lib/util/tests/meson.build
index d099387ab0729e98a37759f0d13d253e325841a6..be98fb8d45373fec3503e6db3df914f1f7691918 100644 (file)
--- a/src/lib/util/tests/meson.build
+++ b/src/lib/util/tests/meson.build
@@ -14,7 +14,6 @@ kea_util_tests = executable(
     'io_unittests.cc',
     'labeled_value_unittest.cc',
     'memory_segment_common_unittest.cc',
-    'memory_segment_common_unittest.h',
     'memory_segment_local_unittest.cc',
     'multi_threading_mgr_unittest.cc',
     'optional_unittest.cc',
@@ -39,6 +38,6 @@ kea_util_tests = executable(
     ],
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR + [kea_util_unittests_lib],
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_util_tests', kea_util_tests, protocol: 'gtest')

diff --git a/src/lib/util/unittests/meson.build b/src/lib/util/unittests/meson.build
index 8c9c721e901ffd45dde1c586060a5c3817175e42..a373ad130aa697cdeff0e97dd49eeb3cf5f91b16 100644 (file)
--- a/src/lib/util/unittests/meson.build
+++ b/src/lib/util/unittests/meson.build
@@ -1,22 +1,13 @@
 kea_util_unittests_lib = static_library(
     'kea-util-unittests',
     'check_valgrind.cc',
-    'check_valgrind.h',
     'fork.cc',
-    'fork.h',
     'interprocess_util.cc',
-    'interprocess_util.h',
     'newhook.cc',
-    'newhook.h',
     'resource.cc',
-    'resource.h',
     'run_all.cc',
-    'run_all.h',
     'testdata.cc',
-    'testdata.h',
-    'textdata.h',
     'wiredata.cc',
-    'wiredata.h',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,

diff --git a/src/lib/yang/meson.build b/src/lib/yang/meson.build
index 2948fafadeeab8f4a0fa5038230e10781ce5b93f..c5c5f9520c9d801cd004bfcd829e839b7eb7960a 100644 (file)
--- a/src/lib/yang/meson.build
+++ b/src/lib/yang/meson.build
@@ -5,46 +5,24 @@ endif
 kea_yang_lib = library(
     'kea-yang',
     'adaptor.cc',
-    'adaptor.h',
     'adaptor_config.cc',
-    'adaptor_config.h',
     'adaptor_host.cc',
-    'adaptor_host.h',
     'adaptor_option.cc',
-    'adaptor_option.h',
     'adaptor_pool.cc',
-    'adaptor_pool.h',
     'adaptor_subnet.cc',
-    'adaptor_subnet.h',
-    'netconf_error.h',
     'translator.cc',
-    'translator.h',
     'translator_class.cc',
-    'translator_class.h',
     'translator_config.cc',
-    'translator_config.h',
     'translator_control_socket.cc',
-    'translator_control_socket.h',
     'translator_database.cc',
-    'translator_database.h',
     'translator_host.cc',
-    'translator_host.h',
     'translator_logger.cc',
-    'translator_logger.h',
     'translator_option_data.cc',
-    'translator_option_data.h',
     'translator_option_def.cc',
-    'translator_option_def.h',
     'translator_pd_pool.cc',
-    'translator_pd_pool.h',
     'translator_pool.cc',
-    'translator_pool.h',
     'translator_shared_network.cc',
-    'translator_shared_network.h',
     'translator_subnet.cc',
-    'translator_subnet.h',
-    'yang_models.h',
-    'yang_revisions.h',
     dependencies: netconf_deps_array,
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
@@ -53,3 +31,28 @@ kea_yang_lib = library(
     override_options: ['cpp_std=c++20'],
 )
 LIBS_BUILT_SO_FAR = [kea_yang_lib] + LIBS_BUILT_SO_FAR
+kea_yang_headers = [
+    'adaptor_config.h',
+    'adaptor.h',
+    'adaptor_host.h',
+    'adaptor_option.h',
+    'adaptor_pool.h',
+    'adaptor_subnet.h',
+    'netconf_error.h',
+    'translator_class.h',
+    'translator_config.h',
+    'translator_control_socket.h',
+    'translator_database.h',
+    'translator.h',
+    'translator_host.h',
+    'translator_logger.h',
+    'translator_option_data.h',
+    'translator_option_def.h',
+    'translator_pd_pool.h',
+    'translator_pool.h',
+    'translator_shared_network.h',
+    'translator_subnet.h',
+    'yang_models.h',
+    'yang_revisions.h',
+]
+install_headers(kea_yang_headers, preserve_path: true, subdir: 'kea/yang')

diff --git a/src/share/database/scripts/meson.build b/src/share/database/scripts/meson.build
index 68c0f7270fc524e8b4df058b7ba187a035d4a9ff..b768576612fbcc9794f28d3bc9df10e891b23ab6 100644 (file)
--- a/src/share/database/scripts/meson.build
+++ b/src/share/database/scripts/meson.build
@@ -1,2 +1,2 @@
 subdir('mysql')
-# subdir('pgsql')
+subdir('pgsql')

diff --git a/src/share/database/scripts/mysql/meson.build b/src/share/database/scripts/mysql/meson.build
index 18a43b8f8fc21c192fa5a4d0e80fee573372a4bf..988704049ee7069bdc53955598e9f7583d6f16b9 100644 (file)
--- a/src/share/database/scripts/mysql/meson.build
+++ b/src/share/database/scripts/mysql/meson.build
@@ -6,17 +6,17 @@ mysql_script_conf_data.set('PACKAGE_NAME', 'kea')
 configure_file(
     input: 'wipe_data.sh.in',
     output: 'wipe_data.sh',
-    configuration: mysql_script_conf_data
+    configuration: mysql_script_conf_data,
 )
 configure_file(
     input: 'dhcpdb_create.mysql',
     output: 'dhcpdb_create.mysql',
-    copy: true
+    copy: true,
 )
 configure_file(
     input: 'dhcpdb_drop.mysql',
     output: 'dhcpdb_drop.mysql',
-    copy: true
+    copy: true,
 )
 # configure upgrade scripts
 # install

diff --git a/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in b/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
index 79d33a814f3524bd12f36859509d9cd49580ebe3..07c368196d994fceaa69bf193b142bd782290699 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2025 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/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in b/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
index 57de77e7a915ead71fceb94349a22b9fe8145e5a..9e1a83dc384a5f4ed05cc5136973469b59f1e0b5 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2025 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/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in b/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
index 2227a6cc1cc0a179071829143844e0e30303d5ad..48124c840b79460f73b82322213b683bbdbb1b72 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2025 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/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in b/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
index a9fe126270cf413a9af9eb510c7c5614d5602bc4..e81603bd328fde7a0ca6896594d8780d71efa6a8 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2025 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/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in b/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
index 9846d98ec6629da642ff90f9a955fae7afcf9be3..ef61adfedd70c58eb3bafc111a68518d81e267fb 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2025 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/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in b/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
index fdbcc108cf55850faeffd7e2e2a0dbcbb6358d90..b4d5e37d9cd0711a6eca200924736319a09ba68e 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017-2025 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/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in b/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
index 98222368f20019e3c00ae84c5f85eb03c6cd07d1..6dce39c250f3be5502d3ff9480a5a245b63d18b5 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018-2025 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/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in b/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
index 07b2280ccec1cf038606e2d931ab8d3c394d0854..dd9eecf30aaafdcd46da887b4d1b2df6679f3058 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018-2025 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/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in b/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
index 81520a9f858de7d4a1ca122e262d688fc609b006..2bfb583a2105a6481bfc9f4520c83dce7de30047 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018-2025 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/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in b/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
index af8797556f0867fb33ecfce38f5d46a8c58d35c7..f888a3361c81fc86d8b894650682630f5eff5495 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2019-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2019-2025 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/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in b/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
index 2a6d08eeb402888808a3ed3d878b78da324791cd..c9e9f2a4032762451d6b92dae76e6a93799fcea5 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2019-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2019-2025 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/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
index 7652badfdfba82604fcdbe5233f176277f6b16e4..8a923635cae1ad1a092d54b1ab4a5d67bc707eee 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2019-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2019-2025 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/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in b/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
index ab76de3b391b2e7e7b73e939250d9927de6089b6..5a610bea6254d8607c6819ce16d862d1a8214d64 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2019-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2019-2025 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/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in b/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
index cf27d46dc5245f26e73632571bf28401d676b98d..93dca25ce8ef6854b186735120f3f7361253aaa0 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2020-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2020-2025 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/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in b/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
index 1795baa18f16aff47ff9ce8acb5bfb2e9b0b0e63..0033992153d7067e8232fef4cdedcb6e638f165e 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2020-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2020-2025 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/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in b/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
index beb71f0f6d3078b87251223596b5d0d033a1d05b..0eaca855984a42d9606d8fa7c770ac8ec833101e 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2020-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2020-2025 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/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in b/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
index 851ad8bbc1414e6c5af42472f13cc2602046c77d..1901dfa57e52a7650ba544ad9f460106691f6e82 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2020-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2020-2025 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/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in b/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
index 398c9c392528dd2dcc857f17293a49ebb7dfe8e0..cab7b0cbcdbba3de442d7252409300d354042f6a 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2020-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2020-2025 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/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in b/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
index 0094882d232313850e1befa74ecaea30bb5debb7..fc9b4d47883c1f087a6e3578ca099dccc3731ff9 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2021-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2021-2025 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/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
index 52e19ff78587621bfaf393c7e1eeab8d67c90653..c2f5599d7855f1d89194b0b3b0dee0bc1e9b1a76 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2021-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2021-2025 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/share/database/scripts/mysql/upgrade_010_to_011.sh.in b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
index 45c7e9cdf479cb540116144d44be61bc04ff65f0..b01433747fa0c345632bdf5faccc52f5cac98f01 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2021-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2021-2025 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/share/database/scripts/mysql/upgrade_011_to_012.sh.in b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
index 16f05fc58c2af84e689b6aabf20f7b4b6febfb63..fd687d1f0c8f31e68129067b26a42811d94f61f1 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2021-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2021-2025 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/share/database/scripts/mysql/upgrade_012_to_013.sh.in b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
index 702e29dfb99528603778ad212e98dea1097d6036..5edc916f3446c2fab3d66acd2c0be8fdaaafd992 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2022-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2022-2025 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/share/database/scripts/mysql/upgrade_013_to_014.sh.in b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
index 7307d2947b4e0dd5a9823d7d080a112198d59727..0c4093ec997be21b718bfebde4d5bf70433ec6e0 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2022-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2022-2025 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/share/database/scripts/mysql/upgrade_014_to_015.sh.in b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
index b1fa56f736c477037c903cffc242090297ddc729..1bcad1cae71e448c7a5109a528abb29534f8c05d 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2023-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2023-2025 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/share/database/scripts/mysql/upgrade_015_to_016.sh.in b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
index 76a8a2ca400c8a190d67f00c5fdd93aca359d64b..77f4592d068419f50f311db8221bbfce0f29447a 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2023-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2023-2025 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/share/database/scripts/mysql/upgrade_016_to_017.sh.in b/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
index 32cbf0a225c811409e2898d3e9ca14fd9ba33685..3727fd5110a1dc56f23022ca91b8cc355f0889a4 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2023-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2023-2025 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/share/database/scripts/mysql/upgrade_017_to_018.sh.in b/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
index 289c6a498cb87918178dbf9907125793e4089c12..6f5d852a0a3f03e0da98bae2d391e4d7726c0288 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2023-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2023-2025 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/share/database/scripts/mysql/upgrade_018_to_019.sh.in b/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
index 8a9835d178c55dd60daf965ff5a2988955e51033..7191832faafade702f0a2d802e9ee04fe9112d08 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2023-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2023-2025 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/share/database/scripts/mysql/upgrade_019_to_020.sh.in b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
index 49fb4534dbafee8cf481cf758f02c42104d52565..0216f4d1e9b62702611a2c37b2d09ee9e3b08df9 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2023-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2023-2025 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/share/database/scripts/mysql/upgrade_020_to_021.sh.in b/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
index 125a50ab1b2bbe90f8f2fb69adada14998646d4f..0c971246fed0b888797071af938ec5b8553bd11f 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2023-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2023-2025 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/share/database/scripts/mysql/upgrade_021_to_022.sh.in b/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
index 6b488d40a018811749adb6174afbc7fd48c13731..1dc30f61428284360a96a3457c71ea68f4037018 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2023-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2023-2025 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/share/database/scripts/mysql/upgrade_022_to_023.sh.in b/src/share/database/scripts/mysql/upgrade_022_to_023.sh.in
index ab2b80e118c9c3c2c62cc347d92c147dd384c4e5..2abfd960cf40c4f33806329c97370f126e3c6694 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_022_to_023.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_022_to_023.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2024-2025 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/share/database/scripts/mysql/upgrade_023_to_024.sh.in b/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in
index a012e523802b81212a729a0c791d71ac396e713a..8f974ec1026b7dd541616c0c8e31d30fbf005af3 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2024-2025 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/share/database/scripts/mysql/upgrade_024_to_025.sh.in b/src/share/database/scripts/mysql/upgrade_024_to_025.sh.in
index 7ba378eb69675cad32ff24385351abd5a2912ae0..96a9f332c670aa3568e4335c4757a043d3c13aef 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_024_to_025.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_024_to_025.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2024-2025 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/share/database/scripts/mysql/upgrade_025_to_026.sh.in b/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
index c98223e2bc33d04f9cf6afb41da415d7525318cb..de95d6d59451d89e096f96c64774e1e9f260823d 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2024-2025 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/share/database/scripts/mysql/upgrade_026_to_027.sh.in b/src/share/database/scripts/mysql/upgrade_026_to_027.sh.in
index 194e071291f6f4032acf91eea9f63abadd5eaa2f..8ebd55da4028a6d000d0baf279d02092bed03505 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_026_to_027.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_026_to_027.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2024-2025 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/share/database/scripts/mysql/upgrade_027_to_028.sh.in b/src/share/database/scripts/mysql/upgrade_027_to_028.sh.in
index afa9f2eddb5d648cb273dae4c6ae23f2e9f68220..0d117349002fd20c1270f7ba5d660c75237147a3 100755 (executable)
--- a/src/share/database/scripts/mysql/upgrade_027_to_028.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_027_to_028.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2024-2025 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/share/database/scripts/mysql/wipe_data.sh.in b/src/share/database/scripts/mysql/wipe_data.sh.in
index 29d8fa174c6d94ff8173206b578db0d1d598687c..2d7dbe4cfe1bc52527f842f3c562c0574cedf418 100755 (executable)
--- a/src/share/database/scripts/mysql/wipe_data.sh.in
+++ b/src/share/database/scripts/mysql/wipe_data.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2019-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2019-2025 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/share/database/scripts/pgsql/meson.build b/src/share/database/scripts/pgsql/meson.build
new file mode 100644 (file)
index 0000000..15427d2
--- /dev/null
+++ b/src/share/database/scripts/pgsql/meson.build
@@ -0,0 +1,25 @@
+postgresql_script_conf_data = configuration_data()
+postgresql_script_conf_data.set('prefix', get_option('prefix'))
+postgresql_script_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
+postgresql_script_conf_data.set(
+    'datarootdir',
+    '${prefix}/' + get_option('datadir'),
+)
+postgresql_script_conf_data.set('PACKAGE_NAME', 'kea')
+configure_file(
+    input: 'wipe_data.sh.in',
+    output: 'wipe_data.sh',
+    configuration: postgresql_script_conf_data,
+)
+configure_file(
+    input: 'dhcpdb_create.pgsql',
+    output: 'dhcpdb_create.pgsql',
+    copy: true,
+)
+configure_file(
+    input: 'dhcpdb_drop.pgsql',
+    output: 'dhcpdb_drop.pgsql',
+    copy: true,
+)
+# configure upgrade scripts
+# install