10 files changed, 92 insertions, 11 deletions
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index 730444fe60..d63b702417 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -139,6 +139,48 @@ libnm_core_enum = gnome.mkenums(
   install_dir: libnm_pkgincludedir,
 )
 
+libnm_core_enum_dep = declare_dependency(
+  sources: libnm_core_enum[1],
+)
+
+###############################################################################
+
+shared_nm_libnm_core_intern = static_library(
+    'nm-libnm-core-intern',
+    sources: files('../shared/nm-libnm-core-intern/nm-ethtool-utils.c',
+                   '../shared/nm-libnm-core-intern/nm-libnm-core-utils.c'),
+    c_args: [
+        '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+        '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
+    ],
+    include_directories: [
+        top_inc,
+        shared_inc,
+        libnm_core_inc,
+    ],
+    dependencies: [
+        glib_dep,
+        shared_c_siphash_dep,
+        shared_nm_glib_aux_dep,
+        libnm_core_enum_dep,
+    ],
+)
+
+shared_nm_libnm_core_intern_dep = declare_dependency(
+    link_with: shared_nm_libnm_core_intern,
+    include_directories: [
+        top_inc,
+        shared_inc,
+    ],
+    dependencies: [
+        glib_dep,
+        shared_nm_glib_aux_dep,
+        libnm_systemd_shared_dep,
+    ],
+)
+
+###############################################################################
+
 deps = [
   dl_dep,
   libudev_dep,
@@ -147,6 +189,7 @@ deps = [
   shared_c_siphash_dep,
   shared_nm_glib_aux_dep,
   shared_nm_udev_aux_dep,
+  shared_nm_libnm_core_intern_dep,
 ]
 
 cflags = [
@@ -188,8 +231,6 @@ endif
 libnm_core_sources_all =  libnm_core_sources
 libnm_core_sources_all += libnm_core_enum
 libnm_core_sources_all += shared_nm_meta_setting_c
-libnm_core_sources_all += shared_nm_ethtool_utils_c
-libnm_core_sources_all += shared_nm_libnm_core_utils_c
 libnm_core_sources_all += [version_header]
 
 libnm_core = static_library(
@@ -204,12 +245,50 @@ nm_core_dep = declare_dependency(
   sources: libnm_core_enum[1],
   include_directories: libnm_core_inc,
   dependencies: [
+    shared_nm_libnm_core_intern_dep,
     shared_nm_glib_aux_dep,
     shared_c_siphash_dep,
     libnm_systemd_shared_dep,
   ],
 )
 
+###############################################################################
+
+shared_nm_libnm_core_aux = static_library(
+    'nm-libnm-core-aux',
+    sources: files('../shared/nm-libnm-core-aux/nm-dispatcher-api.h'),
+    c_args: [
+        '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+        '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
+    ],
+    include_directories: [
+        top_inc,
+        shared_inc,
+        libnm_core_inc,
+    ],
+    dependencies: [
+        glib_dep,
+        shared_c_siphash_dep,
+        shared_nm_glib_aux_dep,
+    ],
+)
+
+shared_nm_libnm_core_aux_dep = declare_dependency(
+    link_with: shared_nm_libnm_core_aux,
+    include_directories: [
+        top_inc,
+        shared_inc,
+    ],
+    dependencies: [
+        nm_core_dep,
+        glib_dep,
+        shared_nm_glib_aux_dep,
+        libnm_systemd_shared_dep,
+    ],
+)
+
+###############################################################################
+
 enums_to_docbook = join_paths(meson.source_root(), 'tools', 'enums-to-docbook.pl')
 
 docbooks = [
@@ -234,6 +313,8 @@ foreach docbook: docbooks
   content_files += xml.full_path()
 endforeach
 
+###############################################################################
+
 if enable_tests
   subdir('tests')
 endif
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 95ec86a059..966a4ada9c 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -88,7 +88,7 @@
 #include "nm-utils.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-vpn-editor-plugin.h"
-#include "nm-libnm-core-utils.h"
+#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
 
 /* IEEE 802.1D-1998 timer values */
 #define NM_BR_MIN_HELLO_TIME    1
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index aadf8890ae..6fb0099e85 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -33,7 +33,7 @@
 
 #include "nm-glib-aux/nm-secret-utils.h"
 #include "systemd/nm-sd-utils-shared.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-utils.h"
 
diff --git a/libnm-core/nm-setting-ethtool.c b/libnm-core/nm-setting-ethtool.c
index 7bdbcb1a22..827e3a6287 100644
--- a/libnm-core/nm-setting-ethtool.c
+++ b/libnm-core/nm-setting-ethtool.c
@@ -24,7 +24,7 @@
 #include "nm-setting-ethtool.h"
 
 #include "nm-setting-private.h"
-#include "nm-ethtool-utils.h"
+#include "nm-libnm-core-intern/nm-ethtool-utils.h"
 
 /*****************************************************************************/
 
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index f07504aa3e..8a220ad811 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include "nm-libnm-core-utils.h"
+#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
 #include "nm-utils.h"
 #include "nm-core-types-internal.h"
 #include "nm-setting-connection.h"
diff --git a/libnm-core/nm-setting-wifi-p2p.c b/libnm-core/nm-setting-wifi-p2p.c
index da97872037..490c2ef949 100644
--- a/libnm-core/nm-setting-wifi-p2p.c
+++ b/libnm-core/nm-setting-wifi-p2p.c
@@ -24,7 +24,7 @@
 #include <net/ethernet.h>
 
 #include "nm-utils.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index 7f0843046d..182e719302 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -27,7 +27,7 @@
 #include <net/ethernet.h>
 
 #include "nm-utils.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index b4cb105607..d8056c6c59 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -27,7 +27,7 @@
 #include <net/ethernet.h>
 
 #include "nm-utils.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 3dab93e0aa..3238c12345 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -40,7 +40,7 @@
 #include "nm-glib-aux/nm-enum-utils.h"
 #include "nm-glib-aux/nm-secret-utils.h"
 #include "systemd/nm-sd-utils-shared.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "nm-crypto.h"
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index f7f8fc6732..a6abf39160 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -64,7 +64,7 @@
 #include "nm-simple-connection.h"
 #include "nm-keyfile-internal.h"
 #include "nm-glib-aux/nm-dedup-multi.h"
-#include "nm-ethtool-utils.h"
+#include "nm-libnm-core-intern/nm-ethtool-utils.h"
 
 #include "test-general-enums.h"