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

---
 src/core/meson.build                    |  5 ++---
 src/core/ppp/meson.build                |  7 ++++++-
 src/core/systemd/meson.build            |  4 ++--
 src/core/tests/meson.build              |  1 +
 src/libnm-client-impl/tests/meson.build |  3 ++-
 src/libnm-core-impl/meson.build         | 14 --------------
 src/libnm-core-impl/tests/meson.build   |  2 +-
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/core/meson.build b/src/core/meson.build
index 68686c296..0c66ce118 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -72,7 +72,7 @@ libNetworkManagerBase = static_library(
   ) + platform_wifi_wext_source,
   dependencies: [
     core_default_dep,
-    libnm_core_impl_dep,
+    libnm_core_public_dep,
     libsystemd_dep,
     libudev_dep,
   ],
@@ -80,7 +80,6 @@ libNetworkManagerBase = static_library(
 
 nm_deps = [
   libnm_core_public_dep,
-  libnm_core_impl_dep,
   core_default_dep,
   dl_dep,
   libndp_dep,
@@ -199,7 +198,6 @@ executable(
   'nm-iface-helper.c',
   dependencies: [
     core_default_dep,
-    libnm_core_impl_dep_link,
     glib_dep,
     libudev_dep,
     libndp_dep,
@@ -207,6 +205,7 @@ executable(
   ],
   link_with: [
     libNetworkManagerBase,
+    libnm_core_impl,
     libnm_systemd_core,
     libnm_platform,
     libnm_systemd_shared,
diff --git a/src/core/ppp/meson.build b/src/core/ppp/meson.build
index 0f36a17c2..ffeb0eba9 100644
--- a/src/core/ppp/meson.build
+++ b/src/core/ppp/meson.build
@@ -4,11 +4,16 @@ nm_pppd_plugin = shared_module(
   'nm-pppd-plugin',
   name_prefix: '',
   sources: 'nm-pppd-plugin.c',
+  include_directories: [
+    src_inc,
+    top_inc,
+  ],
   dependencies: [
-    libnm_core_impl_dep_link,
+    libnm_core_public_dep,
     glib_dep,
   ],
   link_with: [
+    libnm_core_impl,
     libnm_glib_aux,
     libnm_std_aux,
     libc_siphash,
diff --git a/src/core/systemd/meson.build b/src/core/systemd/meson.build
index 3494976b0..2de60776c 100644
--- a/src/core/systemd/meson.build
+++ b/src/core/systemd/meson.build
@@ -43,7 +43,7 @@ libnm_systemd_core = static_library(
     src_core_inc,
   ],
   dependencies: [
-    libnm_core_impl_dep,
+    libnm_core_public_dep,
     libnm_systemd_shared_dep_inc,
     glib_dep,
   ],
@@ -55,9 +55,9 @@ libnm_systemd_core_dep = declare_dependency(
   ],
   dependencies: [
     glib_dep,
-    libnm_core_impl_dep,
   ],
   link_with: [
+    libnm_core_impl,
     libnm_systemd_shared,
     libnm_systemd_core,
   ],
diff --git a/src/core/tests/meson.build b/src/core/tests/meson.build
index fbc1b21c1..5415bb2ae 100644
--- a/src/core/tests/meson.build
+++ b/src/core/tests/meson.build
@@ -38,6 +38,7 @@ exe = executable(
     src_core_inc,
   ],
   dependencies: [
+    libnm_core_public_dep,
     libnm_systemd_core_dep,
   ],
   link_with: [
diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build
index 19ed961a2..e8c2cb797 100644
--- a/src/libnm-client-impl/tests/meson.build
+++ b/src/libnm-client-impl/tests/meson.build
@@ -15,7 +15,7 @@ foreach test_unit: test_units
       libnm_client_public_inc,
     ],
     dependencies: [
-      libnm_core_impl_dep_link,
+      libnm_core_public_dep,
       libnm_nm_default_dep,
       glib_dep,
       libudev_dep,
@@ -23,6 +23,7 @@ foreach test_unit: test_units
     link_with: [
       libnm_client_impl,
       libnm_client_test,
+      libnm_core_impl,
       libnm_base,
       libnm_udev_aux,
       libnm_systemd_shared,
diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build
index b9ba81f66..b9f4c7433 100644
--- a/src/libnm-core-impl/meson.build
+++ b/src/libnm-core-impl/meson.build
@@ -117,17 +117,3 @@ libnm_core_impl = static_library(
     libnm_core_aux_intern,
   ],
 )
-
-libnm_core_impl_dep = declare_dependency(
-  dependencies: [
-    libnm_core_public_dep,
-    glib_dep,
-  ],
-)
-
-libnm_core_impl_dep_link = declare_dependency(
-  dependencies: [
-    libnm_core_impl_dep,
-  ],
-  link_with: libnm_core_impl,
-)
diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build
index 449a69069..bcf39e617 100644
--- a/src/libnm-core-impl/tests/meson.build
+++ b/src/libnm-core-impl/tests/meson.build
@@ -26,9 +26,9 @@ foreach test_unit: test_units
     ],
     dependencies: [
       libnm_core_public_dep,
-      libnm_core_impl_dep_link,
     ],
     link_with: [
+      libnm_core_impl,
       libnm_base,
       libnm_log_null,
       libnm_systemd_shared,