From bb4a10719ce6553c2ab719d2eb28514a08ea6f6c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 24 Feb 2021 14:01:52 +0100
Subject: [PATCH] build/meson: cleanup dependencies for libnm-platform

---
 src/core/initrd/meson.build          |  1 +
 src/core/meson.build                 |  7 +++++--
 src/libnm-platform/meson.build       | 16 +++++-----------
 src/libnm-platform/tests/meson.build |  5 ++++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build
index 77f7f0840e..2057edc5c2 100644
--- a/src/core/initrd/meson.build
+++ b/src/core/initrd/meson.build
@@ -18,6 +18,7 @@ executable(
     libNetworkManagerBase,
     libnmi_core,
     libnm_core_impl,
+    libnm_platform,
     libnm_base,
     libnm_systemd_shared,
     libnm_log_core,
diff --git a/src/core/meson.build b/src/core/meson.build
index e5cf617d15..28d163496f 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -24,7 +24,6 @@ core_default_dep = declare_dependency(
   dependencies: [
     libnm_core_public_dep,
     libnm_core_intern_dep,
-    libnm_platform_dep,
   ],
 )
 
@@ -211,6 +210,7 @@ executable(
   link_with: [
     libNetworkManagerBase,
     libnm_systemd_core,
+    libnm_platform,
     libnm_systemd_shared,
     libnm_base,
     libnm_udev_aux,
@@ -250,8 +250,9 @@ if enable_tests
     dependencies: core_default_dep,
     link_with: [
       libNetworkManagerTest,
-      libnm_base,
       libnm_core_impl,
+      libnm_platform,
+      libnm_base,
       libnm_systemd_shared,
       libnm_udev_aux,
       libnm_log_core,
@@ -300,6 +301,7 @@ NetworkManager_all_sym = executable(
     libNetworkManager,
     libNetworkManagerBase,
     libnm_core_impl,
+    libnm_platform,
     libnm_base,
     libnm_log_core,
     libnm_udev_aux,
@@ -337,6 +339,7 @@ NetworkManager = executable(
     libNetworkManager,
     libNetworkManagerBase,
     libnm_core_impl,
+    libnm_platform,
     libnm_base,
     libnm_udev_aux,
     libnm_log_core,
diff --git a/src/libnm-platform/meson.build b/src/libnm-platform/meson.build
index 2d69d5288f..c2a8b2e7cf 100644
--- a/src/libnm-platform/meson.build
+++ b/src/libnm-platform/meson.build
@@ -2,23 +2,17 @@
 
 libnm_platform = static_library(
   'nm-platform',
-  include_directories: [
-    src_inc,
-    top_inc,
-  ],
   sources: [
     'nm-netlink.c',
     'nm-platform-utils.c',
     'nmp-netns.c',
   ],
-  dependencies: [
-    glib_dep,
-  ],
-)
-
-libnm_platform_dep = declare_dependency(
   include_directories: [
     src_inc,
+    top_inc,
+  ],
+  dependencies: [
+    glib_dep,
+    libudev_dep,
   ],
-  link_with: libnm_platform,
 )
diff --git a/src/libnm-platform/tests/meson.build b/src/libnm-platform/tests/meson.build
index 6e313d5738..dedb60c91b 100644
--- a/src/libnm-platform/tests/meson.build
+++ b/src/libnm-platform/tests/meson.build
@@ -4,14 +4,17 @@ exe = executable(
   'test-nm-platform',
   'test-nm-platform.c',
   dependencies: [
-    libnm_platform_dep,
     glib_dep,
+    libudev_dep,
   ],
   include_directories: [
     src_inc,
     top_inc,
   ],
   link_with: [
+    libnm_platform,
+    libnm_base,
+    libnm_udev_aux,
     libnm_log_core,
     libnm_glib_aux,
     libnm_std_aux,