shared: move udev helper to separate directory "shared/nm-udev-aux"

We built (among others) two libraries from the sources in "shared/nm-utils":
"libnm-utils-base.la" and "libnm-utils-udev.la".

It's confusing. Instead use directories so there is a direct
correspondence between these internal libraries and the source files.

(cherry picked from commit 2973d682533a83c4d0738e2baef6991f8f0cba87)

14 files changed, 25 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index 38f5e63da2..788c317dd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -372,24 +372,24 @@ shared_nm_utils_libnm_utils_base_la_LIBADD = \
 
 ###############################################################################
 
-noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-udev.la
+noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la
 
-shared_nm_utils_libnm_utils_udev_la_CPPFLAGS = \
+shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
 	$(shared_nm_utils_libnm_utils_cppflags) \
 	$(LIBUDEV_CFLAGS) \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_udev_la_SOURCES = \
-	shared/nm-utils/nm-udev-utils.c \
-	shared/nm-utils/nm-udev-utils.h \
+shared_nm_udev_aux_libnm_udev_aux_la_SOURCES = \
+	shared/nm-udev-aux/nm-udev-utils.c \
+	shared/nm-udev-aux/nm-udev-utils.h \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_udev_la_LDFLAGS = \
+shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_udev_la_LIBADD = \
+shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
@@ -1255,7 +1255,7 @@ libnm_libnm_la_LIBADD = \
 	libnm/libnm-utils.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
-	shared/nm-utils/libnm-utils-udev.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
 	$(DL_LIBS) \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
@@ -1895,7 +1895,7 @@ endif
 src_libNetworkManagerBase_la_LIBADD = \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
-	shared/nm-utils/libnm-utils-udev.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-utils/libnm-utils-base.la \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
@@ -4895,7 +4895,7 @@ libnm_glib_libnm_glib_la_LDFLAGS = \
 libnm_glib_libnm_glib_la_LIBADD = \
 	libnm-util/libnm-util.la \
 	libnm-glib/libdeprecated-nm-glib.la \
-	shared/nm-utils/libnm-utils-udev.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(LIBUDEV_LIBS) \
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index beee290e78..cd48814fcd 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -146,7 +146,7 @@ deps = [
   glib_dep,
   shared_c_siphash_dep,
   shared_nm_utils_base_dep,
-  shared_nm_utils_udev_dep,
+  shared_nm_udev_aux_dep,
 ]
 
 cflags = [
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index 3882d59a97..6849d19215 100644
--- a/libnm-glib/meson.build
+++ b/libnm-glib/meson.build
@@ -196,7 +196,7 @@ libnm_glib = shared_library(
   dependencies: common_deps + [
     libnm_util_dep,
     libudev_dep,
-    shared_nm_utils_udev_dep,
+    shared_nm_udev_aux_dep,
   ],
   c_args: cflags,
   link_whole: libdeprecated_nm_glib,
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 6179b7578c..e9b3b30f96 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -26,7 +26,7 @@
 
 #include "NetworkManager.h"
 
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"
 #include "nm-device-wifi.h"
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 2af578183b..aba4e5c494 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -40,7 +40,7 @@
 #include "nm-dbus-helpers.h"
 #include "nm-device-tun.h"
 #include "nm-setting-connection.h"
-#include "shared/nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 
 #include "introspection/org.freedesktop.NetworkManager.Device.h"
 
diff --git a/shared/meson.build b/shared/meson.build
index 014ae3957f..4dbd70dc3f 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -144,9 +144,9 @@ shared_nm_utils_base_dep = declare_dependency(
     dependencies: glib_dep,
 )
 
-shared_nm_utils_udev = static_library(
-    'nm-utils-udev',
-    sources: files('nm-utils/nm-udev-utils.c'),
+shared_nm_udev_aux = static_library(
+    'nm-udev-aux',
+    sources: files('nm-udev-aux/nm-udev-utils.c'),
     c_args: shared_nm_utils_c_args,
     include_directories: [
         top_inc,
@@ -159,8 +159,8 @@ shared_nm_utils_udev = static_library(
     ],
 )
 
-shared_nm_utils_udev_dep = declare_dependency(
-    link_with: shared_nm_utils_udev,
+shared_nm_udev_aux_dep = declare_dependency(
+    link_with: shared_nm_udev_aux,
     include_directories: [
         top_inc,
         shared_inc,
diff --git a/shared/nm-utils/nm-udev-utils.c b/shared/nm-udev-aux/nm-udev-utils.c
index 5d0919b302..5d0919b302 100644
--- a/shared/nm-utils/nm-udev-utils.c
+++ b/shared/nm-udev-aux/nm-udev-utils.c
diff --git a/shared/nm-utils/nm-udev-utils.h b/shared/nm-udev-aux/nm-udev-utils.h
index 911e8a2702..911e8a2702 100644
--- a/shared/nm-utils/nm-udev-utils.h
+++ b/shared/nm-udev-aux/nm-udev-utils.h
diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c
index dddb834249..f312b5a360 100644
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/devices/adsl/nm-atm-manager.c
@@ -27,7 +27,7 @@
 #include "nm-device-adsl.h"
 #include "devices/nm-device-factory.h"
 #include "platform/nm-platform.h"
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 24c99f76f4..170c7e2852 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -48,7 +48,7 @@
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceEthernet);
diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c
index 534ad36939..cf2e7fe977 100644
--- a/src/nm-rfkill-manager.c
+++ b/src/nm-rfkill-manager.c
@@ -24,7 +24,7 @@
 
 #include <libudev.h>
 
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 5fcfece1ea..5f701fa0ed 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -59,7 +59,7 @@
 #include "wifi/nm-wifi-utils-wext.h"
 #include "wpan/nm-wpan-utils.h"
 #include "nm-utils/nm-io-utils.h"
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 88508c97f7..152d1c871e 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -39,7 +39,7 @@
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 #include "nm-utils/nm-dedup-multi.h"
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 #include "nm-utils/nm-secret-utils.h"
 
 #include "nm-core-utils.h"
diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c
index 280ed5208f..e2019e96f9 100644
--- a/src/platform/tests/test-nmp-object.c
+++ b/src/platform/tests/test-nmp-object.c
@@ -24,7 +24,7 @@
 #include <linux/pkt_sched.h>
 
 #include "platform/nmp-object.h"
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 
 #include "nm-test-utils-core.h"