build: move "shared/nm-platform" to "src/libnm-platform"

.gitignore

@@ -137,7 +137,6 @@ test-*.trs
 
 /shared/nm-glib-aux/tests/test-json-aux
 /shared/nm-glib-aux/tests/test-shared-general
-/shared/nm-platform/tests/test-nm-platform
 
 /introspection/org.freedesktop.NetworkManager*.[ch]
 
@@ -152,6 +151,7 @@ test-*.trs
 /src/libnm-core-impl/tests/test-need-secrets
 /src/libnm-core-impl/tests/test-secrets
 /src/libnm-core-impl/tests/test-setting
+/src/libnm-platform/tests/test-nm-platform
 
 /libnm/nm-property-infos-dbus.xml
 /libnm/nm-property-infos-ifcfg-rh.xml
@@ -361,6 +361,7 @@ test-*.trs
 /libnm/tests/test-general
 /policy/org.freedesktop.NetworkManager.policy
 /policy/org.freedesktop.NetworkManager.policy.in
+/shared/nm-platform/tests/test-nm-platform
 /shared/nm-utils/tests/test-shared-general
 /shared/nm-version-macros.h
 /src/devices/tests/test-arping

Makefile.am

@@ -118,8 +118,8 @@ shared/.dirstamp:                             config-extra.h
 shared/nm-base/.dirstamp:                     config-extra.h
 shared/nm-glib-aux/.dirstamp:                 config-extra.h
 shared/nm-glib-aux/tests/.dirstamp:           config-extra.h
-shared/nm-platform/.dirstamp:                 config-extra.h
-shared/nm-platform/tests/.dirstamp:           config-extra.h
+src/libnm-platform/.dirstamp:                 config-extra.h
+src/libnm-platform/tests/.dirstamp:           config-extra.h
 shared/nm-std-aux/.dirstamp:                  config-extra.h
 shared/nm-udev-aux/.dirstamp:                 config-extra.h
 src/libnm-systemd-shared/.dirstamp:                 config-extra.h
@@ -540,51 +540,57 @@ shared_nm_log_null_libnm_log_null_la_LIBADD = \
 
 ###############################################################################
 
-noinst_LTLIBRARIES += shared/nm-platform/libnm-platform.la
+noinst_LTLIBRARIES += src/libnm-platform/libnm-platform.la
 
-shared_nm_platform_libnm_platform_la_CPPFLAGS = \
+src_libnm_platform_libnm_platform_la_CPPFLAGS = \
 	$(shared_nm_glib_aux_cppflags) \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(NULL)
 
-shared_nm_platform_libnm_platform_la_SOURCES = \
-	shared/nm-platform/nm-netlink.c \
-	shared/nm-platform/nm-netlink.h \
-	shared/nm-platform/nm-platform-utils.c \
-	shared/nm-platform/nm-platform-utils.h \
-	shared/nm-platform/nmp-base.h \
-	shared/nm-platform/nmp-netns.c \
-	shared/nm-platform/nmp-netns.h \
+src_libnm_platform_libnm_platform_la_SOURCES = \
+	src/libnm-platform/nm-netlink.c \
+	src/libnm-platform/nm-netlink.h \
+	src/libnm-platform/nm-platform-utils.c \
+	src/libnm-platform/nm-platform-utils.h \
+	src/libnm-platform/nmp-base.h \
+	src/libnm-platform/nmp-netns.c \
+	src/libnm-platform/nmp-netns.h \
 	$(NULL)
 
-shared_nm_platform_libnm_platform_la_LDFLAGS = \
+src_libnm_platform_libnm_platform_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_platform_libnm_platform_la_LIBADD = \
+src_libnm_platform_libnm_platform_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
+EXTRA_DIST += src/libnm-platform/meson.build
+
 ###############################################################################
 
-check_programs += shared/nm-platform/tests/test-nm-platform
+check_programs += src/libnm-platform/tests/test-nm-platform
 
-shared_nm_platform_tests_test_nm_platform_CPPFLAGS = \
+src_libnm_platform_tests_test_nm_platform_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SYSTEMD_JOURNAL_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
-shared_nm_platform_tests_test_nm_platform_LDFLAGS = \
+src_libnm_platform_tests_test_nm_platform_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-shared_nm_platform_tests_test_nm_platform_LDADD = \
-	shared/nm-platform/libnm-platform.la \
+src_libnm_platform_tests_test_nm_platform_LDADD = \
+	src/libnm-platform/libnm-platform.la \
 	shared/nm-log-core/libnm-log-core.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
@@ -594,7 +600,7 @@ shared_nm_platform_tests_test_nm_platform_LDADD = \
 	$(NULL)
 
 EXTRA_DIST += \
-	shared/nm-platform/tests/meson.build \
+	src/libnm-platform/tests/meson.build \
 	$(NULL)
 
 ###############################################################################
@@ -2477,7 +2483,7 @@ src_core_libNetworkManager_la_LIBADD = \
 	src/libnm-core-impl/libnm-core-impl.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-platform/libnm-platform.la \
+	src/libnm-platform/libnm-platform.la \
 	shared/nm-base/libnm-base.la \
 	shared/nm-log-core/libnm-log-core.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
@@ -2590,7 +2596,7 @@ src_core_nm_iface_helper_LDADD = \
 	src/libnm-core-impl/libnm-core-impl.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-platform/libnm-platform.la \
+	src/libnm-platform/libnm-platform.la \
 	shared/nm-base/libnm-base.la \
 	shared/nm-log-core/libnm-log-core.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
@@ -2644,7 +2650,7 @@ src_core_initrd_nm_initrd_generator_LDADD = \
 	src/libnm-core-impl/libnm-core-impl.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-platform/libnm-platform.la \
+	src/libnm-platform/libnm-platform.la \
 	shared/nm-base/libnm-base.la \
 	shared/nm-log-core/libnm-log-core.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \

shared/meson.build

@@ -202,27 +202,6 @@ libnm_log_null = static_library(
   dependencies: glib_nm_default_dep,
 )
 
-libnm_platform = static_library(
-  'nm-platform',
-  sources: [
-    'nm-platform/nm-netlink.c',
-    'nm-platform/nm-platform-utils.c',
-    'nm-platform/nmp-netns.c',
-  ],
-  dependencies: [
-    glib_nm_default_dep,
-  ],
-)
-
-libnm_platform_dep = declare_dependency(
-  include_directories: shared_inc,
-  dependencies: [
-    libnm_glib_aux_dep_link,
-  ],
-  link_with: libnm_platform,
-)
-
 if enable_tests
   subdir('nm-glib-aux/tests')
-  subdir('nm-platform/tests')
 endif

src/core/devices/nm-device-ethernet.c

@@ -25,7 +25,7 @@
 #include "ppp/nm-ppp-manager-call.h"
 #include "ppp/nm-ppp-status.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "nm-dcb.h"
 #include "settings/nm-settings-connection.h"
 #include "nm-config.h"

src/core/devices/nm-device.c

@@ -36,7 +36,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "platform/nmp-object.h"
 #include "platform/nmp-rules-manager.h"
 #include "ndisc/nm-ndisc.h"

src/core/ndisc/nm-lndp-ndisc.c

@@ -18,7 +18,7 @@
 #include "nm-ndisc-private.h"
 #include "NetworkManagerUtils.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nmp-netns.h"
+#include "libnm-platform/nmp-netns.h"
 
 #define _NMLOG_PREFIX_NAME "ndisc-lndp"
 

src/core/ndisc/nm-ndisc.c

@@ -15,7 +15,7 @@
 #include "nm-ndisc-private.h"
 #include "nm-utils.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nmp-netns.h"
+#include "libnm-platform/nmp-netns.h"
 #include "nm-l3-config-data.h"
 
 #define _NMLOG_PREFIX_NAME "ndisc"

src/core/nm-iface-helper.c

@@ -21,7 +21,7 @@
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"
 #include "platform/nm-linux-platform.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "dhcp/nm-dhcp-manager.h"
 #include "ndisc/nm-ndisc.h"
 #include "ndisc/nm-lndp-ndisc.h"

src/core/nm-ip4-config.c

@@ -17,7 +17,7 @@
 #include "nm-utils.h"
 #include "platform/nmp-object.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "NetworkManagerUtils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-object.h"

src/core/nm-ip6-config.c

@@ -18,7 +18,7 @@
 #include "nm-utils.h"
 #include "platform/nmp-object.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 #include "nm-ip4-config.h"

src/core/nm-l3-config-data.c

@@ -11,7 +11,7 @@
 #include "nm-glib-aux/nm-enum-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "platform/nmp-object.h"
 #include "NetworkManagerUtils.h"
 

src/core/nm-netns.c

@@ -14,7 +14,7 @@
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-l3cfg.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nmp-netns.h"
+#include "libnm-platform/nmp-netns.h"
 #include "platform/nmp-rules-manager.h"
 
 /*****************************************************************************/

src/core/nm-netns.h

@@ -6,7 +6,7 @@
 #ifndef __NM_NETNS_H__
 #define __NM_NETNS_H__
 
-#include "nm-platform/nmp-base.h"
+#include "libnm-platform/nmp-base.h"
 
 #define NM_TYPE_NETNS            (nm_netns_get_type())
 #define NM_NETNS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_NETNS, NMNetns))

src/core/platform/nm-fake-platform.c

@@ -16,7 +16,7 @@
 #include "nm-utils.h"
 
 #include "nm-core-utils.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "nm-platform-private.h"
 #include "nmp-object.h"
 

src/core/platform/nm-linux-platform.c

@@ -40,11 +40,11 @@
 
 #include "nm-glib-aux/nm-secret-utils.h"
 #include "nm-glib-aux/nm-c-list.h"
-#include "nm-platform/nm-netlink.h"
+#include "libnm-platform/nm-netlink.h"
 #include "nm-core-utils.h"
 #include "nmp-object.h"
-#include "nm-platform/nmp-netns.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nmp-netns.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "nm-platform-private.h"
 #include "wifi/nm-wifi-utils.h"
 #include "wifi/nm-wifi-utils-wext.h"

src/core/platform/nm-platform.c

@@ -29,10 +29,10 @@
 #include "nm-glib-aux/nm-secret-utils.h"
 
 #include "nm-core-utils.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "nm-platform-private.h"
 #include "nmp-object.h"
-#include "nm-platform/nmp-netns.h"
+#include "libnm-platform/nmp-netns.h"
 
 /*****************************************************************************/
 

src/core/platform/nm-platform.h

@@ -9,7 +9,7 @@
 #include "nm-dbus-interface.h"
 #include "libnm-core-intern/nm-core-types-internal.h"
 
-#include "nm-platform/nmp-base.h"
+#include "libnm-platform/nmp-base.h"
 #include "nm-base/nm-base.h"
 
 #include "nm-core-utils.h"

src/core/platform/nmp-object.c

@@ -16,7 +16,7 @@
 #include "nm-glib-aux/nm-secret-utils.h"
 
 #include "nm-core-utils.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 
 #include "wifi/nm-wifi-utils.h"
 #include "wpan/nm-wpan-utils.h"

src/core/platform/tests/test-link.c

@@ -14,8 +14,8 @@
 #include "nm-glib-aux/nm-io-utils.h"
 #include "nm-base/nm-ethtool-base.h"
 #include "platform/nmp-object.h"
-#include "nm-platform/nmp-netns.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nmp-netns.h"
+#include "libnm-platform/nm-platform-utils.h"
 
 #include "test-common.h"
 #include "nm-test-utils-core.h"

src/core/platform/tests/test-platform-general.c

@@ -7,7 +7,7 @@
 
 #include <linux/rtnetlink.h>
 
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "platform/nm-linux-platform.h"
 
 #include "nm-test-utils-core.h"

src/core/platform/tests/test-route.c

@@ -9,7 +9,7 @@
 #include <linux/fib_rules.h>
 
 #include "nm-core-utils.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "platform/nmp-rules-manager.h"
 
 #include "test-common.h"

src/core/platform/tests/test-tc.c

@@ -6,8 +6,8 @@
 
 #include "nm-test-utils-core.h"
 #include "platform/nmp-object.h"
-#include "nm-platform/nmp-netns.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nmp-netns.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "test-common.h"
 
 static NMPObject *

src/core/platform/wifi/nm-wifi-utils-nl80211.c

@@ -15,10 +15,10 @@
 #include <linux/nl80211.h>
 #include <linux/if.h>
 
-#include "nm-platform/nm-netlink.h"
+#include "libnm-platform/nm-netlink.h"
 #include "nm-wifi-utils-private.h"
 #include "platform/nm-platform.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "nm-utils.h"
 
 #define _NMLOG_PREFIX_NAME "wifi-nl80211"

src/core/platform/wifi/nm-wifi-utils-nl80211.h

@@ -8,7 +8,7 @@
 #define __WIFI_UTILS_NL80211_H__
 
 #include "nm-wifi-utils.h"
-#include "nm-platform/nm-netlink.h"
+#include "libnm-platform/nm-netlink.h"
 
 #define NM_TYPE_WIFI_UTILS_NL80211 (nm_wifi_utils_nl80211_get_type())
 #define NM_WIFI_UTILS_NL80211(obj) \

src/core/platform/wifi/nm-wifi-utils-wext.c

@@ -23,7 +23,7 @@
 
 #include "nm-wifi-utils-private.h"
 #include "nm-utils.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-core-utils.h"
 

src/core/platform/wifi/nm-wifi-utils.c

@@ -19,7 +19,7 @@
 #endif
 #include "nm-core-utils.h"
 
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 
 G_DEFINE_ABSTRACT_TYPE(NMWifiUtils, nm_wifi_utils, G_TYPE_OBJECT)
 

src/core/platform/wifi/nm-wifi-utils.h

@@ -11,7 +11,7 @@
 
 #include "nm-dbus-interface.h"
 #include "nm-setting-wireless.h"
-#include "nm-platform/nm-netlink.h"
+#include "libnm-platform/nm-netlink.h"
 
 typedef struct NMWifiUtils NMWifiUtils;
 

src/core/platform/wpan/nm-wpan-utils.c

@@ -9,9 +9,9 @@
 
 #include <linux/if.h>
 
-#include "nm-platform/nm-netlink.h"
+#include "libnm-platform/nm-netlink.h"
 #include "platform/linux/nl802154.h"
-#include "nm-platform/nm-platform-utils.h"
+#include "libnm-platform/nm-platform-utils.h"
 
 #define _NMLOG_PREFIX_NAME "wpan-nl802154"
 #define _NMLOG(level, domain, ...)                                                                \

src/core/platform/wpan/nm-wpan-utils.h

@@ -9,7 +9,7 @@
 #include <net/ethernet.h>
 
 #include "nm-dbus-interface.h"
-#include "nm-platform/nm-netlink.h"
+#include "libnm-platform/nm-netlink.h"
 
 typedef struct NMWpanUtils NMWpanUtils;
 

src/libnm-platform/meson.build

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+libnm_platform = static_library(
+  'nm-platform',
+  include_directories: [
+    src_inc,
+  ],
+  sources: [
+    'nm-netlink.c',
+    'nm-platform-utils.c',
+    'nmp-netns.c',
+  ],
+  dependencies: [
+    glib_nm_default_dep,
+  ],
+)
+
+libnm_platform_dep = declare_dependency(
+  include_directories: [
+    src_inc,
+  ],
+  dependencies: [
+    libnm_glib_aux_dep_link,
+  ],
+  link_with: libnm_platform,
+)

src/libnm-platform/nm-platform-utils.h

@@ -7,7 +7,7 @@
 #define __NM_PLATFORM_UTILS_H__
 
 #include "nm-base/nm-base.h"
-#include "nm-platform/nmp-base.h"
+#include "libnm-platform/nmp-base.h"
 
 /*****************************************************************************/
 

src/libnm-platform/tests/test-nm-platform.c

@@ -3,8 +3,8 @@
 #include "nm-glib-aux/nm-default-glib-i18n-prog.h"
 
 #include "nm-log-core/nm-logging.h"
-#include "nm-platform/nm-netlink.h"
-#include "nm-platform/nmp-netns.h"
+#include "libnm-platform/nm-netlink.h"
+#include "libnm-platform/nmp-netns.h"
 
 #include "nm-utils/nm-test-utils.h"
 

src/meson.build

@@ -3,9 +3,14 @@
 src_inc = include_directories('.')
 
 subdir('libnm-systemd-shared')
+subdir('libnm-platform')
 subdir('libnm-core-public')
 subdir('libnm-core-intern')
 subdir('libnm-core-aux-intern')
 subdir('libnm-core-impl')
 subdir('libnm-core-aux-extern')
 subdir('core')
+
+if enable_tests
+  subdir('libnm-platform/tests')
+endif