build/meson: cleanup dependencies for libnm-systemd-shared

src/core/initrd/meson.build

@@ -19,6 +19,7 @@ executable(
     libnmi_core,
     libnm_core_impl,
     libnm_base,
+    libnm_systemd_shared,
     libnm_log_core,
     libnm_glib_aux,
     libnm_std_aux,

src/core/meson.build

@@ -76,7 +76,6 @@ libNetworkManagerBase = static_library(
   dependencies: [
     core_default_dep,
     libnm_core_impl_dep,
-    libnm_systemd_shared_dep,
     libnm_udev_aux_dep,
     libsystemd_dep,
     libudev_dep,

src/core/systemd/meson.build

@@ -44,10 +44,9 @@ libnm_systemd_core = static_library(
   ],
   dependencies: [
     libnm_core_impl_dep,
-    libnm_systemd_shared_dep,
+    libnm_systemd_shared_dep_inc,
     glib_dep,
   ],
-  link_with: libc_siphash,
 )
 
 libnm_systemd_core_dep = declare_dependency(
@@ -57,7 +56,9 @@ libnm_systemd_core_dep = declare_dependency(
   dependencies: [
     glib_dep,
     libnm_core_impl_dep,
-    libnm_systemd_shared_dep,
   ],
-  link_with: libnm_systemd_core,
+  link_with: [
+    libnm_systemd_shared,
+    libnm_systemd_core,
+  ],
 )

src/core/tests/meson.build

@@ -39,7 +39,10 @@ exe = executable(
   ],
   dependencies: [
     libnm_systemd_core_dep,
-    libnm_systemd_shared_dep,
+  ],
+  link_with: [
+    libnm_systemd_shared,
+    libc_siphash,
   ],
 )
 

src/libnm-client-impl/meson.build

@@ -90,6 +90,7 @@ libnm = shared_library(
     libnm_client_impl,
     libnm_core_impl,
     libnm_base,
+    libnm_systemd_shared,
     libnm_log_null,
     libnm_glib_aux,
     libnm_std_aux,

src/libnm-client-impl/tests/meson.build

@@ -23,6 +23,7 @@ foreach test_unit: test_units
       libnm_client_impl,
       libnm_client_test,
       libnm_base,
+      libnm_systemd_shared,
       libnm_glib_aux,
       libnm_std_aux,
       libc_siphash,

src/libnm-core-impl/meson.build

@@ -109,7 +109,6 @@ libnm_core_impl = static_library(
   ],
   dependencies: [
     dl_dep,
-    libnm_systemd_shared_dep,
     libnm_core_public_dep,
     libnm_core_intern_dep,
     uuid_dep,

src/libnm-core-impl/tests/meson.build

@@ -30,7 +30,10 @@ foreach test_unit: test_units
       libnm_core_impl_dep_link,
       libnm_base_dep_link,
     ],
-    link_with: libnm_log_null,
+    link_with: [
+      libnm_log_null,
+      libnm_systemd_shared,
+    ],
   )
 
   test(

src/libnm-systemd-shared/meson.build

@@ -54,12 +54,10 @@ libnm_systemd_shared = static_library(
   dependencies: glib_dep,
 )
 
-libnm_systemd_shared_dep = declare_dependency(
+libnm_systemd_shared_dep_inc = declare_dependency(
   include_directories: include_directories(
     'sd-adapt-shared',
     'src/basic',
     'src/shared',
   ),
-  dependencies: glib_dep,
-  link_with: libnm_systemd_shared,
 )