build: move "shared/nm-std-aux" to "src/libnm-std-aux"

Makefile.am

@@ -120,7 +120,7 @@ src/libnm-glib-aux/.dirstamp:                 config-extra.h
 src/libnm-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
+src/libnm-std-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
@@ -348,33 +348,37 @@ shared_libndhcp4_la_SOURCES = \
 
 ###############################################################################
 
-noinst_LTLIBRARIES += shared/nm-std-aux/libnm-std-aux.la
+noinst_LTLIBRARIES += src/libnm-std-aux/libnm-std-aux.la
 
-shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \
+src_libnm_std_aux_libnm_std_aux_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
-shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
+src_libnm_std_aux_libnm_std_aux_la_SOURCES = \
 	shared/c-list/src/c-list.h \
-	shared/nm-std-aux/c-list-util.c \
-	shared/nm-std-aux/c-list-util.h \
-	shared/nm-std-aux/nm-dbus-compat.h \
-	shared/nm-std-aux/nm-default-std.h \
-	shared/nm-std-aux/nm-networkmanager-compilation.h \
-	shared/nm-std-aux/nm-std-aux.h \
-	shared/nm-std-aux/nm-std-utils.c \
-	shared/nm-std-aux/nm-std-utils.h \
-	shared/nm-std-aux/unaligned.h \
+	src/libnm-std-aux/c-list-util.c \
+	src/libnm-std-aux/c-list-util.h \
+	src/libnm-std-aux/nm-dbus-compat.h \
+	src/libnm-std-aux/nm-default-std.h \
+	src/libnm-std-aux/nm-networkmanager-compilation.h \
+	src/libnm-std-aux/nm-std-aux.h \
+	src/libnm-std-aux/nm-std-utils.c \
+	src/libnm-std-aux/nm-std-utils.h \
+	src/libnm-std-aux/unaligned.h \
 	$(NULL)
 
-shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \
+src_libnm_std_aux_libnm_std_aux_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
+EXTRA_DIST += src/libnm-std-aux/meson.build
+
 ###############################################################################
 
 src_libnm_glib_aux_cppflags = \
@@ -611,7 +615,7 @@ src_libnm_platform_tests_test_nm_platform_LDADD = \
 	src/libnm-platform/libnm-platform.la \
 	src/libnm-log-core/libnm-log-core.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(GLIB_LIBS) \
@@ -768,7 +772,7 @@ src_libnm_glib_aux_tests_test_shared_general_LDFLAGS = \
 src_libnm_glib_aux_tests_test_shared_general_LDADD = \
 	src/libnm-glib-aux/libnm-glib-aux.la \
 	src/libnm-log-null/libnm-log-null.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
@@ -799,7 +803,7 @@ src_libnm_glib_aux_tests_test_json_aux_LDADD = \
 	$(JANSSON_LIBS) \
 	src/libnm-glib-aux/libnm-glib-aux.la \
 	src/libnm-log-null/libnm-log-null.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
@@ -1417,7 +1421,7 @@ src_libnm_core_impl_tests_ldadd = \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	src/libnm-log-null/libnm-log-null.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
@@ -1647,7 +1651,7 @@ libnm_libnm_static_la_LIBADD = \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	src/libnm-log-null/libnm-log-null.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(DL_LIBS) \
@@ -2518,7 +2522,7 @@ src_core_libNetworkManager_la_LIBADD = \
 	src/libnm-log-core/libnm-log-core.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	src/core/libnm-systemd-core.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/libnacd.la \
@@ -2631,7 +2635,7 @@ src_core_nm_iface_helper_LDADD = \
 	src/libnm-log-core/libnm-log-core.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	src/core/libnm-systemd-core.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/libnacd.la \
@@ -2685,10 +2689,10 @@ src_core_initrd_nm_initrd_generator_LDADD = \
 	src/libnm-log-core/libnm-log-core.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libndhcp4.la \
 	shared/libcsiphash.la \
 	$(SYSTEMD_JOURNAL_LIBS) \
@@ -2714,7 +2718,7 @@ src_core_initrd_tests_test_dt_reader_LDADD = \
 	src/core/initrd/libnmi-core.la \
 	src/core/libNetworkManagerTest.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
@@ -2734,7 +2738,7 @@ src_core_initrd_tests_test_ibft_reader_LDADD = \
 	src/core/initrd/libnmi-core.la \
 	src/core/libNetworkManagerTest.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
@@ -2969,7 +2973,7 @@ src_core_initrd_tests_test_cmdline_reader_LDADD = \
 	src/core/initrd/libnmi-core.la \
 	src/core/libNetworkManagerTest.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
@@ -4429,7 +4433,7 @@ dispatcher_nm_dispatcher_LDADD = \
 	dispatcher/libnm-dispatcher-core.la \
 	libnm/libnm.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS)
 
@@ -4504,7 +4508,7 @@ dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
 dispatcher_tests_test_dispatcher_envp_LDADD = \
 	dispatcher/libnm-dispatcher-core.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
 	$(GLIB_LIBS) \
@@ -4551,7 +4555,7 @@ clients_nm_online_LDADD = \
 	libnm/libnm.la \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
@@ -4682,7 +4686,7 @@ clients_common_tests_test_clients_common_LDADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
 	$(GLIB_LIBS)
@@ -4726,7 +4730,7 @@ clients_common_tests_test_libnm_core_aux_LDADD = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
 	$(GLIB_LIBS) \
@@ -4774,7 +4778,7 @@ clients_cli_nmcli_LDADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	libnm/libnm.la \
@@ -4823,7 +4827,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
 	src/libnm-base/libnm-base.la \
 	libnm/libnm.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
@@ -5012,7 +5016,7 @@ clients_tui_nmtui_LDADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
 	$(GLIB_LIBS) \
@@ -5098,7 +5102,7 @@ clients_cloud_setup_nm_cloud_setup_LDADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
 	$(GLIB_LIBS) \
@@ -5163,7 +5167,7 @@ clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
-	shared/nm-std-aux/libnm-std-aux.la \
+	src/libnm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
 	$(GLIB_LIBS) \

contrib/scripts/nm-code-format.sh

@@ -16,8 +16,8 @@ EXCLUDE=(
     ":(exclude)shared/c-stdaux"
     ":(exclude)shared/n-acd"
     ":(exclude)shared/n-dhcp4"
-    ":(exclude)shared/nm-std-aux/unaligned.h"
     ":(exclude)src/core/systemd/src"
+    ":(exclude)src/libnm-std-aux/unaligned.h"
     ":(exclude)src/libnm-systemd-shared/src"
 )
 

libnm/nm-client.c

@@ -10,7 +10,7 @@
 
 #include <libudev.h>
 
-#include "nm-std-aux/c-list-util.h"
+#include "libnm-std-aux/c-list-util.h"
 #include "libnm-glib-aux/nm-c-list.h"
 #include "libnm-glib-aux/nm-dbus-aux.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"

libnm/nm-dbus-helpers.h

@@ -10,7 +10,7 @@
     #error Cannot use this header.
 #endif
 
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 
 #define NM_DBUS_DEFAULT_TIMEOUT_MSEC 25000
 

shared/meson.build

@@ -97,12 +97,3 @@ libn_dhcp4_dep = declare_dependency(
 nm_test_utils_impl_source = files('nm-test-utils-impl.c')
 
 nm_vpn_plugin_utils_source = files('nm-utils/nm-vpn-plugin-utils.c')
-
-libnm_std_aux = static_library(
-  'nm-std-aux',
-  sources: [
-    'nm-std-aux/c-list-util.c',
-    'nm-std-aux/nm-std-utils.c',
-  ],
-  include_directories: top_inc,
-)

shared/nm-test-utils-impl.c

@@ -8,7 +8,7 @@
 #include <sys/wait.h>
 
 #include "NetworkManager.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 
 #include "nm-test-libnm-utils.h"
 

src/core/devices/bluetooth/nm-bluez-manager.c

@@ -25,7 +25,7 @@
 #include "nm-bluez5-dun.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "platform/nm-platform.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 
 /*****************************************************************************/
 

src/core/devices/nm-device.c

@@ -23,7 +23,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 #include "libnm-glib-aux/nm-dedup-multi.h"
 #include "libnm-glib-aux/nm-random-utils.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"

src/core/devices/nm-lldp-listener.c

@@ -9,7 +9,7 @@
 
 #include <net/ethernet.h>
 
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 #include "platform/nm-platform.h"
 #include "libnm-glib-aux/nm-c-list.h"
 #include "nm-utils.h"

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

@@ -23,7 +23,7 @@
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-manager.h"
 #include "nm-ip4-config.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 
 #define _NMLOG_DEVICE_TYPE NMDeviceTeam
 #include "devices/nm-device-logging.h"

src/core/devices/wifi/nm-device-iwd.c

@@ -22,7 +22,7 @@
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-wireless.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 #include "nm-utils.h"
 #include "nm-wifi-common.h"
 #include "nm-wifi-utils.h"

src/core/devices/wifi/nm-iwd-manager.c

@@ -15,7 +15,7 @@
 #include "nm-wifi-utils.h"
 #include "libnm-glib-aux/nm-random-utils.h"
 #include "settings/nm-settings.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 
 /*****************************************************************************/
 

src/core/devices/wwan/nm-modem-manager.c

@@ -17,7 +17,7 @@
     #define sd_booted() FALSE
 #endif
 
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 #include "nm-modem.h"
 #include "nm-modem-broadband.h"
 

src/core/dhcp/nm-dhcp-nettools.c

@@ -14,7 +14,7 @@
 #include <net/if_arp.h>
 
 #include "libnm-glib-aux/nm-dedup-multi.h"
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 #include "libnm-glib-aux/nm-str-buf.h"
 
 #include "nm-utils.h"

src/core/dhcp/nm-dhcp-systemd.c

@@ -14,7 +14,7 @@
 #include <net/if_arp.h>
 
 #include "libnm-glib-aux/nm-dedup-multi.h"
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 
 #include "nm-utils.h"
 #include "nm-dhcp-utils.h"

src/core/dhcp/nm-dhcp-utils.c

@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 #include "libnm-glib-aux/nm-dedup-multi.h"
 #include "libnm-glib-aux/nm-str-buf.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"

src/core/dns/nm-dns-systemd-resolved.c

@@ -28,7 +28,7 @@
 #include "nm-setting-connection.h"
 #include "devices/nm-device.h"
 #include "NetworkManagerUtils.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 
 #define SYSTEMD_RESOLVED_DBUS_SERVICE  "org.freedesktop.resolve1"
 #define SYSTEMD_RESOLVED_MANAGER_IFACE "org.freedesktop.resolve1.Manager"

src/core/nm-core-utils.c

@@ -22,7 +22,7 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 #include "libnm-glib-aux/nm-random-utils.h"
 #include "libnm-glib-aux/nm-io-utils.h"
 #include "libnm-glib-aux/nm-secret-utils.h"

src/core/nm-dbus-manager.c

@@ -16,7 +16,7 @@
 #include "libnm-glib-aux/nm-c-list.h"
 #include "nm-dbus-interface.h"
 #include "libnm-core-intern/nm-core-internal.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 #include "nm-dbus-object.h"
 #include "NetworkManagerUtils.h"
 #include "libnm-core-aux-intern/nm-auth-subject.h"

src/core/nm-manager.c

@@ -43,7 +43,7 @@
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-config.h"
 #include "nm-audit-manager.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 #include "nm-checkpoint.h"
 #include "nm-checkpoint-manager.h"
 #include "nm-dbus-object.h"

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

@@ -32,7 +32,7 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"

src/core/platform/nmp-rules-manager.c

@@ -7,7 +7,7 @@
 #include <linux/fib_rules.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-std-aux/c-list-util.h"
+#include "libnm-std-aux/c-list-util.h"
 #include "nmp-object.h"
 
 /*****************************************************************************/

src/core/settings/nm-settings.c

@@ -46,7 +46,7 @@
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 
-#include "nm-std-aux/c-list-util.h"
+#include "libnm-std-aux/c-list-util.h"
 #include "libnm-glib-aux/nm-c-list.h"
 #include "nm-dbus-object.h"
 #include "devices/nm-device-ethernet.h"

src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c

@@ -13,10 +13,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "nm-std-aux/c-list-util.h"
+#include "libnm-std-aux/c-list-util.h"
 #include "libnm-glib-aux/nm-c-list.h"
 #include "libnm-glib-aux/nm-io-utils.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-config.h"

src/core/settings/plugins/keyfile/nms-keyfile-plugin.c

@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include "nm-std-aux/c-list-util.h"
+#include "libnm-std-aux/c-list-util.h"
 #include "libnm-glib-aux/nm-c-list.h"
 #include "libnm-glib-aux/nm-io-utils.h"
 

src/core/supplicant/nm-supplicant-interface.c

@@ -16,7 +16,7 @@
 #include "libnm-glib-aux/nm-c-list.h"
 #include "libnm-glib-aux/nm-ref-string.h"
 #include "libnm-glib-aux/nm-dbus-aux.h"
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 #include "nm-supplicant-config.h"
 #include "nm-supplicant-manager.h"
 

src/libnm-core-impl/tests/test-general.c

@@ -13,7 +13,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
-#include "nm-std-aux/c-list-util.h"
+#include "libnm-std-aux/c-list-util.h"
 #include "libnm-glib-aux/nm-enum-utils.h"
 #include "libnm-glib-aux/nm-str-buf.h"
 #include "libnm-glib-aux/nm-json-aux.h"

src/libnm-glib-aux/nm-dbus-aux.h

@@ -6,7 +6,7 @@
 #ifndef __NM_DBUS_AUX_H__
 #define __NM_DBUS_AUX_H__
 
-#include "nm-std-aux/nm-dbus-compat.h"
+#include "libnm-std-aux/nm-dbus-compat.h"
 
 /*****************************************************************************/
 

src/libnm-glib-aux/nm-dedup-multi.h

@@ -7,7 +7,7 @@
 #define __NM_DEDUP_MULTI_H__
 
 #include "nm-obj.h"
-#include "nm-std-aux/c-list-util.h"
+#include "libnm-std-aux/c-list-util.h"
 
 /*****************************************************************************/
 

src/libnm-glib-aux/nm-default-glib.h

@@ -8,7 +8,7 @@
 
 /*****************************************************************************/
 
-#include "nm-std-aux/nm-default-std.h"
+#include "libnm-std-aux/nm-default-std.h"
 
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_WITH_GLIB
@@ -63,8 +63,8 @@
 
 #include "nm-gassert-patch.h"
 
-#include "nm-std-aux/nm-std-aux.h"
-#include "nm-std-aux/nm-std-utils.h"
+#include "libnm-std-aux/nm-std-aux.h"
+#include "libnm-std-aux/nm-std-utils.h"
 #include "libnm-glib-aux/nm-macros-internal.h"
 #include "libnm-glib-aux/nm-shared-utils.h"
 #include "libnm-glib-aux/nm-errno.h"

src/libnm-glib-aux/tests/test-shared-general.c

@@ -5,7 +5,7 @@
 
 #include "libnm-glib-aux/nm-default-glib-i18n-prog.h"
 
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 #include "libnm-glib-aux/nm-random-utils.h"
 #include "libnm-glib-aux/nm-str-buf.h"
 #include "libnm-glib-aux/nm-time-utils.h"

src/libnm-platform/nm-netlink.h

@@ -10,7 +10,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/genetlink.h>
 
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"
 
 /*****************************************************************************/
 

src/libnm-std-aux/meson.build

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+libnm_std_aux = static_library(
+  'nm-std-aux',
+  sources: [
+    'c-list-util.c',
+    'nm-std-utils.c',
+  ],
+  include_directories: [
+    shared_inc,
+    src_inc,
+    top_inc,
+  ],
+)

src/libnm-systemd-shared/sd-adapt-shared/unaligned.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#include "nm-std-aux/unaligned.h"
+#include "libnm-std-aux/unaligned.h"

src/meson.build

@@ -2,6 +2,7 @@
 
 src_inc = include_directories('.')
 
+subdir('libnm-std-aux')
 subdir('libnm-glib-aux')
 subdir('libnm-log-null')
 subdir('libnm-log-core')