[#3729] Removed static_library with_links

diff --git a/fuzz/meson.build b/fuzz/meson.build
index bba238efc5390078d29afb04ba935d01e748c28d..73103df1efb043cd563694154e693cb66aabef86 100644 (file)
--- a/fuzz/meson.build
+++ b/fuzz/meson.build
@@ -4,30 +4,31 @@ subdir('tests')
 fuzz_sources = ['fuzz.cc', 'fuzz.h']
 cpp_flags = []
 if FUZZING_IN_CI
-  cpp_flags = ['-fsanitize=fuzzer', '-gdwarf-4']
+    cpp_flags = ['-fsanitize=fuzzer', '-gdwarf-4']
 else
-  fuzz_sources += ['main.cc']
+    fuzz_sources += ['main.cc']
 endif
 
-fuzz_lib = static_library('fuzz_lib',
-  fuzz_sources,
-  cpp_args: cpp_flags + [
-    f'-DKEA_LFC_SOURCES="@KEA_LFC@"',
-    f'-DKEA_LFC_INSTALLATION="@PREFIX@/sbin/kea-lfc"',
-  ],
-  dependencies: [crypto],
-  include_directories: [include_directories('.')] + INCLUDES,
-  link_with: LIBS_BUILT_SO_FAR,
+fuzz_lib = static_library(
+    'fuzz_lib',
+    fuzz_sources,
+    cpp_args: cpp_flags + [
+        f'-DKEA_LFC_SOURCES="@KEA_LFC@"',
+        f'-DKEA_LFC_INSTALLATION="@PREFIX@/sbin/kea-lfc"',
+    ],
+    dependencies: [crypto],
+    include_directories: [include_directories('.')] + INCLUDES,
 )
 
-executable('fuzz_config_kea_dhcp4',
-  'fuzz_config_kea_dhcp4.cc',
-  fuzz_sources,
-  cpp_args: cpp_flags + [
-    f'-DKEA_LFC_SOURCES="@KEA_LFC@"',
-    f'-DKEA_LFC_INSTALLATION="@PREFIX@/sbin/kea-lfc"',
-  ],
-  dependencies: [crypto],
-  include_directories: [include_directories('.')] + INCLUDES,
-  link_with: [dhcp4_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
+executable(
+    'fuzz_config_kea_dhcp4',
+    'fuzz_config_kea_dhcp4.cc',
+    fuzz_sources,
+    cpp_args: cpp_flags + [
+        f'-DKEA_LFC_SOURCES="@KEA_LFC@"',
+        f'-DKEA_LFC_INSTALLATION="@PREFIX@/sbin/kea-lfc"',
+    ],
+    dependencies: [crypto],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [dhcp4_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/bin/agent/meson.build b/src/bin/agent/meson.build
index 4ab479104224bb87225c863469269e2622c08e10..f198f8b50d30db5ccc5babe0b8743ffdee2dddd8 100644 (file)
--- a/src/bin/agent/meson.build
+++ b/src/bin/agent/meson.build
@@ -13,7 +13,6 @@ agent_lib = static_library(
     'simple_parser.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )
 executable(
     'kea-ctrl-agent',

diff --git a/src/bin/d2/meson.build b/src/bin/d2/meson.build
index 900da24ee78f03884d2ab8275a1e10fd48a351cf..e08d9d7bf90f4b551950a100ab3a446139ab92af 100644 (file)
--- a/src/bin/d2/meson.build
+++ b/src/bin/d2/meson.build
@@ -17,7 +17,6 @@ d2_lib = static_library(
     'simple_remove_without_dhcid.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )
 executable(
     'kea-dhcp-ddns',

diff --git a/src/bin/dhcp4/meson.build b/src/bin/dhcp4/meson.build
index 106faa565e3402a2aeae8710edf06a541846fefa..5aad6a58fcfb9469ea7b28754d18ef4ae032f24e 100644 (file)
--- a/src/bin/dhcp4/meson.build
+++ b/src/bin/dhcp4/meson.build
@@ -12,7 +12,6 @@ dhcp4_lib = static_library(
     'parser_context.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )
 executable(
     'kea-dhcp4',

diff --git a/src/bin/dhcp6/meson.build b/src/bin/dhcp6/meson.build
index f27f128f76b87c406baec2285e12d7d3c14f01f2..c7f007965ce9bb7ad8c595400aadbcd6b9acd2c7 100644 (file)
--- a/src/bin/dhcp6/meson.build
+++ b/src/bin/dhcp6/meson.build
@@ -13,7 +13,6 @@ dhcp6_lib = static_library(
     'parser_context.cc',
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )
 executable(
     'kea-dhcp6',

diff --git a/src/bin/lfc/meson.build b/src/bin/lfc/meson.build
index 0f71a88f2b3c901acda711288a31c041bd526005..4c3b2e9f9e98e718b33191e1c45b63e2bdee781e 100644 (file)
--- a/src/bin/lfc/meson.build
+++ b/src/bin/lfc/meson.build
@@ -5,7 +5,6 @@ lfc_lib = static_library(
     'lfc_messages.cc',
     dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )
 executable(
     'kea-lfc',

diff --git a/src/bin/perfdhcp/meson.build b/src/bin/perfdhcp/meson.build
index 480becef453d767a67f16638c17a3afe2af2435e..413bf1db8568a5f82b8798582b42a606d5e4676d 100644 (file)
--- a/src/bin/perfdhcp/meson.build
+++ b/src/bin/perfdhcp/meson.build
@@ -13,7 +13,6 @@ perfdhcp_lib = static_library(
     'test_control.cc',
     dependencies: [boost, threads],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )
 executable(
     'perfdhcp',

diff --git a/src/hooks/dhcp/bootp/meson.build b/src/hooks/dhcp/bootp/meson.build
index 09b70a364cec12afcbf7d682ae8e0ee6d41be5b5..19e192cb98e3feecf495c002bd49a5b0b8da65e0 100644 (file)
--- a/src/hooks/dhcp/bootp/meson.build
+++ b/src/hooks/dhcp/bootp/meson.build
@@ -14,7 +14,6 @@ dhcp_bootp_lib = shared_library(
 dhcp_bootp_archive = static_library(
     'dhcp_bootp',
     objects: dhcp_bootp_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('libloadtests')
 subdir('tests')

diff --git a/src/hooks/dhcp/flex_option/meson.build b/src/hooks/dhcp/flex_option/meson.build
index 73513bbdb5a14bd7f45c6e9065b1a0f5e1e4e111..281ea5373f79a1434eaebb355d0dde4b25fabe1e 100644 (file)
--- a/src/hooks/dhcp/flex_option/meson.build
+++ b/src/hooks/dhcp/flex_option/meson.build
@@ -15,7 +15,6 @@ dhcp_flex_option_lib = shared_library(
 dhcp_flex_option_archive = static_library(
     'dhcp_flex_option',
     objects: dhcp_flex_option_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('libloadtests')
 subdir('tests')

diff --git a/src/hooks/dhcp/high_availability/meson.build b/src/hooks/dhcp/high_availability/meson.build
index d95fbe895d7383694d90ced8e3bebdd161fcf616..3f8669cadadff019ec62476f1087e96186bf91f1 100644 (file)
--- a/src/hooks/dhcp/high_availability/meson.build
+++ b/src/hooks/dhcp/high_availability/meson.build
@@ -24,7 +24,6 @@ dhcp_ha_lib = shared_library(
 dhcp_ha_archive = static_library(
     'dhcp_ha',
     objects: dhcp_ha_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('libloadtests')
 subdir('tests')

diff --git a/src/hooks/dhcp/lease_cmds/meson.build b/src/hooks/dhcp/lease_cmds/meson.build
index 2a8a2f42508b22886f4d5c3cd2688c99b8c485f2..994953482e1d765ba2fb3710da9a6f7b48d92f12 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/meson.build
+++ b/src/hooks/dhcp/lease_cmds/meson.build
@@ -16,7 +16,6 @@ dhcp_lease_cmds_lib = shared_library(
 dhcp_lease_cmds_archive = static_library(
     'dhcp_lease_cmds',
     objects: dhcp_lease_cmds_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('libloadtests')
 subdir('tests')

diff --git a/src/hooks/dhcp/mysql/meson.build b/src/hooks/dhcp/mysql/meson.build
index fb994a2cdbac1d8a219fa4ca86f71433b06d31ce..7cb1c5cfa193b019600be1a35dbc8c0ef6886694 100644 (file)
--- a/src/hooks/dhcp/mysql/meson.build
+++ b/src/hooks/dhcp/mysql/meson.build
@@ -27,7 +27,6 @@ dhcp_mysql_lib = shared_library(
 dhcp_mysql_archive = static_library(
     'dhcp_mysql',
     objects: dhcp_mysql_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('libloadtests')
 subdir('tests')

diff --git a/src/hooks/dhcp/mysql/tests/meson.build b/src/hooks/dhcp/mysql/tests/meson.build
index 29e01ed87d48133ad9bd4186887741a72ecdc85d..b0847302b9a2d44ba89e983c8fa98326984665bf 100644 (file)
--- a/src/hooks/dhcp/mysql/tests/meson.build
+++ b/src/hooks/dhcp/mysql/tests/meson.build
@@ -3,7 +3,11 @@ if not gtest.found()
 endif
 
 HOOK_INCLUDES = [include_directories('..')]
-libs_testutils = [kea_dhcpsrv_testutils_lib, kea_mysql_testutils_lib]
+libs_testutils = [
+    kea_dhcpsrv_testutils_lib,
+    kea_mysql_testutils_lib,
+    kea_database_testutils_lib,
+]
 dhcp_mysql_lib_tests = executable(
     'dhcp-mysql-lib-tests',
     'mysql_bootp_unittest.cc',

diff --git a/src/hooks/dhcp/perfmon/meson.build b/src/hooks/dhcp/perfmon/meson.build
index 255a208db6b83365dee27e7bab6be57c7595b490..2b5a22a35d2700fa9ecb8093867a1500a34fba37 100644 (file)
--- a/src/hooks/dhcp/perfmon/meson.build
+++ b/src/hooks/dhcp/perfmon/meson.build
@@ -20,7 +20,6 @@ dhcp_perfmon_lib = shared_library(
 dhcp_perfmon_archive = static_library(
     'dhcp_perfmon',
     objects: dhcp_perfmon_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('libloadtests')
 subdir('tests')

diff --git a/src/hooks/dhcp/pgsql/meson.build b/src/hooks/dhcp/pgsql/meson.build
index 2d040a9ab76bed291c5b819270d9ed338a9b61a1..9b412cc571dfe7cfa786e7ae4398fb5306104052 100644 (file)
--- a/src/hooks/dhcp/pgsql/meson.build
+++ b/src/hooks/dhcp/pgsql/meson.build
@@ -27,7 +27,6 @@ dhcp_pgsql_lib = shared_library(
 dhcp_pgsql_archive = static_library(
     'dhcp_pgsql',
     objects: dhcp_pgsql_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('libloadtests')
 subdir('tests')

diff --git a/src/hooks/dhcp/pgsql/tests/meson.build b/src/hooks/dhcp/pgsql/tests/meson.build
index 835823b6a8854c82ef0f79a5a36608a089da1bf0..b5e639b9c37985f6c4a90e18131716b4d7dec363 100644 (file)
--- a/src/hooks/dhcp/pgsql/tests/meson.build
+++ b/src/hooks/dhcp/pgsql/tests/meson.build
@@ -3,7 +3,11 @@ if not gtest.found()
 endif
 
 HOOK_INCLUDES = [include_directories('..')]
-libs_testutils = [kea_dhcpsrv_testutils_lib, kea_pgsql_testutils_lib]
+libs_testutils = [
+    kea_dhcpsrv_testutils_lib,
+    kea_pgsql_testutils_lib,
+    kea_database_testutils_lib,
+]
 dhcp_pgsql_lib_tests = executable(
     'dhcp-pgsql-lib-tests',
     'pgsql_bootp_unittest.cc',

diff --git a/src/hooks/dhcp/run_script/meson.build b/src/hooks/dhcp/run_script/meson.build
index defb19cc6f1d70690fc7d70b89cd035499149452..8ef91cdf56e9dda0f5d8b229f0a0eeb5afcce64c 100644 (file)
--- a/src/hooks/dhcp/run_script/meson.build
+++ b/src/hooks/dhcp/run_script/meson.build
@@ -15,7 +15,6 @@ dhcp_run_script_lib = shared_library(
 dhcp_run_script_archive = static_library(
     'dhcp_run_script',
     objects: dhcp_run_script_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 # Do tests first
 subdir('tests')

diff --git a/src/hooks/dhcp/stat_cmds/meson.build b/src/hooks/dhcp/stat_cmds/meson.build
index 1b61f5fc6be228ba5c325716c4c005e0682e1bac..b166119dea228e1e0e161704e42031737bdd3500 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/meson.build
+++ b/src/hooks/dhcp/stat_cmds/meson.build
@@ -15,7 +15,6 @@ dhcp_stat_cmds_lib = shared_library(
 dhcp_stat_cmds_archive = static_library(
     'dhcp_stat_cmds',
     objects: dhcp_stat_cmds_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('libloadtests')
 subdir('tests')

diff --git a/src/hooks/dhcp/user_chk/meson.build b/src/hooks/dhcp/user_chk/meson.build
index a30f722ed310eba447b212a59188cae667a60220..6107f91e134b3445e2866dc0e6ad95a0aca008ea 100644 (file)
--- a/src/hooks/dhcp/user_chk/meson.build
+++ b/src/hooks/dhcp/user_chk/meson.build
@@ -21,6 +21,5 @@ dhcp_user_chk_lib = shared_library(
 dhcp_user_chk_archive = static_library(
     'dhcp_user_chk',
     objects: dhcp_user_chk_lib.extract_all_objects(recursive: false),
-    link_with: LIBS_BUILT_SO_FAR,
 )
 subdir('tests')

diff --git a/src/lib/asiolink/testutils/meson.build b/src/lib/asiolink/testutils/meson.build
index 3b37c1805dd1caa6603263a20fd05d58e10fb96e..76dbb1c4e8c02e2ca2094cb3328edeff283c46d5 100644 (file)
--- a/src/lib/asiolink/testutils/meson.build
+++ b/src/lib/asiolink/testutils/meson.build
@@ -10,7 +10,6 @@ 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,
 )
 
 if crypto.name() == openssl.name()
@@ -47,4 +46,4 @@ elif crypto.name() == botan.name()
         include_directories: [include_directories('.')] + INCLUDES,
         link_with: LIBS_BUILT_SO_FAR,
     )
-endif
\ No newline at end of file
+endif

diff --git a/src/lib/d2srv/testutils/meson.build b/src/lib/d2srv/testutils/meson.build
index 7d2fba883e1c6434611b60eb1fc01af2b013b513..43c613547738bd0d64c4a95ff662c1db518d601b 100644 (file)
--- a/src/lib/d2srv/testutils/meson.build
+++ b/src/lib/d2srv/testutils/meson.build
@@ -8,5 +8,4 @@ kea_d2srv_testutils_lib = static_library(
     'stats_test_utils.cc',
     dependencies: [boost, crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/database/testutils/meson.build b/src/lib/database/testutils/meson.build
index 4f198804d52f7828af3f0f9d4febbba26f15ae18..5b5e8f8ac6dc40b279567f11ff5345a61ae22e1b 100644 (file)
--- a/src/lib/database/testutils/meson.build
+++ b/src/lib/database/testutils/meson.build
@@ -7,5 +7,4 @@ 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,
 )

diff --git a/src/lib/dhcp/testutils/meson.build b/src/lib/dhcp/testutils/meson.build
index 7a05ac1d671203da15ac58ae105e1d68205b5276..e889d5e3a705c12f2baaae2c9219a5641496e40b 100644 (file)
--- a/src/lib/dhcp/testutils/meson.build
+++ b/src/lib/dhcp/testutils/meson.build
@@ -11,5 +11,4 @@ kea_dhcp_testutils_lib = static_library(
     'pkt_filter_test_stub.cc',
     dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/dhcpsrv/testutils/meson.build b/src/lib/dhcpsrv/testutils/meson.build
index 41d7eef24cadd373b5cba1012a80ad0528b9a626..15f36b9dbf295891ae638e812fd2d72071f3ec13 100644 (file)
--- a/src/lib/dhcpsrv/testutils/meson.build
+++ b/src/lib/dhcpsrv/testutils/meson.build
@@ -35,5 +35,4 @@ kea_dhcpsrv_testutils_lib = static_library(
     cpp_args: [f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"'],
     dependencies: dependencies,
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/mysql/testutils/meson.build b/src/lib/mysql/testutils/meson.build
index 3eddcb6f250f9932c6e268143e77b1e91bd30a05..de9b90fbae80e420076f7b7bae4e88e03f849539 100644 (file)
--- a/src/lib/mysql/testutils/meson.build
+++ b/src/lib/mysql/testutils/meson.build
@@ -11,5 +11,4 @@ kea_mysql_testutils_lib = static_library(
     ],
     dependencies: [boost, mysql],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_database_testutils_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/pgsql/testutils/meson.build b/src/lib/pgsql/testutils/meson.build
index c9f58e05921573f4008e4e3c625f1c8b21175a1c..c12070629cb1d1dbf75193063e3f4e0dba657105 100644 (file)
--- a/src/lib/pgsql/testutils/meson.build
+++ b/src/lib/pgsql/testutils/meson.build
@@ -11,5 +11,4 @@ kea_pgsql_testutils_lib = static_library(
     ],
     dependencies: [postgresql],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_database_testutils_lib] + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/process/testutils/meson.build b/src/lib/process/testutils/meson.build
index 6afb0281abc533b04ac96cdc1cc430a758724a29..99d0a10ca0115f27b1f12b4e1a493674103e9a99 100644 (file)
--- a/src/lib/process/testutils/meson.build
+++ b/src/lib/process/testutils/meson.build
@@ -8,5 +8,4 @@ kea_process_testutils_lib = static_library(
     cpp_args: [f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"'],
     dependencies: [boost, gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/testutils/meson.build b/src/lib/testutils/meson.build
index ea79a045608b5b735b9a9ad882b19c903e9b6c78..c706d31091bbcdf978e28dfced43a59ead64c7df 100644 (file)
--- a/src/lib/testutils/meson.build
+++ b/src/lib/testutils/meson.build
@@ -12,7 +12,6 @@ kea_testutils_lib = static_library(
     'user_context_utils.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 
 dhcp_test_lib_conf_data = configuration_data()

diff --git a/src/lib/util/unittests/meson.build b/src/lib/util/unittests/meson.build
index 827ee45e136889f1471b17ebe2679ecd2ebe8402..47c2ef02e194551de84370984d4d2eb774b75b54 100644 (file)
--- a/src/lib/util/unittests/meson.build
+++ b/src/lib/util/unittests/meson.build
@@ -14,5 +14,4 @@ kea_util_unittests_lib = static_library(
     'wiredata.cc',
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: LIBS_BUILT_SO_FAR,
 )