build: move "shared/nm-{base,udev-aux}" to "src/libnm-{base,udev-aux}"

34 files changed, 107 insertions, 92 deletions

diff --git a/Makefile.am b/Makefile.am
index caa259ee78..f6a75cfd5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,13 +115,13 @@ $(src_libnm_core_public_mkenums_c):           config-extra.h
 src/libnm-core-impl/.dirstamp:                config-extra.h
 src/libnm-core-impl/.dirstamp:                config-extra.h
 shared/.dirstamp:                             config-extra.h
-shared/nm-base/.dirstamp:                     config-extra.h
+src/libnm-base/.dirstamp:                     config-extra.h
 shared/nm-glib-aux/.dirstamp:                 config-extra.h
 shared/nm-glib-aux/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-udev-aux/.dirstamp:                 config-extra.h
 src/libnm-systemd-shared/.dirstamp:                 config-extra.h
 src/libnm-systemd-shared/src/basic/.dirstamp:       config-extra.h
 src/libnm-systemd-shared/src/shared/.dirstamp:      config-extra.h
@@ -445,52 +445,58 @@ shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \
 
 ###############################################################################
 
-noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la
+noinst_LTLIBRARIES += src/libnm-udev-aux/libnm-udev-aux.la
 
-shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
+src_libnm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
 	$(shared_nm_glib_aux_cppflags) \
 	$(LIBUDEV_CFLAGS) \
 	$(NULL)
 
-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 \
+src_libnm_udev_aux_libnm_udev_aux_la_SOURCES = \
+	src/libnm-udev-aux/nm-udev-utils.c \
+	src/libnm-udev-aux/nm-udev-utils.h \
 	$(NULL)
 
-shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \
+src_libnm_udev_aux_libnm_udev_aux_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \
+src_libnm_udev_aux_libnm_udev_aux_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
+EXTRA_DIST += src/libnm-udev-aux/meson.build
+
 ###############################################################################
 
-noinst_LTLIBRARIES += shared/nm-base/libnm-base.la
+noinst_LTLIBRARIES += src/libnm-base/libnm-base.la
 
-shared_nm_base_libnm_base_la_CPPFLAGS = \
+src_libnm_base_libnm_base_la_CPPFLAGS = \
 	$(shared_nm_glib_aux_cppflags) \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(NULL)
 
-shared_nm_base_libnm_base_la_SOURCES = \
-	shared/nm-base/nm-base.h \
-	shared/nm-base/nm-ethtool-base.c \
-	shared/nm-base/nm-ethtool-base.h \
-	shared/nm-base/nm-ethtool-utils-base.h \
+src_libnm_base_libnm_base_la_SOURCES = \
+	src/libnm-base/nm-base.h \
+	src/libnm-base/nm-ethtool-base.c \
+	src/libnm-base/nm-ethtool-base.h \
+	src/libnm-base/nm-ethtool-utils-base.h \
 	$(NULL)
 
-shared_nm_base_libnm_base_la_LDFLAGS = \
+src_libnm_base_libnm_base_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_base_libnm_base_la_LIBADD = \
+src_libnm_base_libnm_base_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
+EXTRA_DIST += src/libnm-base/meson.build
+
 ###############################################################################
 
 noinst_LTLIBRARIES += shared/nm-log-core/libnm-log-core.la
@@ -1385,7 +1391,7 @@ src_libnm_core_impl_tests_ldadd = \
 	src/libnm-core-impl/libnm-core-impl.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/nm-log-null/libnm-log-null.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -1613,12 +1619,12 @@ libnm_libnm_static_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-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	introspection/libnmdbus.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/nm-log-null/libnm-log-null.la \
-	shared/nm-udev-aux/libnm-udev-aux.la \
+	src/libnm-udev-aux/libnm-udev-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -2484,9 +2490,9 @@ src_core_libNetworkManager_la_LIBADD = \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	shared/nm-log-core/libnm-log-core.la \
-	shared/nm-udev-aux/libnm-udev-aux.la \
+	src/libnm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	src/core/libnm-systemd-core.la \
@@ -2597,9 +2603,9 @@ src_core_nm_iface_helper_LDADD = \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	shared/nm-log-core/libnm-log-core.la \
-	shared/nm-udev-aux/libnm-udev-aux.la \
+	src/libnm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	src/core/libnm-systemd-core.la \
@@ -2651,9 +2657,9 @@ src_core_initrd_nm_initrd_generator_LDADD = \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	shared/nm-log-core/libnm-log-core.la \
-	shared/nm-udev-aux/libnm-udev-aux.la \
+	src/libnm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
@@ -4641,7 +4647,7 @@ clients_common_tests_test_clients_common_LDADD = \
 	clients/common/libnmc-base.la \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
@@ -4732,7 +4738,7 @@ clients_cli_nmcli_LDADD = \
 	clients/common/libnmc-base.la \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
@@ -4780,7 +4786,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	libnm/libnm.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
@@ -4969,7 +4975,7 @@ clients_tui_nmtui_LDADD = \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
@@ -5054,7 +5060,7 @@ clients_cloud_setup_nm_cloud_setup_LDADD = \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
@@ -5119,7 +5125,7 @@ clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-base/libnm-base.la \
+	src/libnm-base/libnm-base.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index 2f520b216a..0cfe68e757 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -8,7 +8,7 @@
 
 #include "nm-glib-aux/nm-obj.h"
 #include "nm-meta-setting-base.h"
-#include "nm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-base.h"
 
 struct _NMDevice;
 
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index b1ace53bed..9222b897a2 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -25,7 +25,7 @@
 #include "nm-dbus-helpers.h"
 #include "nm-device-tun.h"
 #include "nm-setting-connection.h"
-#include "nm-udev-aux/nm-udev-utils.h"
+#include "libnm-udev-aux/nm-udev-utils.h"
 
 /*****************************************************************************/
 
diff --git a/shared/meson.build b/shared/meson.build
index e07c66cca3..fb9d8d38cb 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -147,38 +147,6 @@ libnm_glib_aux_dep_link = declare_dependency(
   link_with: libnm_glib_aux,
 )
 
-libnm_udev_aux = static_library(
-  'nm-udev-aux',
-  sources: 'nm-udev-aux/nm-udev-utils.c',
-  dependencies: [
-    glib_nm_default_dep,
-    libudev_dep,
-  ],
-)
-
-libnm_udev_aux_dep = declare_dependency(
-  include_directories: shared_inc,
-  link_with: libnm_udev_aux,
-)
-
-libnm_base = static_library(
-  'nm-base',
-  sources: files(
-    'nm-base/nm-ethtool-base.c',
-  ),
-  dependencies: libnm_glib_aux_dep_link,
-)
-
-libnm_base_dep = declare_dependency(
-  include_directories: shared_inc,
-  dependencies: libnm_glib_aux_dep,
-)
-
-libnm_base_dep_link = declare_dependency(
-  dependencies: libnm_glib_aux_dep_link,
-  link_with: libnm_base,
-)
-
 libnm_log_core = static_library(
   'nm-log-core',
   sources: 'nm-log-core/nm-logging.c',
diff --git a/src/core/devices/adsl/nm-atm-manager.c b/src/core/devices/adsl/nm-atm-manager.c
index 9be9b5ce43..8aa23f5005 100644
--- a/src/core/devices/adsl/nm-atm-manager.c
+++ b/src/core/devices/adsl/nm-atm-manager.c
@@ -12,7 +12,7 @@
 #include "nm-device-adsl.h"
 #include "devices/nm-device-factory.h"
 #include "platform/nm-platform.h"
-#include "nm-udev-aux/nm-udev-utils.h"
+#include "libnm-udev-aux/nm-udev-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c
index d2d4c7238b..8139cf629c 100644
--- a/src/core/devices/nm-device-ethernet.c
+++ b/src/core/devices/nm-device-ethernet.c
@@ -34,7 +34,7 @@
 #include "nm-device-factory.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "NetworkManagerUtils.h"
-#include "nm-udev-aux/nm-udev-utils.h"
+#include "libnm-udev-aux/nm-udev-utils.h"
 #include "nm-device-veth.h"
 
 #define _NMLOG_DEVICE_TYPE NMDeviceEthernet
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index fac54d95c3..b1418e24ac 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -28,7 +28,7 @@
 #include "nm-glib-aux/nm-random-utils.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
-#include "nm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-base.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-device-private.h"
 #include "nm-l3cfg.h"
diff --git a/src/core/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c
index f032851e41..7f0b772629 100644
--- a/src/core/nm-rfkill-manager.c
+++ b/src/core/nm-rfkill-manager.c
@@ -9,7 +9,7 @@
 
 #include <libudev.h>
 
-#include "nm-udev-aux/nm-udev-utils.h"
+#include "libnm-udev-aux/nm-udev-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c
index 7d5793f6cb..ef5a54a16a 100644
--- a/src/core/platform/nm-linux-platform.c
+++ b/src/core/platform/nm-linux-platform.c
@@ -50,7 +50,7 @@
 #include "wifi/nm-wifi-utils-wext.h"
 #include "wpan/nm-wpan-utils.h"
 #include "nm-glib-aux/nm-io-utils.h"
-#include "nm-udev-aux/nm-udev-utils.h"
+#include "libnm-udev-aux/nm-udev-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/platform/nm-platform.c b/src/core/platform/nm-platform.c
index 9ffca3bf16..68c5db149e 100644
--- a/src/core/platform/nm-platform.c
+++ b/src/core/platform/nm-platform.c
@@ -25,7 +25,7 @@
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-glib-aux/nm-dedup-multi.h"
-#include "nm-udev-aux/nm-udev-utils.h"
+#include "libnm-udev-aux/nm-udev-utils.h"
 #include "nm-glib-aux/nm-secret-utils.h"
 
 #include "nm-core-utils.h"
diff --git a/src/core/platform/nm-platform.h b/src/core/platform/nm-platform.h
index a6af2329a7..b88969e89e 100644
--- a/src/core/platform/nm-platform.h
+++ b/src/core/platform/nm-platform.h
@@ -10,7 +10,7 @@
 #include "libnm-core-intern/nm-core-types-internal.h"
 
 #include "libnm-platform/nmp-base.h"
-#include "nm-base/nm-base.h"
+#include "libnm-base/nm-base.h"
 
 #include "nm-core-utils.h"
 #include "nm-setting-vlan.h"
diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c
index 236ec0631c..79437a09c6 100644
--- a/src/core/platform/tests/test-link.c
+++ b/src/core/platform/tests/test-link.c
@@ -12,7 +12,7 @@
 #include <linux/if_tun.h>
 
 #include "nm-glib-aux/nm-io-utils.h"
-#include "nm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-base.h"
 #include "platform/nmp-object.h"
 #include "libnm-platform/nmp-netns.h"
 #include "libnm-platform/nm-platform-utils.h"
diff --git a/src/core/platform/tests/test-nmp-object.c b/src/core/platform/tests/test-nmp-object.c
index 310611ee6c..6f8be00d10 100644
--- a/src/core/platform/tests/test-nmp-object.c
+++ b/src/core/platform/tests/test-nmp-object.c
@@ -9,7 +9,7 @@
 #include <linux/pkt_sched.h>
 
 #include "platform/nmp-object.h"
-#include "nm-udev-aux/nm-udev-utils.h"
+#include "libnm-udev-aux/nm-udev-utils.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 7524e87c57..f02f33d3f2 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -40,7 +40,7 @@
 #include "nm-setting-generic.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-utils.h"
-#include "nm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-base.h"
 
 #include "platform/nm-platform.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
index 36ec922514..f7a209359b 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
@@ -7,7 +7,7 @@
 #define _UTILS_H_
 
 #include "nm-connection.h"
-#include "nm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-base.h"
 
 #include "shvar.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index a86bf4781d..70147a9cd7 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -34,7 +34,7 @@
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "NetworkManagerUtils.h"
-#include "nm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-base.h"
 
 #include "nms-ifcfg-rh-common.h"
 #include "nms-ifcfg-rh-reader.h"
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index bad0052013..c6ad8874d0 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -37,8 +37,8 @@
 #include "nm-setting-vlan.h"
 #include "nm-setting-dcb.h"
 #include "libnm-core-intern/nm-core-internal.h"
-#include "nm-base/nm-ethtool-base.h"
-#include "nm-base/nm-ethtool-utils-base.h"
+#include "libnm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-utils-base.h"
 
 #include "NetworkManagerUtils.h"
 
diff --git a/src/libnm-base/meson.build b/src/libnm-base/meson.build
new file mode 100644
index 0000000000..ad4d3b014d
--- /dev/null
+++ b/src/libnm-base/meson.build
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+libnm_base = static_library(
+  'nm-base',
+  include_directories: [
+    shared_inc,
+    src_inc,
+    top_inc,
+  ],
+  sources: files(
+    'nm-ethtool-base.c',
+  ),
+  dependencies: libnm_glib_aux_dep_link,
+)
+
+libnm_base_dep = declare_dependency(
+  include_directories: shared_inc,
+  dependencies: libnm_glib_aux_dep,
+)
+
+libnm_base_dep_link = declare_dependency(
+  dependencies: libnm_glib_aux_dep_link,
+  link_with: libnm_base,
+)
diff --git a/shared/nm-base/nm-base.h b/src/libnm-base/nm-base.h
index 105d1783e7..105d1783e7 100644
--- a/shared/nm-base/nm-base.h
+++ b/src/libnm-base/nm-base.h
diff --git a/shared/nm-base/nm-ethtool-base.c b/src/libnm-base/nm-ethtool-base.c
index 52ff28714a..52ff28714a 100644
--- a/shared/nm-base/nm-ethtool-base.c
+++ b/src/libnm-base/nm-ethtool-base.c
diff --git a/shared/nm-base/nm-ethtool-base.h b/src/libnm-base/nm-ethtool-base.h
index be90ce756e..abedcafe40 100644
--- a/shared/nm-base/nm-ethtool-base.h
+++ b/src/libnm-base/nm-ethtool-base.h
@@ -6,7 +6,7 @@
 #ifndef __NM_ETHTOOL_BASE_H__
 #define __NM_ETHTOOL_BASE_H__
 
-#include "nm-base/nm-base.h"
+#include "libnm-base/nm-base.h"
 
 /*****************************************************************************/
 
diff --git a/shared/nm-base/nm-ethtool-utils-base.h b/src/libnm-base/nm-ethtool-utils-base.h
index d422724bab..d422724bab 100644
--- a/shared/nm-base/nm-ethtool-utils-base.h
+++ b/src/libnm-base/nm-ethtool-utils-base.h
diff --git a/src/libnm-core-impl/nm-setting-ethtool.c b/src/libnm-core-impl/nm-setting-ethtool.c
index db459697db..b32372e0bd 100644
--- a/src/libnm-core-impl/nm-setting-ethtool.c
+++ b/src/libnm-core-impl/nm-setting-ethtool.c
@@ -8,7 +8,7 @@
 #include "nm-setting-ethtool.h"
 
 #include "nm-setting-private.h"
-#include "nm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-base.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index b8a3def342..dc9945f8a3 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -17,7 +17,7 @@
 #include "nm-glib-aux/nm-enum-utils.h"
 #include "nm-glib-aux/nm-str-buf.h"
 #include "nm-glib-aux/nm-json-aux.h"
-#include "nm-base/nm-base.h"
+#include "libnm-base/nm-base.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "nm-utils.h"
@@ -59,8 +59,8 @@
 #include "nm-simple-connection.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
 #include "nm-glib-aux/nm-dedup-multi.h"
-#include "nm-base/nm-ethtool-base.h"
-#include "nm-base/nm-ethtool-utils-base.h"
+#include "libnm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-utils-base.h"
 
 #include "test-general-enums.h"
 
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c
index 1b08413f9c..6188a2d4d2 100644
--- a/src/libnm-core-impl/tests/test-setting.c
+++ b/src/libnm-core-impl/tests/test-setting.c
@@ -9,7 +9,7 @@
 #include <net/if.h>
 
 #include "nm-glib-aux/nm-json-aux.h"
-#include "nm-base/nm-ethtool-utils-base.h"
+#include "libnm-base/nm-ethtool-utils-base.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h
index 4687e710cb..aa196aacc3 100644
--- a/src/libnm-core-intern/nm-core-internal.h
+++ b/src/libnm-core-intern/nm-core-internal.h
@@ -20,7 +20,7 @@
     #error Cannot use this header.
 #endif
 
-#include "nm-base/nm-base.h"
+#include "libnm-base/nm-base.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 #include "nm-core-types-internal.h"
diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c
index c1c5b1a356..dbb4864f1d 100644
--- a/src/libnm-platform/nm-platform-utils.c
+++ b/src/libnm-platform/nm-platform-utils.c
@@ -18,7 +18,7 @@
 #include <fcntl.h>
 #include <libudev.h>
 
-#include "nm-base/nm-ethtool-base.h"
+#include "libnm-base/nm-ethtool-base.h"
 #include "nm-log-core/nm-logging.h"
 
 /*****************************************************************************/
diff --git a/src/libnm-platform/nm-platform-utils.h b/src/libnm-platform/nm-platform-utils.h
index 8ec9d0bfb9..8d9eaa38e0 100644
--- a/src/libnm-platform/nm-platform-utils.h
+++ b/src/libnm-platform/nm-platform-utils.h
@@ -6,7 +6,7 @@
 #ifndef __NM_PLATFORM_UTILS_H__
 #define __NM_PLATFORM_UTILS_H__
 
-#include "nm-base/nm-base.h"
+#include "libnm-base/nm-base.h"
 #include "libnm-platform/nmp-base.h"
 
 /*****************************************************************************/
diff --git a/src/libnm-platform/nmp-base.h b/src/libnm-platform/nmp-base.h
index 210c26d6bb..e5f134185c 100644
--- a/src/libnm-platform/nmp-base.h
+++ b/src/libnm-platform/nmp-base.h
@@ -3,7 +3,7 @@
 #ifndef __NMP_FWD_H__
 #define __NMP_FWD_H__
 
-#include "nm-base/nm-base.h"
+#include "libnm-base/nm-base.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-udev-aux/meson.build b/src/libnm-udev-aux/meson.build
new file mode 100644
index 0000000000..4577a83a93
--- /dev/null
+++ b/src/libnm-udev-aux/meson.build
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+libnm_udev_aux = static_library(
+  'nm-udev-aux',
+  sources: 'nm-udev-utils.c',
+  dependencies: [
+    glib_nm_default_dep,
+    libudev_dep,
+  ],
+)
+
+libnm_udev_aux_dep = declare_dependency(
+  include_directories: shared_inc,
+  link_with: libnm_udev_aux,
+)
diff --git a/shared/nm-udev-aux/nm-udev-utils.c b/src/libnm-udev-aux/nm-udev-utils.c
index 0b941dff53..0b941dff53 100644
--- a/shared/nm-udev-aux/nm-udev-utils.c
+++ b/src/libnm-udev-aux/nm-udev-utils.c
diff --git a/shared/nm-udev-aux/nm-udev-utils.h b/src/libnm-udev-aux/nm-udev-utils.h
index 191f9a89a4..191f9a89a4 100644
--- a/shared/nm-udev-aux/nm-udev-utils.h
+++ b/src/libnm-udev-aux/nm-udev-utils.h
diff --git a/src/meson.build b/src/meson.build
index 16ea0ba44c..32925d5b77 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,6 +3,8 @@
 src_inc = include_directories('.')
 
 subdir('libnm-systemd-shared')
+subdir('libnm-udev-aux')
+subdir('libnm-base')
 subdir('libnm-platform')
 subdir('libnm-core-public')
 subdir('libnm-core-intern')
diff --git a/tools/check-tree.sh b/tools/check-tree.sh
index cc6c80ef23..f08a8da613 100755
--- a/tools/check-tree.sh
+++ b/tools/check-tree.sh
@@ -19,6 +19,6 @@ check_cmp() {
     die "files \"$a\" and \"$b\" differ!"
 }
 
-check_cmp shared/nm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h
+check_cmp src/libnm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h
 check_cmp src/libnm-core-intern/nm-meta-setting-base-impl.h clients/common/nm-meta-setting-base-impl.h
 check_cmp src/libnm-core-impl/nm-meta-setting-base-impl.c clients/common/nm-meta-setting-base-impl.c