From 25bb43f4db20bbf58666ba5994e2fc54f08e4d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Wed, 11 Sep 2019 11:45:10 +0200
Subject: [PATCH] meson: Ease the use of the libnm-libnm-core-intern library

The dependency for the `libnm-libnm-core-intern` library has been
recovered to ease its use.
---
 libnm-core/meson.build | 7 +++++++
 libnm/meson.build      | 9 ++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index ffe9e4bd9e..0060bed140 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -92,6 +92,13 @@ libnm_libnm_core_intern = static_library(
   c_args: common_c_flags,
 )
 
+libnm_libnm_core_intern_dep = declare_dependency(
+  sources: [libnm_core_enum_sources[1], nm_version_macro_header],
+  include_directories: [libnm_core_inc, shared_inc],
+  dependencies: libnm_utils_base_dep,
+  link_with: libnm_libnm_core_intern,
+)
+
 deps = [
   crypto_dep,
   libnm_utils_base_dep,
diff --git a/libnm/meson.build b/libnm/meson.build
index acf2284bee..8b68a63679 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -134,23 +134,18 @@ libnm_sources = files(
 
 deps = [
   libnmdbus_dep,
+  libnm_libnm_core_intern_dep,
   libnm_nm_default_dep,
   libnm_udev_aux_dep,
   libudev_dep,
 ]
 
-links = [
-  libnm_libnm_core_intern,
-  libnm_systemd_logging_stub,
-]
-
 liblibnm = static_library(
   'libnm',
   sources: libnm_sources + libnm_enum_sources,
-  include_directories: libnm_core_inc,
   dependencies: deps,
   c_args: c_flags,
-  link_with: links,
+  link_with: libnm_systemd_logging_stub,
 )
 
 links = [