diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-15 08:16:00 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-18 19:57:27 +0200 |
| commit | d984b2ce4a119428c2003120ea306198ba068df2 (patch) | |
| tree | 69fa5e8707d38371cb8553279b4d1cf3c0fb5f6a | |
| parent | 956215868cf4eb7809c9c823a9f2c2f0a7d20176 (diff) | |
shared: move most of "shared/nm-utils" to "shared/nm-glib-aux"
From the files under "shared/nm-utils" we build an internal library
that provides glib-based helper utilities.
Move the files of that basic library to a new subdirectory
"shared/nm-glib-aux" and rename the helper library "libnm-core-base.la"
to "libnm-glib-aux.la".
Reasons:
- the name "utils" is overused in our code-base. Everything's an
"utils". Give this thing a more distinct name.
- there were additional files under "shared/nm-utils", which are not
part of this internal library "libnm-utils-base.la". All the files
that are part of this library should be together in the same
directory, but files that are not, should not be there.
- the new name should better convey what this library is and what is isn't:
it's a set of utilities and helper functions that extend glib with
funcitonality that we commonly need.
There are still some files left under "shared/nm-utils". They have less
a unifying propose to be in their own directory, so I leave them there
for now. But at least they are separate from "shared/nm-glib-aux",
which has a very clear purpose.
(cherry picked from commit 80db06f768e47541eae7d66ef48fbe47bf1a69ce)
95 files changed, 166 insertions, 155 deletions
diff --git a/Makefile.am b/Makefile.am index 788c317dd5..893bb85273 100644 --- a/Makefile.am +++ b/Makefile.am @@ -318,7 +318,7 @@ shared_nm_std_aux_libnm_std_aux_la_LIBADD = \ ############################################################################### -shared_nm_utils_libnm_utils_cppflags = \ +shared_nm_glib_aux_cppflags = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ $(CODE_COVERAGE_CFLAGS) \ @@ -328,44 +328,45 @@ shared_nm_utils_libnm_utils_cppflags = \ -DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \ $(NULL) -noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-base.la +noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la -shared_nm_utils_libnm_utils_base_la_CPPFLAGS = \ - $(shared_nm_utils_libnm_utils_cppflags) \ +shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \ + $(shared_nm_glib_aux_cppflags) \ $(NULL) -shared_nm_utils_libnm_utils_base_la_SOURCES = \ - shared/nm-utils/nm-c-list.h \ - shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-dedup-multi.h \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-enum-utils.h \ - shared/nm-utils/nm-errno.c \ - shared/nm-utils/nm-errno.h \ - shared/nm-utils/nm-glib.h \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-hash-utils.h \ - shared/nm-utils/nm-io-utils.c \ - shared/nm-utils/nm-io-utils.h \ - shared/nm-utils/nm-logging-fwd.h \ - shared/nm-utils/nm-macros-internal.h \ - shared/nm-utils/nm-obj.h \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-random-utils.h \ - shared/nm-utils/nm-secret-utils.c \ - shared/nm-utils/nm-secret-utils.h \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-shared-utils.h \ - shared/nm-utils/nm-time-utils.c \ - shared/nm-utils/nm-time-utils.h \ +shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \ + shared/nm-glib-aux/nm-c-list.h \ + shared/nm-glib-aux/nm-dedup-multi.c \ + shared/nm-glib-aux/nm-dedup-multi.h \ + shared/nm-glib-aux/nm-enum-utils.c \ + shared/nm-glib-aux/nm-enum-utils.h \ + shared/nm-glib-aux/nm-errno.c \ + shared/nm-glib-aux/nm-errno.h \ + shared/nm-glib-aux/nm-glib.h \ + shared/nm-glib-aux/nm-hash-utils.c \ + shared/nm-glib-aux/nm-hash-utils.h \ + shared/nm-glib-aux/nm-io-utils.c \ + shared/nm-glib-aux/nm-io-utils.h \ + shared/nm-glib-aux/nm-jansson.h \ + shared/nm-glib-aux/nm-logging-fwd.h \ + shared/nm-glib-aux/nm-macros-internal.h \ + shared/nm-glib-aux/nm-obj.h \ + shared/nm-glib-aux/nm-random-utils.c \ + shared/nm-glib-aux/nm-random-utils.h \ + shared/nm-glib-aux/nm-secret-utils.c \ + shared/nm-glib-aux/nm-secret-utils.h \ + shared/nm-glib-aux/nm-shared-utils.c \ + shared/nm-glib-aux/nm-shared-utils.h \ + shared/nm-glib-aux/nm-time-utils.c \ + shared/nm-glib-aux/nm-time-utils.h \ $(NULL) -shared_nm_utils_libnm_utils_base_la_LDFLAGS = \ +shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_utils_libnm_utils_base_la_LIBADD = \ +shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \ shared/nm-std-aux/libnm-std-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -375,7 +376,7 @@ shared_nm_utils_libnm_utils_base_la_LIBADD = \ noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \ - $(shared_nm_utils_libnm_utils_cppflags) \ + $(shared_nm_glib_aux_cppflags) \ $(LIBUDEV_CFLAGS) \ $(NULL) @@ -414,7 +415,7 @@ shared_nm_utils_tests_test_shared_general_LDFLAGS = \ $(NULL) shared_nm_utils_tests_test_shared_general_LDADD = \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -998,7 +999,7 @@ libnm_core_tests_ldadd = \ libnm-core/libnm-core.la \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(libnm_crypto_lib) \ $(GLIB_LIBS) @@ -1210,7 +1211,7 @@ libnm_libnm_utils_la_LIBADD = \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ introspection/libnmdbus.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -1896,7 +1897,7 @@ src_libNetworkManagerBase_la_LIBADD = \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ shared/nm-udev-aux/libnm-udev-aux.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -2203,7 +2204,7 @@ src_initrd_nm_initrd_generator_LDADD = \ src/initrd/libnmi-core.la \ src/libNetworkManagerBase.la \ shared/systemd/libnm-systemd-shared.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -2226,7 +2227,7 @@ src_initrd_tests_test_ibft_reader_LDADD = \ libnm-core/libnm-core.la \ src/initrd/libnmi-core.la \ src/libNetworkManagerTest.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -2442,7 +2443,7 @@ src_initrd_tests_test_cmdline_reader_LDADD = \ libnm-core/libnm-core.la \ src/initrd/libnmi-core.la \ src/libNetworkManagerTest.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -3898,7 +3899,7 @@ dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ dispatcher_tests_test_dispatcher_envp_LDADD = \ dispatcher/libnm-dispatcher-core.la \ libnm/libnm.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -3981,7 +3982,7 @@ clients_common_libnmc_base_la_CPPFLAGS = \ clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -4573,7 +4574,7 @@ nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_ut $(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums) libnm_util_libnm_util_la_LIBADD = \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ $(UUID_LIBS) @@ -5317,7 +5318,6 @@ EXTRA_DIST += \ shared/nm-test-utils-impl.c \ shared/nm-utils/nm-compat.c \ shared/nm-utils/nm-compat.h \ - shared/nm-utils/nm-jansson.h \ shared/nm-utils/nm-test-utils.h \ shared/nm-utils/nm-vpn-editor-plugin-call.h \ shared/nm-utils/nm-vpn-plugin-macros.h \ diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index ffaf60714c..3efd142e1e 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -25,8 +25,8 @@ #include <arpa/inet.h> #include "nm-common-macros.h" -#include "nm-utils/nm-enum-utils.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-enum-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-libnm-core-utils.h" #include "nm-vpn-helpers.h" diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index a5083ba603..afb6c55f0f 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -20,7 +20,7 @@ #ifndef __NM_META_SETTING_DESC_H__ #define __NM_META_SETTING_DESC_H__ -#include "nm-utils/nm-obj.h" +#include "nm-glib-aux/nm-obj.h" #include "nm-meta-setting.h" #include "nm-ethtool-utils.h" diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index b863c49a1c..f3a398d7cb 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -38,7 +38,7 @@ #include "nm-vpn-service-plugin.h" #include "nm-vpn-helpers.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" /*****************************************************************************/ diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index 47a827409f..081d605616 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -30,8 +30,8 @@ #include "nm-client-utils.h" #include "nm-utils.h" -#include "nm-utils/nm-io-utils.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-io-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" /*****************************************************************************/ diff --git a/libnm-core/meson.build b/libnm-core/meson.build index cd48814fcd..730444fe60 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -145,7 +145,7 @@ deps = [ uuid_dep, glib_dep, shared_c_siphash_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, shared_nm_udev_aux_dep, ] @@ -204,7 +204,7 @@ nm_core_dep = declare_dependency( sources: libnm_core_enum[1], include_directories: libnm_core_inc, dependencies: [ - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, shared_c_siphash_dep, libnm_systemd_shared_dep, ], diff --git a/libnm-core/nm-crypto-gnutls.c b/libnm-core/nm-crypto-gnutls.c index 6c897e6dd3..6b2f758783 100644 --- a/libnm-core/nm-crypto-gnutls.c +++ b/libnm-core/nm-crypto-gnutls.c @@ -30,7 +30,7 @@ #include <gnutls/x509.h> #include <gnutls/pkcs12.h> -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-errors.h" /*****************************************************************************/ diff --git a/libnm-core/nm-crypto-nss.c b/libnm-core/nm-crypto-nss.c index 711dde4baf..25cc77778f 100644 --- a/libnm-core/nm-crypto-nss.c +++ b/libnm-core/nm-crypto-nss.c @@ -35,7 +35,7 @@ #include <ciferfam.h> #include <p12plcy.h> -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-errors.h" /*****************************************************************************/ diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c index 67f206c46d..c7142216dd 100644 --- a/libnm-core/nm-crypto.c +++ b/libnm-core/nm-crypto.c @@ -29,8 +29,8 @@ #include <unistd.h> #include <stdlib.h> -#include "nm-utils/nm-secret-utils.h" -#include "nm-utils/nm-io-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" +#include "nm-glib-aux/nm-io-utils.h" #include "nm-crypto-impl.h" #include "nm-utils.h" diff --git a/libnm-core/nm-json.h b/libnm-core/nm-json.h index 560b827ae0..b75a4f8e10 100644 --- a/libnm-core/nm-json.h +++ b/libnm-core/nm-json.h @@ -45,7 +45,7 @@ gboolean nm_jansson_load (void); #define json_integer_value (*_nm_jansson_json_integer_value) #define json_string_value (*_nm_jansson_json_string_value) -#include "nm-utils/nm-jansson.h" +#include "nm-glib-aux/nm-jansson.h" #endif #endif /* __NM_JSON_H__ */ diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c index a12fd3dcdf..aadf8890ae 100644 --- a/libnm-core/nm-keyfile.c +++ b/libnm-core/nm-keyfile.c @@ -31,7 +31,7 @@ #include <arpa/inet.h> #include <linux/pkt_sched.h> -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "systemd/nm-sd-utils-shared.h" #include "nm-common-macros.h" #include "nm-core-internal.h" diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 8a23fb3416..5114ff7419 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -24,7 +24,7 @@ #include "nm-setting-8021x.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" #include "nm-crypto.h" #include "nm-utils-private.h" diff --git a/libnm-core/nm-setting-macsec.c b/libnm-core/nm-setting-macsec.c index 040aa17df7..19d1989ea9 100644 --- a/libnm-core/nm-setting-macsec.c +++ b/libnm-core/nm-setting-macsec.c @@ -24,7 +24,7 @@ #include <stdlib.h> -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" #include "nm-core-types-internal.h" diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index fc4b538ad2..606b9d7f77 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -25,7 +25,7 @@ #include <stdlib.h> -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-wireguard.c b/libnm-core/nm-setting-wireguard.c index 8c5b25a5b6..861b2abd3a 100644 --- a/libnm-core/nm-setting-wireguard.c +++ b/libnm-core/nm-setting-wireguard.c @@ -24,7 +24,7 @@ #include "nm-setting-private.h" #include "nm-utils-private.h" #include "nm-connection-private.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" /*****************************************************************************/ diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 28bc24b1e1..3dab93e0aa 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -37,8 +37,8 @@ #include "nm-json.h" #endif -#include "nm-utils/nm-enum-utils.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-enum-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "systemd/nm-sd-utils-shared.h" #include "nm-common-macros.h" #include "nm-utils-private.h" diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 5cce70e05d..f7f8fc6732 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -24,7 +24,7 @@ #include "nm-default.h" #include "nm-std-aux/c-list-util.h" -#include "nm-utils/nm-enum-utils.h" +#include "nm-glib-aux/nm-enum-utils.h" #include "nm-utils.h" #include "nm-setting-private.h" @@ -63,7 +63,7 @@ #include "nm-setting-wpan.h" #include "nm-simple-connection.h" #include "nm-keyfile-internal.h" -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-ethtool-utils.h" #include "test-general-enums.h" diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index 6849d19215..5f08141ea0 100644 --- a/libnm-glib/meson.build +++ b/libnm-glib/meson.build @@ -5,7 +5,7 @@ dbus_binding_tool = find_program('dbus-binding-tool') common_deps = [ dbus_dep, dbus_glib_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, ] common_cflags = [ diff --git a/libnm-glib/tests/meson.build b/libnm-glib/tests/meson.build index 7d6007cb06..de74f3b2cb 100644 --- a/libnm-glib/tests/meson.build +++ b/libnm-glib/tests/meson.build @@ -3,7 +3,7 @@ deps = [ dbus_glib_dep, libnm_glib_dep, libnm_util_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, ] test_units = [ diff --git a/libnm-util/meson.build b/libnm-util/meson.build index 468064c141..e561cb81ee 100644 --- a/libnm-util/meson.build +++ b/libnm-util/meson.build @@ -93,7 +93,7 @@ sources = files( deps = [ dbus_dep, dbus_glib_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, uuid_dep, ] @@ -201,7 +201,7 @@ sources = files( ) deps = [ - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, ] libtest_crypto = static_library( diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build index 5e8b84fa26..09642f319f 100644 --- a/libnm-util/tests/meson.build +++ b/libnm-util/tests/meson.build @@ -2,7 +2,7 @@ deps = [ dbus_dep, dbus_glib_dep, libnm_util_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, ] cflags = common_cflags + [ diff --git a/libnm/meson.build b/libnm/meson.build index 558a587b4a..670a1acd5b 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -9,7 +9,7 @@ libnm_utils_sources = files('nm-libnm-utils.c') deps = [ libnmdbus_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, nm_core_dep, ] @@ -158,7 +158,7 @@ libnm = shared_library( dependencies: [ dl_dep, libudev_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, nm_core_dep, uuid_dep, libnm_systemd_shared_no_logging_dep, diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index a27283420a..abd02f1803 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -26,7 +26,7 @@ #include <signal.h> #include <stdlib.h> -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-enum-types.h" #include "nm-utils.h" #include "nm-connection.h" diff --git a/po/POTFILES.in b/po/POTFILES.in index 148fd546f9..1edddb7f3a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -168,7 +168,7 @@ libnm/nm-remote-settings.c libnm/nm-vpn-plugin-old.c libnm/nm-vpn-service-plugin.c data/org.freedesktop.NetworkManager.policy.in.in -shared/nm-utils/nm-shared-utils.c +shared/nm-glib-aux/nm-shared-utils.c src/NetworkManagerUtils.c src/main.c src/main-utils.c diff --git a/shared/meson.build b/shared/meson.build index 4dbd70dc3f..69d4166a53 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -1,5 +1,7 @@ shared_inc = include_directories('.') +############################################################################### + shared_c_siphash = static_library( 'c-siphash', sources: 'c-siphash/src/c-siphash.c', @@ -10,6 +12,8 @@ shared_c_siphash_dep = declare_dependency( link_with: shared_c_siphash, ) +############################################################################### + shared_c_rbtree = static_library( 'c-rbtree', c_args: '-std=c11', @@ -23,6 +27,7 @@ shared_c_rbtree_dep = declare_dependency( link_with: shared_c_rbtree, ) +############################################################################### if enable_ebpf shared_n_acd_bpf_files = files('n-acd/src/n-acd-bpf.c') @@ -62,6 +67,8 @@ shared_n_acd_dep = declare_dependency( link_with: shared_n_acd, ) +############################################################################### + version_conf = configuration_data() version_conf.set('NM_MAJOR_VERSION', nm_major_version) version_conf.set('NM_MINOR_VERSION', nm_minor_version) @@ -108,23 +115,25 @@ shared_nm_std_aux_dep = declare_dependency( ], ) -shared_nm_utils_c_args = [ +############################################################################### + +shared_nm_glib_aux_c_args = [ '-DG_LOG_DOMAIN="@0@"'.format(libnm_name), '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)', ] -shared_nm_utils_base = static_library( +shared_nm_glib_aux = static_library( 'nm-utils-base', - sources: files('nm-utils/nm-dedup-multi.c', - 'nm-utils/nm-enum-utils.c', - 'nm-utils/nm-errno.c', - 'nm-utils/nm-hash-utils.c', - 'nm-utils/nm-io-utils.c', - 'nm-utils/nm-random-utils.c', - 'nm-utils/nm-secret-utils.c', - 'nm-utils/nm-shared-utils.c', - 'nm-utils/nm-time-utils.c'), - c_args: shared_nm_utils_c_args, + sources: files('nm-glib-aux/nm-dedup-multi.c', + 'nm-glib-aux/nm-enum-utils.c', + 'nm-glib-aux/nm-errno.c', + 'nm-glib-aux/nm-hash-utils.c', + 'nm-glib-aux/nm-io-utils.c', + 'nm-glib-aux/nm-random-utils.c', + 'nm-glib-aux/nm-secret-utils.c', + 'nm-glib-aux/nm-shared-utils.c', + 'nm-glib-aux/nm-time-utils.c'), + c_args: shared_nm_glib_aux_c_args, include_directories: [ top_inc, shared_inc, @@ -135,8 +144,8 @@ shared_nm_utils_base = static_library( ], ) -shared_nm_utils_base_dep = declare_dependency( - link_with: shared_nm_utils_base, +shared_nm_glib_aux_dep = declare_dependency( + link_with: shared_nm_glib_aux, include_directories: [ top_inc, shared_inc, @@ -144,17 +153,19 @@ shared_nm_utils_base_dep = declare_dependency( dependencies: glib_dep, ) +############################################################################### + 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, + c_args: shared_nm_glib_aux_c_args, include_directories: [ top_inc, shared_inc, ], dependencies: [ glib_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, libudev_dep, ], ) @@ -167,7 +178,7 @@ shared_nm_udev_aux_dep = declare_dependency( ], dependencies: [ glib_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, libudev_dep, ], ) @@ -181,7 +192,7 @@ test_shared_general = executable( '-DNETWORKMANAGER_COMPILATION_TEST', '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)', ], - dependencies: shared_nm_utils_base_dep, + dependencies: shared_nm_glib_aux_dep, link_with: shared_c_siphash, ) test( @@ -232,7 +243,7 @@ libnm_systemd_shared = static_library( 'systemd/sd-adapt-shared', 'systemd/src/basic', ), - dependencies: shared_nm_utils_base_dep, + dependencies: shared_nm_glib_aux_dep, c_args: [ '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED', '-DG_LOG_DOMAIN="libnm"', @@ -245,7 +256,7 @@ libnm_systemd_shared_dep = declare_dependency( 'systemd/src/basic', ), dependencies: [ - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, ], link_with: [ libnm_systemd_shared, @@ -261,7 +272,7 @@ libnm_systemd_logging_stub = static_library( 'systemd/sd-adapt-shared', 'systemd/src/basic', ), - dependencies: shared_nm_utils_base_dep, + dependencies: shared_nm_glib_aux_dep, c_args: [ '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED', '-DG_LOG_DOMAIN="libnm"', diff --git a/shared/nm-default.h b/shared/nm-default.h index 26d6476a95..54e9916733 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -290,14 +290,14 @@ _nm_g_return_if_fail_warning (const char *log_domain, /*****************************************************************************/ -#include "nm-utils/nm-macros-internal.h" -#include "nm-utils/nm-shared-utils.h" -#include "nm-utils/nm-errno.h" +#include "nm-glib-aux/nm-macros-internal.h" +#include "nm-glib-aux/nm-shared-utils.h" +#include "nm-glib-aux/nm-errno.h" #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL /* no hash-utils in legacy code. */ #else -#include "nm-utils/nm-hash-utils.h" +#include "nm-glib-aux/nm-hash-utils.h" #endif /*****************************************************************************/ diff --git a/shared/nm-utils/nm-c-list.h b/shared/nm-glib-aux/nm-c-list.h index 5c73f57475..5c73f57475 100644 --- a/shared/nm-utils/nm-c-list.h +++ b/shared/nm-glib-aux/nm-c-list.h diff --git a/shared/nm-utils/nm-dedup-multi.c b/shared/nm-glib-aux/nm-dedup-multi.c index 5bdc3e3c03..5bdc3e3c03 100644 --- a/shared/nm-utils/nm-dedup-multi.c +++ b/shared/nm-glib-aux/nm-dedup-multi.c diff --git a/shared/nm-utils/nm-dedup-multi.h b/shared/nm-glib-aux/nm-dedup-multi.h index 82c6f1e955..82c6f1e955 100644 --- a/shared/nm-utils/nm-dedup-multi.h +++ b/shared/nm-glib-aux/nm-dedup-multi.h diff --git a/shared/nm-utils/nm-enum-utils.c b/shared/nm-glib-aux/nm-enum-utils.c index a4f6e809da..a4f6e809da 100644 --- a/shared/nm-utils/nm-enum-utils.c +++ b/shared/nm-glib-aux/nm-enum-utils.c diff --git a/shared/nm-utils/nm-enum-utils.h b/shared/nm-glib-aux/nm-enum-utils.h index 1827fdf4b3..1827fdf4b3 100644 --- a/shared/nm-utils/nm-enum-utils.h +++ b/shared/nm-glib-aux/nm-enum-utils.h diff --git a/shared/nm-utils/nm-errno.c b/shared/nm-glib-aux/nm-errno.c index 30eb9a8e78..30eb9a8e78 100644 --- a/shared/nm-utils/nm-errno.c +++ b/shared/nm-glib-aux/nm-errno.c diff --git a/shared/nm-utils/nm-errno.h b/shared/nm-glib-aux/nm-errno.h index d77735a7a6..d77735a7a6 100644 --- a/shared/nm-utils/nm-errno.h +++ b/shared/nm-glib-aux/nm-errno.h diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-glib-aux/nm-glib.h index e941e0673c..e941e0673c 100644 --- a/shared/nm-utils/nm-glib.h +++ b/shared/nm-glib-aux/nm-glib.h diff --git a/shared/nm-utils/nm-hash-utils.c b/shared/nm-glib-aux/nm-hash-utils.c index 6e728e6b20..6e728e6b20 100644 --- a/shared/nm-utils/nm-hash-utils.c +++ b/shared/nm-glib-aux/nm-hash-utils.c diff --git a/shared/nm-utils/nm-hash-utils.h b/shared/nm-glib-aux/nm-hash-utils.h index 3f622f99fb..3f622f99fb 100644 --- a/shared/nm-utils/nm-hash-utils.h +++ b/shared/nm-glib-aux/nm-hash-utils.h diff --git a/shared/nm-utils/nm-io-utils.c b/shared/nm-glib-aux/nm-io-utils.c index 513127480e..513127480e 100644 --- a/shared/nm-utils/nm-io-utils.c +++ b/shared/nm-glib-aux/nm-io-utils.c diff --git a/shared/nm-utils/nm-io-utils.h b/shared/nm-glib-aux/nm-io-utils.h index dc72a2a6c5..dc72a2a6c5 100644 --- a/shared/nm-utils/nm-io-utils.h +++ b/shared/nm-glib-aux/nm-io-utils.h diff --git a/shared/nm-utils/nm-jansson.h b/shared/nm-glib-aux/nm-jansson.h index 5a73231f05..5a73231f05 100644 --- a/shared/nm-utils/nm-jansson.h +++ b/shared/nm-glib-aux/nm-jansson.h diff --git a/shared/nm-utils/nm-logging-fwd.h b/shared/nm-glib-aux/nm-logging-fwd.h index 900dfff812..900dfff812 100644 --- a/shared/nm-utils/nm-logging-fwd.h +++ b/shared/nm-glib-aux/nm-logging-fwd.h diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h index 2e46cd2db3..2e46cd2db3 100644 --- a/shared/nm-utils/nm-macros-internal.h +++ b/shared/nm-glib-aux/nm-macros-internal.h diff --git a/shared/nm-utils/nm-obj.h b/shared/nm-glib-aux/nm-obj.h index 4edd1f3e6d..4edd1f3e6d 100644 --- a/shared/nm-utils/nm-obj.h +++ b/shared/nm-glib-aux/nm-obj.h diff --git a/shared/nm-utils/nm-random-utils.c b/shared/nm-glib-aux/nm-random-utils.c index d7c7da4221..d7c7da4221 100644 --- a/shared/nm-utils/nm-random-utils.c +++ b/shared/nm-glib-aux/nm-random-utils.c diff --git a/shared/nm-utils/nm-random-utils.h b/shared/nm-glib-aux/nm-random-utils.h index 15a118d340..15a118d340 100644 --- a/shared/nm-utils/nm-random-utils.h +++ b/shared/nm-glib-aux/nm-random-utils.h diff --git a/shared/nm-utils/nm-secret-utils.c b/shared/nm-glib-aux/nm-secret-utils.c index 81f8b5aeef..81f8b5aeef 100644 --- a/shared/nm-utils/nm-secret-utils.c +++ b/shared/nm-glib-aux/nm-secret-utils.c diff --git a/shared/nm-utils/nm-secret-utils.h b/shared/nm-glib-aux/nm-secret-utils.h index 034ef7bd33..034ef7bd33 100644 --- a/shared/nm-utils/nm-secret-utils.h +++ b/shared/nm-glib-aux/nm-secret-utils.h diff --git a/shared/nm-utils/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c index cf08a77fde..cf08a77fde 100644 --- a/shared/nm-utils/nm-shared-utils.c +++ b/shared/nm-glib-aux/nm-shared-utils.c diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index af3c2f830b..af3c2f830b 100644 --- a/shared/nm-utils/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h diff --git a/shared/nm-utils/nm-time-utils.c b/shared/nm-glib-aux/nm-time-utils.c index ae526c342e..ae526c342e 100644 --- a/shared/nm-utils/nm-time-utils.c +++ b/shared/nm-glib-aux/nm-time-utils.c diff --git a/shared/nm-utils/nm-time-utils.h b/shared/nm-glib-aux/nm-time-utils.h index 7e4f4f25f7..7e4f4f25f7 100644 --- a/shared/nm-utils/nm-time-utils.h +++ b/shared/nm-glib-aux/nm-time-utils.h diff --git a/shared/nm-utils/nm-vpn-editor-plugin-call.h b/shared/nm-utils/nm-vpn-editor-plugin-call.h index 78d041dff3..fd982acff8 100644 --- a/shared/nm-utils/nm-vpn-editor-plugin-call.h +++ b/shared/nm-utils/nm-vpn-editor-plugin-call.h @@ -32,7 +32,7 @@ #include <NetworkManager.h> /* we make use of other internal header files, you need those too. */ -#include "nm-macros-internal.h" +#include "nm-glib-aux/nm-macros-internal.h" /*****************************************************************************/ diff --git a/shared/nm-utils/tests/test-shared-general.c b/shared/nm-utils/tests/test-shared-general.c index 067e9f05d7..83cffd7f3d 100644 --- a/shared/nm-utils/tests/test-shared-general.c +++ b/shared/nm-utils/tests/test-shared-general.c @@ -22,8 +22,8 @@ #include "nm-default.h" #include "nm-std-aux/unaligned.h" -#include "nm-utils/nm-random-utils.h" -#include "nm-utils/nm-time-utils.h" +#include "nm-glib-aux/nm-random-utils.h" +#include "nm-glib-aux/nm-time-utils.h" #include "nm-utils/nm-test-utils.h" diff --git a/shared/systemd/nm-logging-stub.c b/shared/systemd/nm-logging-stub.c index 5be69b4bf3..5969922847 100644 --- a/shared/systemd/nm-logging-stub.c +++ b/shared/systemd/nm-logging-stub.c @@ -19,7 +19,7 @@ #include "nm-default.h" -#include "nm-utils/nm-logging-fwd.h" +#include "nm-glib-aux/nm-logging-fwd.h" /*****************************************************************************/ diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index b10722d71e..a285c3cdc5 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -23,7 +23,7 @@ #include <syslog.h> -#include "nm-utils/nm-logging-fwd.h" +#include "nm-glib-aux/nm-logging-fwd.h" /*****************************************************************************/ diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 0f63239129..43b0663dc3 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -25,7 +25,7 @@ #include <linux/fib_rules.h> -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-c-list.h" #include "nm-common-macros.h" #include "nm-utils.h" diff --git a/src/devices/nm-device-wireguard.c b/src/devices/nm-device-wireguard.c index a9eb1ab413..f8c7d1c35c 100644 --- a/src/devices/nm-device-wireguard.c +++ b/src/devices/nm-device-wireguard.c @@ -23,7 +23,7 @@ #include "nm-setting-wireguard.h" #include "nm-core-internal.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-device-private.h" #include "platform/nm-platform.h" #include "platform/nmp-object.h" diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 80976810f4..68cc951039 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -37,8 +37,8 @@ #include <linux/pkt_sched.h> #include "nm-std-aux/unaligned.h" -#include "nm-utils/nm-dedup-multi.h" -#include "nm-utils/nm-random-utils.h" +#include "nm-glib-aux/nm-dedup-multi.h" +#include "nm-glib-aux/nm-random-utils.h" #include "nm-ethtool-utils.h" #include "nm-common-macros.h" diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c index 1495471d8d..831054ba22 100644 --- a/src/devices/nm-lldp-listener.c +++ b/src/devices/nm-lldp-listener.c @@ -26,7 +26,7 @@ #include "nm-std-aux/unaligned.h" #include "platform/nm-platform.h" -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-c-list.h" #include "nm-utils.h" #include "systemd/nm-sd.h" diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c index 9d73c3ac71..5b50f84069 100644 --- a/src/devices/ovs/nm-ovsdb.c +++ b/src/devices/ovs/nm-ovsdb.c @@ -24,7 +24,7 @@ #include <gmodule.h> #include <gio/gunixsocketaddress.h> -#include "nm-utils/nm-jansson.h" +#include "nm-glib-aux/nm-jansson.h" #include "devices/nm-device.h" #include "platform/nm-platform.h" #include "nm-core-internal.h" diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 402be1ef55..9cab0d2412 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -30,7 +30,7 @@ #include <teamdctl.h> #include <stdlib.h> -#include "nm-utils/nm-jansson.h" +#include "nm-glib-aux/nm-jansson.h" #include "NetworkManagerUtils.h" #include "devices/nm-device-private.h" #include "platform/nm-platform.h" diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c index d668f0d889..494fca321f 100644 --- a/src/devices/wifi/nm-iwd-manager.c +++ b/src/devices/wifi/nm-iwd-manager.c @@ -29,7 +29,7 @@ #include "nm-manager.h" #include "nm-device-iwd.h" #include "nm-wifi-utils.h" -#include "nm-utils/nm-random-utils.h" +#include "nm-glib-aux/nm-random-utils.h" #include "settings/nm-settings.h" /*****************************************************************************/ diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index a4fccce0b0..d494eff08e 100644 --- a/src/dhcp/nm-dhcp-client.c +++ b/src/dhcp/nm-dhcp-client.c @@ -28,8 +28,8 @@ #include <stdlib.h> #include <linux/rtnetlink.h> -#include "nm-utils/nm-dedup-multi.h" -#include "nm-utils/nm-random-utils.h" +#include "nm-glib-aux/nm-dedup-multi.h" +#include "nm-glib-aux/nm-random-utils.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c index 9d1bdceb17..85ca3704d1 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/dhcp/nm-dhcp-dhclient-utils.c @@ -25,7 +25,7 @@ #include <arpa/inet.h> #include <net/if.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-dhcp-utils.h" #include "nm-ip4-config.h" diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c index af702cb44c..b655a1ebe3 100644 --- a/src/dhcp/nm-dhcp-dhclient.c +++ b/src/dhcp/nm-dhcp-dhclient.c @@ -36,7 +36,7 @@ #include <arpa/inet.h> #include <ctype.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-utils.h" #include "nm-config.h" diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c index 7063c82cfa..fe843a2ce4 100644 --- a/src/dhcp/nm-dhcp-manager.c +++ b/src/dhcp/nm-dhcp-manager.c @@ -32,7 +32,7 @@ #include <fcntl.h> #include <stdio.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-config.h" #include "NetworkManagerUtils.h" diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 884ef0b910..1cd5ba2782 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -26,7 +26,7 @@ #include <ctype.h> #include <net/if_arp.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-std-aux/unaligned.h" #include "nm-utils.h" diff --git a/src/dhcp/nm-dhcp-utils.c b/src/dhcp/nm-dhcp-utils.c index a8e0413da3..7aa867c027 100644 --- a/src/dhcp/nm-dhcp-utils.c +++ b/src/dhcp/nm-dhcp-utils.c @@ -22,7 +22,7 @@ #include <unistd.h> #include <arpa/inet.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-dhcp-utils.h" #include "nm-utils.h" diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c index 55d712b0a5..1eac36434c 100644 --- a/src/dhcp/tests/test-dhcp-dhclient.c +++ b/src/dhcp/tests/test-dhcp-dhclient.c @@ -24,7 +24,7 @@ #include <arpa/inet.h> #include <linux/rtnetlink.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "NetworkManagerUtils.h" #include "dhcp/nm-dhcp-dhclient-utils.h" diff --git a/src/dhcp/tests/test-dhcp-utils.c b/src/dhcp/tests/test-dhcp-utils.c index 240d868c7f..118082a5ff 100644 --- a/src/dhcp/tests/test-dhcp-utils.c +++ b/src/dhcp/tests/test-dhcp-utils.c @@ -23,7 +23,7 @@ #include <arpa/inet.h> #include <linux/rtnetlink.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-utils.h" #include "dhcp/nm-dhcp-utils.h" diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c index 573f047b47..68ffd80c42 100644 --- a/src/dns/nm-dns-systemd-resolved.c +++ b/src/dns/nm-dns-systemd-resolved.c @@ -31,7 +31,7 @@ #include <sys/stat.h> #include <linux/if.h> -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-c-list.h" #include "nm-core-internal.h" #include "platform/nm-platform.h" #include "nm-utils.h" diff --git a/src/initrd/nm-initrd-generator.c b/src/initrd/nm-initrd-generator.c index b84543c42e..4c1c4037b1 100644 --- a/src/initrd/nm-initrd-generator.c +++ b/src/initrd/nm-initrd-generator.c @@ -23,7 +23,7 @@ #include "nm-core-internal.h" #include "nm-keyfile-internal.h" #include "nm-initrd-generator.h" -#include "nm-utils/nm-io-utils.h" +#include "nm-glib-aux/nm-io-utils.h" /*****************************************************************************/ diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index 146f6883f4..a0ad84c106 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -22,7 +22,7 @@ #include "nm-auth-utils.h" -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-c-list.h" #include "nm-setting-connection.h" #include "nm-auth-subject.h" #include "nm-auth-manager.h" diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index a4f8f6912b..b0cc914e77 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -38,9 +38,9 @@ #include <net/ethernet.h> #include "nm-std-aux/unaligned.h" -#include "nm-utils/nm-random-utils.h" -#include "nm-utils/nm-io-utils.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-random-utils.h" +#include "nm-glib-aux/nm-io-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" #include "nm-core-internal.h" #include "nm-setting-connection.h" diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index 1b0d39ed69..1f9996ca80 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -27,7 +27,7 @@ #include "nm-connection.h" -#include "nm-utils/nm-time-utils.h" +#include "nm-glib-aux/nm-time-utils.h" /*****************************************************************************/ diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index 1c4be50d54..c1300eaf99 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -28,7 +28,7 @@ #include <sys/types.h> #include "c-list/src/c-list.h" -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-c-list.h" #include "nm-dbus-interface.h" #include "nm-core-internal.h" #include "nm-dbus-compat.h" diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index e53b446e3b..812ab83eb0 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -31,7 +31,7 @@ #include <signal.h> #include <linux/rtnetlink.h> -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-c-list.h" #include "main-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 4821ec6b17..15088c609f 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -27,7 +27,7 @@ #include <resolv.h> #include <linux/rtnetlink.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-utils.h" #include "platform/nmp-object.h" diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 6b4bfd64e6..6d89903f8e 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -25,7 +25,7 @@ #include "nm-setting-ip4-config.h" -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "platform/nmp-object.h" /*****************************************************************************/ diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 99a9ff8886..baef60bd08 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -27,7 +27,7 @@ #include <resolv.h> #include <linux/rtnetlink.h> -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-utils.h" #include "platform/nmp-object.h" diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index 557e379604..86786ea89f 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -25,7 +25,7 @@ #include "nm-setting-ip6-config.h" -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "platform/nmp-object.h" /*****************************************************************************/ diff --git a/src/nm-logging.c b/src/nm-logging.c index 511a4fdd66..48e51421b9 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -37,7 +37,7 @@ #include <systemd/sd-journal.h> #endif -#include "nm-utils/nm-time-utils.h" +#include "nm-glib-aux/nm-time-utils.h" #include "nm-errors.h" /*****************************************************************************/ diff --git a/src/nm-logging.h b/src/nm-logging.h index a824890a1c..a0f4ad73c9 100644 --- a/src/nm-logging.h +++ b/src/nm-logging.h @@ -26,7 +26,7 @@ #error nm-test-utils.h must be included as last header #endif -#include "nm-utils/nm-logging-fwd.h" +#include "nm-glib-aux/nm-logging-fwd.h" #define NM_LOG_CONFIG_BACKEND_DEBUG "debug" #define NM_LOG_CONFIG_BACKEND_SYSLOG "syslog" diff --git a/src/nm-manager.c b/src/nm-manager.c index 1c396939ca..61525e204e 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -27,7 +27,7 @@ #include <fcntl.h> #include <unistd.h> -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-c-list.h" #include "nm-common-macros.h" #include "nm-dbus-manager.h" diff --git a/src/nm-netns.c b/src/nm-netns.c index 4552fcc136..650578afc7 100644 --- a/src/nm-netns.c +++ b/src/nm-netns.c @@ -22,7 +22,7 @@ #include "nm-netns.h" -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "NetworkManagerUtils.h" #include "nm-core-internal.h" diff --git a/src/nm-test-utils-core.h b/src/nm-test-utils-core.h index dbfe71ada3..7f8b3327a0 100644 --- a/src/nm-test-utils-core.h +++ b/src/nm-test-utils-core.h @@ -310,7 +310,7 @@ nmtst_platform_ip6_routes_equal_aptr (const NMPObject *const*a, const NMPlatform #ifdef __NETWORKMANAGER_IP4_CONFIG_H__ -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" static inline NMIP4Config * nmtst_ip4_config_new (int ifindex) @@ -324,7 +324,7 @@ nmtst_ip4_config_new (int ifindex) #ifdef __NETWORKMANAGER_IP6_CONFIG_H__ -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" static inline NMIP6Config * nmtst_ip6_config_new (int ifindex) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 5f701fa0ed..d4b0115252 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -47,8 +47,8 @@ #include "nm-core-internal.h" #include "nm-setting-vlan.h" -#include "nm-utils/nm-secret-utils.h" -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-secret-utils.h" +#include "nm-glib-aux/nm-c-list.h" #include "nm-netlink.h" #include "nm-core-utils.h" #include "nmp-object.h" @@ -58,7 +58,7 @@ #include "wifi/nm-wifi-utils.h" #include "wifi/nm-wifi-utils-wext.h" #include "wpan/nm-wpan-utils.h" -#include "nm-utils/nm-io-utils.h" +#include "nm-glib-aux/nm-io-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 152d1c871e..504d643197 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -38,9 +38,9 @@ #include "nm-utils.h" #include "nm-core-internal.h" -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-udev-aux/nm-udev-utils.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-core-utils.h" #include "nm-platform-utils.h" diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index ae8fb6d4bb..0d20100cae 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -28,7 +28,7 @@ #include <libudev.h> #include "nm-utils.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-core-utils.h" #include "nm-platform-utils.h" diff --git a/src/platform/nmp-object.h b/src/platform/nmp-object.h index 8bbbcd9e6e..3ce9db36c3 100644 --- a/src/platform/nmp-object.h +++ b/src/platform/nmp-object.h @@ -23,8 +23,8 @@ #include <netinet/in.h> -#include "nm-utils/nm-obj.h" -#include "nm-utils/nm-dedup-multi.h" +#include "nm-glib-aux/nm-obj.h" +#include "nm-glib-aux/nm-dedup-multi.h" #include "nm-platform.h" struct udev_device; diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index eb41813b2f..a0650cc18e 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -25,7 +25,7 @@ #include <sys/types.h> #include <linux/if_tun.h> -#include "nm-utils/nm-io-utils.h" +#include "nm-glib-aux/nm-io-utils.h" #include "platform/nmp-object.h" #include "platform/nmp-netns.h" #include "platform/nm-platform-utils.h" diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 9298826dbf..504e2e7867 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -60,7 +60,7 @@ #include "nm-utils.h" #include "nm-core-internal.h" -#include "nm-utils/nm-c-list.h" +#include "nm-glib-aux/nm-c-list.h" #include "nm-dbus-object.h" #include "devices/nm-device-ethernet.h" #include "nm-settings-connection.h" diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index a86e61b9d7..9763eec51f 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -31,7 +31,7 @@ #include <sys/ioctl.h> #include <unistd.h> -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" #include "nm-connection.h" #include "nm-dbus-interface.h" #include "nm-setting-connection.h" diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index 2be986307e..7dd3cc40bd 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -30,8 +30,8 @@ #include <unistd.h> #include <stdio.h> -#include "nm-utils/nm-enum-utils.h" -#include "nm-utils/nm-io-utils.h" +#include "nm-glib-aux/nm-enum-utils.h" +#include "nm-glib-aux/nm-io-utils.h" #include "nm-manager.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c index 02aba1c57f..b399a17fa2 100644 --- a/src/settings/plugins/ifcfg-rh/shvar.c +++ b/src/settings/plugins/ifcfg-rh/shvar.c @@ -36,8 +36,8 @@ #include "nm-core-internal.h" #include "nm-core-utils.h" -#include "nm-utils/nm-enum-utils.h" -#include "nm-utils/nm-io-utils.h" +#include "nm-glib-aux/nm-enum-utils.h" +#include "nm-glib-aux/nm-io-utils.h" #include "c-list/src/c-list.h" /*****************************************************************************/ diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c index 8c75d8c799..2e06aeb9da 100644 --- a/src/settings/plugins/keyfile/nms-keyfile-writer.c +++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c @@ -32,7 +32,7 @@ #include "nms-keyfile-utils.h" #include "nms-keyfile-reader.h" -#include "nm-utils/nm-io-utils.h" +#include "nm-glib-aux/nm-io-utils.h" /*****************************************************************************/ |