build: fix linking libnm-log-null into different test programs

We require these, otherwise we can get a linker error about
_nm_utils_monotonic_timestamp_initialized symbol being undefined.
This commit is contained in:
Thomas Haller
2021-06-30 22:02:51 +02:00
parent 30940222cc
commit 09fb7877a9
10 changed files with 13 additions and 2 deletions

View File

@@ -803,6 +803,7 @@ src_libnm_client_aux_extern_tests_test_libnm_client_aux_LDADD = \
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
src/libnm-glib-aux/libnm-glib-aux.la \
src/libnm-log-null/libnm-log-null.la \
src/libnm-std-aux/libnm-std-aux.la \
src/c-siphash/libc-siphash.la \
src/libnm-client-impl/libnm.la \
@@ -4584,6 +4585,7 @@ src_nm_dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
src_nm_dispatcher_tests_test_dispatcher_envp_LDADD = \
src/nm-dispatcher/libnm-dispatcher-core.la \
src/libnm-glib-aux/libnm-glib-aux.la \
src/libnm-log-null/libnm-log-null.la \
src/libnm-std-aux/libnm-std-aux.la \
src/c-siphash/libc-siphash.la \
src/libnm-client-impl/libnm.la \
@@ -4778,6 +4780,7 @@ src_libnmc_setting_tests_test_libnmc_setting_LDADD = \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
src/libnm-base/libnm-base.la \
src/libnm-glib-aux/libnm-glib-aux.la \
src/libnm-log-null/libnm-log-null.la \
src/libnm-std-aux/libnm-std-aux.la \
src/c-siphash/libc-siphash.la \
src/libnm-client-impl/libnm.la \

View File

@@ -14,6 +14,7 @@ nm_pppd_plugin = shared_module(
],
link_with: [
libnm_core_impl,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View File

@@ -32,8 +32,8 @@ foreach test_unit: test_units
libnm_core_impl,
libnm_crypto,
libnm_base,
libnm_log_null,
libnm_systemd_shared,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View File

@@ -13,6 +13,7 @@ exe = executable(
libnm_core_aux_extern,
libnm_core_aux_intern,
libnm_base,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View File

@@ -11,6 +11,7 @@ exe = executable(
link_with: [
libnm_cloud_setup_core,
libnmc_base,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View File

@@ -39,6 +39,7 @@ executable(
link_with: [
libnm_core_aux_extern,
libnm_dispatcher_core,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View File

@@ -13,6 +13,7 @@ exe = executable(
c_args: introspection_extra_cflags,
link_with: [
libnm_dispatcher_core,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View File

@@ -34,8 +34,8 @@ executable(
libnm_platform,
libnm_base,
libnm_systemd_shared,
libnm_log_core,
libnm_udev_aux,
libnm_log_core,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View File

@@ -9,6 +9,7 @@ executable(
],
link_with: [
libnm_client_aux_extern,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,

View File

@@ -35,6 +35,7 @@ executable(
libnm_core_aux_extern,
libnm_core_aux_intern,
libnm_base,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,
@@ -61,6 +62,7 @@ generate_docs_nm_settings_nmcli = executable(
libnm_core_aux_extern,
libnm_core_aux_intern,
libnm_base,
libnm_log_null,
libnm_glib_aux,
libnm_std_aux,
libc_siphash,