platform: move "platform/{wifi,wpan}/" to "src/libnm-platform/"

14 files changed, 31 insertions, 32 deletions

diff --git a/Makefile.am b/Makefile.am
index 6b0f0db4f8..291f1c20ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -581,8 +581,22 @@ src_libnm_platform_libnm_platform_la_SOURCES = \
 	src/libnm-platform/nmp-base.h \
 	src/libnm-platform/nmp-netns.c \
 	src/libnm-platform/nmp-netns.h \
+	src/libnm-platform/wifi/nm-wifi-utils-nl80211.c \
+	src/libnm-platform/wifi/nm-wifi-utils-nl80211.h \
+	src/libnm-platform/wifi/nm-wifi-utils-private.h \
+	src/libnm-platform/wifi/nm-wifi-utils.c \
+	src/libnm-platform/wifi/nm-wifi-utils.h \
+	src/libnm-platform/wpan/nm-wpan-utils.c \
+	src/libnm-platform/wpan/nm-wpan-utils.h \
 	$(NULL)
 
+if WITH_WEXT
+src_libnm_platform_libnm_platform_la_SOURCES += \
+	src/libnm-platform/wifi/nm-wifi-utils-wext.c \
+	src/libnm-platform/wifi/nm-wifi-utils-wext.h \
+	$(NULL)
+endif
+
 src_libnm_platform_libnm_platform_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
@@ -2321,13 +2335,6 @@ src_core_libNetworkManagerBase_la_SOURCES = \
 	src/core/platform/nm-linux-platform.h \
 	src/core/platform/nmp-rules-manager.c \
 	src/core/platform/nmp-rules-manager.h \
-	src/core/platform/wifi/nm-wifi-utils-nl80211.c \
-	src/core/platform/wifi/nm-wifi-utils-nl80211.h \
-	src/core/platform/wifi/nm-wifi-utils-private.h \
-	src/core/platform/wifi/nm-wifi-utils.c \
-	src/core/platform/wifi/nm-wifi-utils.h \
-	src/core/platform/wpan/nm-wpan-utils.c \
-	src/core/platform/wpan/nm-wpan-utils.h \
 	\
 	src/core/ndisc/nm-lndp-ndisc.c \
 	src/core/ndisc/nm-lndp-ndisc.h \
@@ -2371,12 +2378,6 @@ src_core_libNetworkManagerBase_la_SOURCES = \
 	\
 	$(NULL)
 
-if WITH_WEXT
-src_core_libNetworkManagerBase_la_SOURCES += \
-	src/core/platform/wifi/nm-wifi-utils-wext.c \
-	src/core/platform/wifi/nm-wifi-utils-wext.h
-endif
-
 src_core_libNetworkManagerBase_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
diff --git a/src/core/meson.build b/src/core/meson.build
index ea23e17f55..ac9f165d0f 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -34,11 +34,6 @@ subdir('systemd')
 
 core_plugins = []
 
-platform_wifi_wext_source = files()
-if enable_wext
-  platform_wifi_wext_source += files('platform/wifi/nm-wifi-utils-wext.c')
-endif
-
 libNetworkManagerBase = static_library(
   'NetworkManagerBase',
   sources: files(
@@ -50,9 +45,6 @@ libNetworkManagerBase = static_library(
     'dhcp/nm-dhcp-options.c',
     'ndisc/nm-lndp-ndisc.c',
     'ndisc/nm-ndisc.c',
-    'platform/wifi/nm-wifi-utils-nl80211.c',
-    'platform/wifi/nm-wifi-utils.c',
-    'platform/wpan/nm-wpan-utils.c',
     'platform/nm-linux-platform.c',
     'platform/nm-platform.c',
     'platform/nmp-object.c',
@@ -69,7 +61,7 @@ libNetworkManagerBase = static_library(
     'nm-ip-config.c',
     'nm-ip4-config.c',
     'nm-ip6-config.c',
-  ) + platform_wifi_wext_source,
+  ),
   dependencies: [
     core_default_dep,
     libnm_core_public_dep,
diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c
index f7726d536b..75f34b2d20 100644
--- a/src/core/platform/nm-linux-platform.c
+++ b/src/core/platform/nm-linux-platform.c
@@ -46,9 +46,9 @@
 #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"
-#include "wpan/nm-wpan-utils.h"
+#include "libnm-platform/wifi/nm-wifi-utils.h"
+#include "libnm-platform/wifi/nm-wifi-utils-wext.h"
+#include "libnm-platform/wpan/nm-wpan-utils.h"
 #include "libnm-glib-aux/nm-io-utils.h"
 #include "libnm-udev-aux/nm-udev-utils.h"
 
diff --git a/src/core/platform/nmp-object.c b/src/core/platform/nmp-object.c
index 49a8f5987b..7b9ba4b6ec 100644
--- a/src/core/platform/nmp-object.c
+++ b/src/core/platform/nmp-object.c
@@ -18,8 +18,8 @@
 #include "nm-core-utils.h"
 #include "libnm-platform/nm-platform-utils.h"
 
-#include "wifi/nm-wifi-utils.h"
-#include "wpan/nm-wpan-utils.h"
+#include "libnm-platform/wifi/nm-wifi-utils.h"
+#include "libnm-platform/wpan/nm-wpan-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-platform/meson.build b/src/libnm-platform/meson.build
index c2a8b2e7cf..c91c5292f3 100644
--- a/src/libnm-platform/meson.build
+++ b/src/libnm-platform/meson.build
@@ -6,7 +6,10 @@ libnm_platform = static_library(
     'nm-netlink.c',
     'nm-platform-utils.c',
     'nmp-netns.c',
-  ],
+    'wifi/nm-wifi-utils-nl80211.c',
+    'wifi/nm-wifi-utils.c',
+    'wpan/nm-wpan-utils.c',
+  ] + (enable_wext ? [ 'wifi/nm-wifi-utils-wext.c' ] : []),
   include_directories: [
     src_inc,
     top_inc,
diff --git a/src/core/platform/wifi/nm-wifi-utils-nl80211.c b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c
index b7286f6143..148657ea27 100644
--- a/src/core/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2011 Intel Corporation. All rights reserved.
  */
 
-#include "src/core/nm-default-daemon.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-wifi-utils-nl80211.h"
 
@@ -15,6 +15,7 @@
 #include <linux/nl80211.h>
 #include <linux/if.h>
 
+#include "libnm-log-core/nm-logging.h"
 #include "libnm-platform/nm-netlink.h"
 #include "nm-wifi-utils-private.h"
 #include "libnm-platform/nm-platform-utils.h"
diff --git a/src/core/platform/wifi/nm-wifi-utils-nl80211.h b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.h
index 4a63330739..4a63330739 100644
--- a/src/core/platform/wifi/nm-wifi-utils-nl80211.h
+++ b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.h
diff --git a/src/core/platform/wifi/nm-wifi-utils-private.h b/src/libnm-platform/wifi/nm-wifi-utils-private.h
index bc1e75ec56..bc1e75ec56 100644
--- a/src/core/platform/wifi/nm-wifi-utils-private.h
+++ b/src/libnm-platform/wifi/nm-wifi-utils-private.h
diff --git a/src/core/platform/wifi/nm-wifi-utils-wext.c b/src/libnm-platform/wifi/nm-wifi-utils-wext.c
index e361aa4089..9da7924320 100644
--- a/src/core/platform/wifi/nm-wifi-utils-wext.c
+++ b/src/libnm-platform/wifi/nm-wifi-utils-wext.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "src/core/nm-default-daemon.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-wifi-utils-wext.h"
 
@@ -21,6 +21,7 @@
 #include <sys/socket.h>
 #include <linux/wireless.h>
 
+#include "libnm-log-core/nm-logging.h"
 #include "nm-wifi-utils-private.h"
 #include "libnm-platform/nm-platform-utils.h"
 
diff --git a/src/core/platform/wifi/nm-wifi-utils-wext.h b/src/libnm-platform/wifi/nm-wifi-utils-wext.h
index d6f3453c2e..d6f3453c2e 100644
--- a/src/core/platform/wifi/nm-wifi-utils-wext.h
+++ b/src/libnm-platform/wifi/nm-wifi-utils-wext.h
diff --git a/src/core/platform/wifi/nm-wifi-utils.c b/src/libnm-platform/wifi/nm-wifi-utils.c
index 09d726632a..3c952b6fcd 100644
--- a/src/core/platform/wifi/nm-wifi-utils.c
+++ b/src/libnm-platform/wifi/nm-wifi-utils.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "src/core/nm-default-daemon.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-wifi-utils.h"
 
diff --git a/src/core/platform/wifi/nm-wifi-utils.h b/src/libnm-platform/wifi/nm-wifi-utils.h
index 157522ee26..157522ee26 100644
--- a/src/core/platform/wifi/nm-wifi-utils.h
+++ b/src/libnm-platform/wifi/nm-wifi-utils.h
diff --git a/src/core/platform/wpan/nm-wpan-utils.c b/src/libnm-platform/wpan/nm-wpan-utils.c
index 19c8a5e01f..5c2917b4dc 100644
--- a/src/core/platform/wpan/nm-wpan-utils.c
+++ b/src/libnm-platform/wpan/nm-wpan-utils.c
@@ -3,12 +3,13 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "src/core/nm-default-daemon.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-wpan-utils.h"
 
 #include <linux/if.h>
 
+#include "libnm-log-core/nm-logging.h"
 #include "libnm-platform/nm-netlink.h"
 #include "linux-headers/nl802154.h"
 #include "libnm-platform/nm-platform-utils.h"
diff --git a/src/core/platform/wpan/nm-wpan-utils.h b/src/libnm-platform/wpan/nm-wpan-utils.h
index 6130c41e56..6130c41e56 100644
--- a/src/core/platform/wpan/nm-wpan-utils.h
+++ b/src/libnm-platform/wpan/nm-wpan-utils.h