build: move "libnm-core/" to "src/" and split it

"libnm-core/" is rather complicated. It provides a static library that
is linked into libnm.so and NetworkManager. It also contains public
headers (like "nm-setting.h") which are part of public libnm API.

Then we have helper libraries ("libnm-core/nm-libnm-core-*/") which
only rely on public API of libnm-core, but are themself static
libraries that can be used by anybody who uses libnm-core. And
"libnm-core/nm-libnm-core-intern" is used by libnm-core itself.

Move "libnm-core/" to "src/". But also split it in different
directories so that they have a clearer purpose.

The goal is to have a flat directory hierarchy. The "src/libnm-core*/"
directories correspond to the different modules (static libraries and set
of headers that we have). We have different kinds of such modules because
of how we combine various code together. The directory layout now reflects
this.

23 files changed, 45 insertions, 32 deletions

diff --git a/libnm/meson.build b/libnm/meson.build
index d0846419c5..8462d4bc50 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -3,9 +3,16 @@
 libnm_inc = include_directories('.')
 
 libnm_nm_default_dep = declare_dependency(
-  sources: libnm_core_enum_sources[1],
-  include_directories: libnm_inc,
-  dependencies: libnm_core_nm_default_dep,
+  include_directories: [
+    libnm_inc,
+    libnm_core_public_inc,
+    top_inc,
+    shared_inc,
+    src_inc,
+  ],
+  dependencies: [
+    libnm_core_public_dep,
+  ],
 )
 
 libnm_headers = files(
@@ -135,7 +142,7 @@ libnm_static = static_library(
   sources: libnm_sources + libnm_enum_sources,
   dependencies: [
     libnmdbus_dep,
-    libnm_libnm_core_intern_dep,
+    libnm_core_aux_intern_dep,
     libnm_nm_default_dep,
     libnm_udev_aux_dep,
     libudev_dep,
@@ -154,10 +161,11 @@ libnm = shared_library(
   dependencies: libnm_nm_default_dep,
   link_whole: [
     libnm_static,
-    libnm_core,
+    libnm_core_impl,
     libnmdbus,
     libnm_systemd_logging_stub,
     libnm_glib_aux,
+    libnm_base,
   ],
   link_args: '-Wl,--version-script,@0@'.format(linker_script),
   link_depends: linker_script,
@@ -194,8 +202,11 @@ if enable_introspection
 
   libnm_gir = gnome.generate_gir(
     libnm,
-    sources: libnm_core_sources + libnm_core_headers + libnm_core_enum_sources + libnm_sources + libnm_headers + libnm_enum_sources + [nm_version_macro_header],
+    sources: libnm_core_settings_sources + libnm_core_impl_sources + libnm_core_public_enum_sources + libnm_core_headers + libnm_sources + libnm_headers + libnm_enum_sources + [nm_version_macro_header],
     includes: 'Gio-2.0',
+    include_directories: [
+      libnm_core_public_inc,
+    ],
     nsversion: nm_gir_version,
     namespace: 'NM',
     identifier_prefix: nm_id_prefix,
@@ -300,8 +311,7 @@ libnm_libnm_aux = static_library(
     '-DG_LOG_DOMAIN="libnmc"',
   ],
   dependencies: [
-    libnm_core_nm_default_dep,
-    libnm_libnm_core_intern_dep,
+    libnm_core_aux_intern_dep,
     libnm_dep,
   ],
 )
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 80fb25115b..60c68f3478 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -10,7 +10,7 @@
 
 #include "nm-dbus-interface.h"
 #include "nm-object-private.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-device.h"
 #include "nm-connection.h"
 #include "nm-vpn-connection.h"
diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c
index 5fd55bc1d7..951e66229f 100644
--- a/libnm/nm-checkpoint.c
+++ b/libnm/nm-checkpoint.c
@@ -7,7 +7,7 @@
 
 #include "nm-checkpoint.h"
 
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-interface.h"
 #include "nm-device.h"
 #include "nm-object-private.h"
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index f1b259700f..a2d953cee0 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -13,12 +13,12 @@
 #include "nm-std-aux/c-list-util.h"
 #include "nm-glib-aux/nm-c-list.h"
 #include "nm-glib-aux/nm-dbus-aux.h"
-#include "nm-libnm-core-intern/nm-common-macros.h"
+#include "libnm-core-aux-intern/nm-common-macros.h"
 
 #include "nm-access-point.h"
 #include "nm-active-connection.h"
 #include "nm-checkpoint.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-helpers.h"
 #include "nm-device-6lowpan.h"
 #include "nm-device-adsl.h"
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 1214964161..caf9cdcaef 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -11,7 +11,7 @@
 #include "nm-utils.h"
 #include "nm-device-bond.h"
 #include "nm-object-private.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************/
 
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 732c5a2ceb..2a7226e92b 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -11,7 +11,7 @@
 #include "nm-utils.h"
 #include "nm-device-bridge.h"
 #include "nm-object-private.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************/
 
diff --git a/libnm/nm-device-ip-tunnel.c b/libnm/nm-device-ip-tunnel.c
index a6d2ef4a4c..c370f79e20 100644
--- a/libnm/nm-device-ip-tunnel.c
+++ b/libnm/nm-device-ip-tunnel.c
@@ -11,7 +11,7 @@
 #include "nm-setting-ip-tunnel.h"
 #include "nm-utils.h"
 #include "nm-object-private.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************/
 
diff --git a/libnm/nm-device-ovs-bridge.c b/libnm/nm-device-ovs-bridge.c
index 9c17554899..c95355161e 100644
--- a/libnm/nm-device-ovs-bridge.c
+++ b/libnm/nm-device-ovs-bridge.c
@@ -11,7 +11,7 @@
 #include "nm-setting-ovs-bridge.h"
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-connection.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************/
 
diff --git a/libnm/nm-device-ovs-port.c b/libnm/nm-device-ovs-port.c
index 1b3faa53f1..b52fdf9b21 100644
--- a/libnm/nm-device-ovs-port.c
+++ b/libnm/nm-device-ovs-port.c
@@ -11,7 +11,7 @@
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-connection.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************/
 
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index d76dd5c1c1..4af9f8e60a 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -11,7 +11,7 @@
 #include "nm-setting-team.h"
 #include "nm-utils.h"
 #include "nm-object-private.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************/
 
diff --git a/libnm/nm-device-wifi-p2p.c b/libnm/nm-device-wifi-p2p.c
index 019bf1cf6a..d946977383 100644
--- a/libnm/nm-device-wifi-p2p.c
+++ b/libnm/nm-device-wifi-p2p.c
@@ -13,7 +13,7 @@
 #include "nm-utils.h"
 #include "nm-wifi-p2p-peer.h"
 #include "nm-object-private.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-helpers.h"
 
 /*****************************************************************************/
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 90e4a302f2..76a6e824ab 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -17,7 +17,7 @@
 #include "nm-utils.h"
 #include "nm-access-point.h"
 #include "nm-object-private.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-helpers.h"
 
 /*****************************************************************************/
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 9cb88dae8e..b1ace53bed 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -20,7 +20,7 @@
 #include "nm-ip6-config.h"
 #include "nm-object-private.h"
 #include "nm-remote-connection.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-utils.h"
 #include "nm-dbus-helpers.h"
 #include "nm-device-tun.h"
diff --git a/libnm/nm-dns-manager.c b/libnm/nm-dns-manager.c
index 6261c71ac6..9c5f0cf0f7 100644
--- a/libnm/nm-dns-manager.c
+++ b/libnm/nm-dns-manager.c
@@ -12,7 +12,7 @@
 #include "nm-client.h"
 #include "nm-object-private.h"
 #include "nm-dbus-helpers.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************
  * NMDnsEntry
diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c
index 1663c62257..4c336213c9 100644
--- a/libnm/nm-ip-config.c
+++ b/libnm/nm-ip-config.c
@@ -14,7 +14,7 @@
 #include "nm-dbus-interface.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************/
 
diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c
index 1000e04d1a..02abd560c6 100644
--- a/libnm/nm-libnm-utils.c
+++ b/libnm/nm-libnm-utils.c
@@ -9,7 +9,7 @@
 #include "nm-libnm-utils.h"
 
 #include "nm-glib-aux/nm-time-utils.h"
-#include "nm-libnm-core-intern/nm-common-macros.h"
+#include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-object.h"
 
 /*****************************************************************************/
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 00e520d7e5..eaf178e7db 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -16,7 +16,7 @@
 #include "nm-object-private.h"
 #include "nm-dbus-helpers.h"
 #include "nm-client.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "c-list/src/c-list.h"
 
 /*****************************************************************************/
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index b5b12bf020..8ad1e51c72 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -12,7 +12,7 @@
 #include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-setting-connection.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"
 #include "nm-dbus-helpers.h"
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 8f826ed86b..771706610d 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -8,7 +8,7 @@
 #include "nm-secret-agent-old.h"
 
 #include "c-list/src/c-list.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-helpers.h"
 #include "nm-dbus-interface.h"
 #include "nm-enum-types.h"
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index f45d0c09e9..2ff83efa3c 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -15,7 +15,7 @@
 #include "nm-utils.h"
 #include "nm-connection.h"
 #include "nm-dbus-helpers.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-simple-connection.h"
 #include "nm-vpn-service-plugin.h"
 
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 34de21b875..f89ea4ce7f 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -17,7 +17,7 @@
 #include "nm-utils.h"
 #include "nm-connection.h"
 #include "nm-dbus-helpers.h"
-#include "nm-core-internal.h"
+#include "libnm-core-intern/nm-core-internal.h"
 #include "nm-simple-connection.h"
 
 #include "introspection/org.freedesktop.NetworkManager.VPN.Plugin.h"
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index 08eecfbdee..efc86a71b3 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -16,13 +16,16 @@ foreach test_unit: test_units
       libnm_enum_sources[1],
     ],
     dependencies: [
-      libnm_core_dep,
+      libnm_core_impl_dep_link,
       libnm_nm_default_dep,
     ],
     c_args: [
       '-DG_LOG_DOMAIN="test"',
     ],
-    link_with: libnm_static,
+    link_with: [
+      libnm_static,
+      libnm_base,
+    ],
   )
 
   test(
diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c
index a90acd9b10..f97cd62c20 100644
--- a/libnm/tests/test-libnm.c
+++ b/libnm/tests/test-libnm.c
@@ -22,7 +22,7 @@
 #include "nm-libnm-utils.h"
 #include "nm-object.h"
 #include "nm-vpn-service-plugin.h"
-#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "nm-utils/nm-test-utils.h"