diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-18 19:13:26 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-18 20:15:16 +0200 |
| commit | 0e2abc02a19a494062a2a6245b63fd77b57bfcbc (patch) | |
| tree | 896e3d9b0bf488e6495b2831b9fc619bc0b4f08b | |
| parent | e63f835deee13f87e0dc22e5c4efa5a1ee5444c9 (diff) | |
| parent | e7836cd15165da701eeb09e764befbeee767466c (diff) | |
shared: merge branch 'th/shared-library-refactoring'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/113
(cherry picked from commit 9740bd6d99e50b91b498163a2984fa6325a25386)
164 files changed, 528 insertions, 324 deletions
diff --git a/Makefile.am b/Makefile.am index bfdec612b0..d78bfdeda8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -289,7 +289,37 @@ shared_libnacd_la_LIBADD = \ ############################################################################### -shared_nm_utils_libnm_utils_cppflags = \ +noinst_LTLIBRARIES += shared/nm-std-aux/libnm-std-aux.la + +shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION='0' \ + $(NULL) + +shared_nm_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/unaligned.h \ + $(NULL) + +shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_std_aux_libnm_std_aux_la_LIBADD = \ + shared/libcsiphash.la \ + $(NULL) + +############################################################################### + +shared_nm_glib_aux_cppflags = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ $(CODE_COVERAGE_CFLAGS) \ @@ -299,78 +329,143 @@ 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/c-list/src/c-list.h \ - shared/nm-utils/c-list-util.c \ - shared/nm-utils/c-list-util.h \ - 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-utils/unaligned.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/libcsiphash.la \ +shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \ + shared/nm-std-aux/libnm-std-aux.la \ $(GLIB_LIBS) \ $(NULL) ############################################################################### -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_utils_libnm_utils_cppflags) \ +shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \ + $(shared_nm_glib_aux_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) ############################################################################### +noinst_LTLIBRARIES += shared/nm-libnm-core-intern/libnm-libnm-core-intern.la + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \ + shared/nm-libnm-core-intern/nm-common-macros.h \ + shared/nm-libnm-core-intern/nm-ethtool-utils.c \ + shared/nm-libnm-core-intern/nm-ethtool-utils.h \ + shared/nm-libnm-core-intern/nm-libnm-core-utils.c \ + shared/nm-libnm-core-intern/nm-libnm-core-utils.h \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LIBADD = \ + $(GLIB_LIBS) \ + $(NULL) + +$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +############################################################################### + +noinst_LTLIBRARIES += shared/nm-libnm-core-aux/libnm-libnm-core-aux.la + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \ + shared/nm-libnm-core-aux/nm-dispatcher-api.h \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD = \ + $(GLIB_LIBS) \ + $(NULL) + +$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +############################################################################### + check_programs += shared/nm-utils/tests/test-shared-general shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ @@ -389,7 +484,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) @@ -698,8 +793,6 @@ libnm_core_lib_h_pub_real = \ libnm_core_lib_h_pub_mkenums = \ libnm-core/nm-core-enum-types.h libnm_core_lib_h_priv = \ - shared/nm-ethtool-utils.h \ - shared/nm-libnm-core-utils.h \ shared/nm-meta-setting.h \ libnm-core/nm-crypto.h \ libnm-core/nm-crypto-impl.h \ @@ -761,8 +854,6 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-wpan.c libnm_core_lib_c_real = \ $(libnm_core_lib_c_settings_real) \ - shared/nm-ethtool-utils.c \ - shared/nm-libnm-core-utils.c \ shared/nm-meta-setting.c \ libnm-core/nm-crypto.c \ libnm-core/nm-connection.c \ @@ -963,22 +1054,28 @@ libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags) libnm_core_tests_test_general_SOURCES = \ libnm-core/tests/test-general-enums.h \ - libnm-core/tests/test-general.c + libnm-core/tests/test-general.c \ + $(NULL) nodist_libnm_core_tests_test_general_SOURCES = \ libnm-core/tests/nm-core-tests-enum-types.c \ - libnm-core/tests/nm-core-tests-enum-types.h + libnm-core/tests/nm-core-tests-enum-types.h \ + $(NULL) libnm_core_tests_ldadd = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ + $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-utils/libnm-utils-base.la \ - $(libnm_crypto_lib) \ - $(GLIB_LIBS) + shared/nm-glib-aux/libnm-glib-aux.la \ + $(GLIB_LIBS) \ + $(NULL) libnm_core_tests_ldflags = \ - $(SANITIZER_EXEC_LDFLAGS) + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) @@ -1182,10 +1279,12 @@ libnm_libnm_utils_la_SOURCES = \ libnm/nm-libnm-utils.c libnm_libnm_utils_la_LIBADD = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ introspection/libnmdbus.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -1230,7 +1329,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) \ @@ -1431,9 +1530,6 @@ libnm_tests_test_general_LDADD = \ libnm/libnm-utils.la \ $(libnm_tests_ldadd) -libnm_tests_test_general_LDFLAGS = \ - $(libnm_tests_ldflags) - libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd) @@ -1868,10 +1964,12 @@ src_libNetworkManagerBase_la_SOURCES += \ endif src_libNetworkManagerBase_la_LIBADD = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ - shared/nm-utils/libnm-utils-udev.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -2174,11 +2272,10 @@ src_initrd_nm_initrd_generator_SOURCES = \ src/initrd/nm-initrd-generator.c src_initrd_nm_initrd_generator_LDADD = \ - libnm-core/libnm-core.la \ 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) @@ -2198,10 +2295,9 @@ src_initrd_tests_test_ibft_reader_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) 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) @@ -2414,10 +2510,9 @@ src_initrd_tests_test_cmdline_reader_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) 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) @@ -3789,9 +3884,9 @@ $(dispatcher_nm_dispatcher_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources) CLEANFILES += $(dispatcher_nmdbus_dispatcher_sources) dispatcher_libnm_dispatcher_core_la_SOURCES = \ - shared/nm-dispatcher-api.h \ dispatcher/nm-dispatcher-utils.c \ - dispatcher/nm-dispatcher-utils.h + dispatcher/nm-dispatcher-utils.h \ + $(NULL) dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags) @@ -3800,8 +3895,8 @@ dispatcher_libnm_dispatcher_core_la_LIBADD = \ $(GLIB_LIBS) dispatcher_nm_dispatcher_SOURCES = \ - shared/nm-dispatcher-api.h \ - dispatcher/nm-dispatcher.c + dispatcher/nm-dispatcher.c \ + $(NULL) nodist_dispatcher_nm_dispatcher_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) @@ -3873,7 +3968,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) @@ -3956,7 +4051,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) @@ -3991,11 +4086,6 @@ clients_common_libnmc_la_SOURCES = \ shared/nm-meta-setting.c \ shared/nm-meta-setting.h \ \ - shared/nm-ethtool-utils.c \ - shared/nm-ethtool-utils.h \ - shared/nm-libnm-core-utils.c \ - shared/nm-libnm-core-utils.h \ - \ clients/common/nm-meta-setting-desc.c \ clients/common/nm-meta-setting-desc.h \ clients/common/nm-meta-setting-access.c \ @@ -4008,8 +4098,10 @@ clients_common_libnmc_la_CPPFLAGS = \ $(NULL) clients_common_libnmc_la_LIBADD = \ - libnm/libnm.la \ clients/common/libnmc-base.la \ + libnm/libnm.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ $(GLIB_LIBS) $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -4548,7 +4640,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) @@ -4870,7 +4962,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) \ @@ -5284,15 +5376,11 @@ EXTRA_DIST += \ \ po/meson.build \ \ - shared/nm-common-macros.h \ - shared/nm-dbus-compat.h \ shared/nm-default.h \ - shared/nm-dispatcher-api.h \ shared/nm-test-libnm-utils.h \ 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/cli/general.c b/clients/cli/general.c index e79bd65588..d713426b15 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -23,7 +23,7 @@ #include <stdlib.h> -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-client-utils.h" diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 11fe1cd153..396466a221 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -22,7 +22,7 @@ deps = [ libnm_dep, libnmc_base_dep, libnmc_dep, - nm_core_dep, + libnm_core_dep, readline_dep, ] diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 70348dbfec..2446cb0856 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <arpa/inet.h> -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-client-utils.h" #include "nm-vpn-helpers.h" diff --git a/clients/common/meson.build b/clients/common/meson.build index c137d4463e..fed0f3bf81 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -4,7 +4,7 @@ nm_polkit_listener = files('nm-polkit-listener.c') deps = [ libnm_dep, - nm_core_dep, + shared_nm_libnm_core_aux_dep, ] cflags = clients_cflags + [ @@ -55,7 +55,7 @@ libnmc = static_library( sources: files( 'nm-meta-setting-access.c', 'nm-meta-setting-desc.c', - ) + shared_nm_meta_setting_c + shared_nm_ethtool_utils_c + shared_nm_libnm_core_utils_c + [settings_docs_source], + ) + shared_nm_meta_setting_c + [settings_docs_source], dependencies: deps, c_args: cflags, link_with: libnmc_base, diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h index fd726ee93c..08a39f03c0 100644 --- a/clients/common/nm-client-utils.h +++ b/clients/common/nm-client-utils.h @@ -23,7 +23,7 @@ #include "nm-meta-setting.h" #include "nm-active-connection.h" #include "nm-device.h" -#include "nm-libnm-core-utils.h" +#include "nm-libnm-core-intern/nm-libnm-core-utils.h" const NMObject **nmc_objects_sort_by_path (const NMObject *const*objs, gssize len); diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index ffaf60714c..698ded869e 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -24,10 +24,10 @@ #include <stdlib.h> #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-libnm-core-utils.h" +#include "nm-libnm-core-intern/nm-common-macros.h" +#include "nm-glib-aux/nm-enum-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" +#include "nm-libnm-core-intern/nm-libnm-core-utils.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index a5083ba603..b69a07b503 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -20,9 +20,9 @@ #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" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" struct _NMDevice; 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/clients/common/tests/meson.build b/clients/common/tests/meson.build index 060bab48c5..3eb32a4726 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -4,7 +4,7 @@ deps = [ libnm_dep, libnmc_dep, libnmc_base_dep, - nm_core_dep, + libnm_core_dep, ] exe = executable( diff --git a/clients/meson.build b/clients/meson.build index 1b98ebcbe9..76d39fa78b 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -2,7 +2,7 @@ name = 'nm-online' deps = [ libnm_dep, - nm_core_dep, + libnm_core_dep, ] clients_cflags = [ diff --git a/clients/tui/meson.build b/clients/tui/meson.build index e7c44384fa..837645a61e 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -2,7 +2,7 @@ name = 'nmtui' deps = [ newt_dep, - nm_core_dep, + libnm_core_dep, ] cflags = clients_cflags + [ diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 70c8c30796..6c775bc53c 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -30,7 +30,7 @@ #include "nmt-mac-entry.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) diff --git a/dispatcher/meson.build b/dispatcher/meson.build index 05e570d897..7bd41935c5 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -27,7 +27,7 @@ sources = files('nm-dispatcher-utils.c') deps = [ libnm_dep, - nm_core_dep, + libnm_core_dep, ] cflags = [ diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c index dee00612d7..f56ba38fd5 100644 --- a/dispatcher/nm-dispatcher-utils.c +++ b/dispatcher/nm-dispatcher-utils.c @@ -28,7 +28,7 @@ #include "nm-setting-ip6-config.h" #include "nm-setting-connection.h" -#include "nm-dispatcher-api.h" +#include "nm-libnm-core-aux/nm-dispatcher-api.h" #include "nm-utils.h" /*****************************************************************************/ diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c index d395942a38..fe6eaa17ad 100644 --- a/dispatcher/nm-dispatcher.c +++ b/dispatcher/nm-dispatcher.c @@ -31,7 +31,7 @@ #include <arpa/inet.h> #include <glib-unix.h> -#include "nm-dispatcher-api.h" +#include "nm-libnm-core-aux/nm-dispatcher-api.h" #include "nm-dispatcher-utils.h" #include "nmdbus-dispatcher.h" diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index bf54fdff6d..3da3c3e912 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -9,7 +9,7 @@ exe = executable( test_unit, test_unit + '.c', include_directories: incs, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, c_args: [ '-DNETWORKMANAGER_COMPILATION_TEST', '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT', diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c index ff9b5f03c2..cdc3e6b25b 100644 --- a/dispatcher/tests/test-dispatcher-envp.c +++ b/dispatcher/tests/test-dispatcher-envp.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include "nm-dispatcher-utils.h" -#include "nm-dispatcher-api.h" +#include "nm-libnm-core-aux/nm-dispatcher-api.h" #include "nm-utils/nm-test-utils.h" diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build index 1c817163b6..47d64bddf9 100644 --- a/examples/C/glib/meson.build +++ b/examples/C/glib/meson.build @@ -14,6 +14,6 @@ foreach example: examples example[0], [example[0] + '.c'] + example[1], include_directories: example[2], - dependencies: [nm_core_dep] + example[3], + dependencies: [libnm_core_dep] + example[3], ) endforeach diff --git a/libnm-core/meson.build b/libnm-core/meson.build index beee290e78..bc2d087a15 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -139,14 +139,57 @@ libnm_core_enum = gnome.mkenums( install_dir: libnm_pkgincludedir, ) +libnm_core_enum_dep = declare_dependency( + sources: libnm_core_enum[1], +) + +############################################################################### + +shared_nm_libnm_core_intern = static_library( + 'nm-libnm-core-intern', + sources: files('../shared/nm-libnm-core-intern/nm-ethtool-utils.c', + '../shared/nm-libnm-core-intern/nm-libnm-core-utils.c'), + c_args: [ + '-DG_LOG_DOMAIN="@0@"'.format(libnm_name), + '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE', + ], + include_directories: [ + top_inc, + shared_inc, + libnm_core_inc, + ], + dependencies: [ + glib_dep, + shared_c_siphash_dep, + shared_nm_glib_aux_dep, + libnm_core_enum_dep, + ], +) + +shared_nm_libnm_core_intern_dep = declare_dependency( + link_with: shared_nm_libnm_core_intern, + include_directories: [ + top_inc, + shared_inc, + ], + dependencies: [ + glib_dep, + shared_nm_glib_aux_dep, + libnm_systemd_shared_dep, + ], +) + +############################################################################### + deps = [ dl_dep, libudev_dep, uuid_dep, glib_dep, shared_c_siphash_dep, - shared_nm_utils_base_dep, - shared_nm_utils_udev_dep, + shared_nm_glib_aux_dep, + shared_nm_udev_aux_dep, + shared_nm_libnm_core_intern_dep, ] cflags = [ @@ -188,8 +231,6 @@ endif libnm_core_sources_all = libnm_core_sources libnm_core_sources_all += libnm_core_enum libnm_core_sources_all += shared_nm_meta_setting_c -libnm_core_sources_all += shared_nm_ethtool_utils_c -libnm_core_sources_all += shared_nm_libnm_core_utils_c libnm_core_sources_all += [version_header] libnm_core = static_library( @@ -200,16 +241,54 @@ libnm_core = static_library( c_args: cflags, ) -nm_core_dep = declare_dependency( +libnm_core_dep = declare_dependency( sources: libnm_core_enum[1], include_directories: libnm_core_inc, dependencies: [ - shared_nm_utils_base_dep, + shared_nm_libnm_core_intern_dep, + shared_nm_glib_aux_dep, shared_c_siphash_dep, libnm_systemd_shared_dep, ], ) +############################################################################### + +shared_nm_libnm_core_aux = static_library( + 'nm-libnm-core-aux', + sources: files('../shared/nm-libnm-core-aux/nm-dispatcher-api.h'), + c_args: [ + '-DG_LOG_DOMAIN="@0@"'.format(libnm_name), + '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)', + ], + include_directories: [ + top_inc, + shared_inc, + libnm_core_inc, + ], + dependencies: [ + glib_dep, + shared_c_siphash_dep, + shared_nm_glib_aux_dep, + ], +) + +shared_nm_libnm_core_aux_dep = declare_dependency( + link_with: shared_nm_libnm_core_aux, + include_directories: [ + top_inc, + shared_inc, + ], + dependencies: [ + libnm_core_dep, + glib_dep, + shared_nm_glib_aux_dep, + libnm_systemd_shared_dep, + ], +) + +############################################################################### + enums_to_docbook = join_paths(meson.source_root(), 'tools', 'enums-to-docbook.pl') docbooks = [ @@ -234,6 +313,8 @@ foreach docbook: docbooks content_files += xml.full_path() endforeach +############################################################################### + if enable_tests subdir('tests') endif diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 95ec86a059..966a4ada9c 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -88,7 +88,7 @@ #include "nm-utils.h" #include "nm-vpn-dbus-interface.h" #include "nm-vpn-editor-plugin.h" -#include "nm-libnm-core-utils.h" +#include "nm-libnm-core-intern/nm-libnm-core-utils.h" /* IEEE 802.1D-1998 timer values */ #define NM_BR_MIN_HELLO_TIME 1 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..6fb0099e85 100644 --- a/libnm-core/nm-keyfile.c +++ b/libnm-core/nm-keyfile.c @@ -31,9 +31,9 @@ #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-libnm-core-intern/nm-common-macros.h" #include "nm-core-internal.h" #include "nm-keyfile-utils.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-ethtool.c b/libnm-core/nm-setting-ethtool.c index 7bdbcb1a22..827e3a6287 100644 --- a/libnm-core/nm-setting-ethtool.c +++ b/libnm-core/nm-setting-ethtool.c @@ -24,7 +24,7 @@ #include "nm-setting-ethtool.h" #include "nm-setting-private.h" -#include "nm-ethtool-utils.h" +#include "nm-libnm-core-intern/nm-ethtool-utils.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-vlan.c b/libnm-core/nm-setting-vlan.c index f07504aa3e..8a220ad811 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -25,7 +25,7 @@ #include <stdlib.h> -#include "nm-libnm-core-utils.h" +#include "nm-libnm-core-intern/nm-libnm-core-utils.h" #include "nm-utils.h" #include "nm-core-types-internal.h" #include "nm-setting-connection.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-wifi-p2p.c b/libnm-core/nm-setting-wifi-p2p.c index da97872037..490c2ef949 100644 --- a/libnm-core/nm-setting-wifi-p2p.c +++ b/libnm-core/nm-setting-wifi-p2p.c @@ -24,7 +24,7 @@ #include <net/ethernet.h> #include "nm-utils.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 7f0843046d..182e719302 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -27,7 +27,7 @@ #include <net/ethernet.h> #include "nm-utils.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.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-setting-wireless.c b/libnm-core/nm-setting-wireless.c index b4cb105607..d8056c6c59 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -27,7 +27,7 @@ #include <net/ethernet.h> #include "nm-utils.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 28bc24b1e1..3238c12345 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -37,10 +37,10 @@ #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-libnm-core-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" #include "nm-crypto.h" diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build index 7d772c80ce..1afb9c4b5c 100644 --- a/libnm-core/tests/meson.build +++ b/libnm-core/tests/meson.build @@ -34,7 +34,7 @@ foreach test_unit: test_units 'libnm-core-' + test_unit, [test_unit + '.c'] + enum, dependencies: [ - nm_core_dep, + libnm_core_dep, libnm_systemd_shared_no_logging_dep, ], c_args: [ diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 64f937cbcf..a6abf39160 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -23,8 +23,8 @@ #include "nm-default.h" -#include "nm-utils/c-list-util.h" -#include "nm-utils/nm-enum-utils.h" +#include "nm-std-aux/c-list-util.h" +#include "nm-glib-aux/nm-enum-utils.h" #include "nm-utils.h" #include "nm-setting-private.h" @@ -63,8 +63,8 @@ #include "nm-setting-wpan.h" #include "nm-simple-connection.h" #include "nm-keyfile-internal.h" -#include "nm-utils/nm-dedup-multi.h" -#include "nm-ethtool-utils.h" +#include "nm-glib-aux/nm-dedup-multi.h" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" #include "test-general-enums.h" diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index 3882d59a97..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 = [ @@ -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-client.c b/libnm-glib/nm-client.c index 16fee71414..8f1524e33c 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -27,7 +27,7 @@ #include <string.h> #include "nm-utils.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" 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-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..4b3df97f15 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -9,8 +9,8 @@ libnm_utils_sources = files('nm-libnm-utils.c') deps = [ libnmdbus_dep, - shared_nm_utils_base_dep, - nm_core_dep, + shared_nm_glib_aux_dep, + libnm_core_dep, ] if have_fake_typelibs @@ -158,8 +158,8 @@ libnm = shared_library( dependencies: [ dl_dep, libudev_dep, - shared_nm_utils_base_dep, - nm_core_dep, + shared_nm_glib_aux_dep, + libnm_core_dep, uuid_dep, libnm_systemd_shared_no_logging_dep, ], diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h index 0f2cabe8cf..eb5394f032 100644 --- a/libnm/nm-dbus-helpers.h +++ b/libnm/nm-dbus-helpers.h @@ -25,7 +25,7 @@ #error Cannot use this header. #endif -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" GBusType _nm_dbus_bus_type (void); 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/libnm/nm-manager.c b/libnm/nm-manager.c index 7a169863eb..509586e02d 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -25,7 +25,7 @@ #include "nm-utils.h" #include "nm-checkpoint.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" #include "nm-core-internal.h" 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/libnm/tests/meson.build b/libnm/tests/meson.build index d0a2dd306e..d76b9f5f4d 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -19,7 +19,7 @@ foreach test_unit: test_units ], dependencies: [ libnm_dep, - nm_core_dep, + libnm_core_dep, libnm_systemd_shared_no_logging_dep, ], c_args: cflags, @@ -39,6 +39,6 @@ libnm_vpn_plugin_utils_test = static_library( 'nm-vpn-plugin-utils-test', sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]], include_directories: libnm_inc, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, c_args: cflags, ) 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 13e0a8e7d4..ed9bf03f37 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) @@ -73,10 +80,6 @@ version_header = configure_file( configuration: version_conf, ) -shared_nm_ethtool_utils_c = files('nm-ethtool-utils.c') - -shared_nm_libnm_core_utils_c = files('nm-libnm-core-utils.c') - shared_nm_meta_setting_c = files('nm-meta-setting.c') shared_nm_test_utils_impl_c = files('nm-test-utils-impl.c') @@ -85,35 +88,60 @@ shared_nm_utils_nm_vpn_plugin_utils_c = files('nm-utils/nm-vpn-plugin-utils.c') ############################################################################### -shared_nm_utils_c_args = [ +shared_nm_std_aux = static_library( + 'nm-std-aux', + sources: files('nm-std-aux/c-list-util.c'), + c_args: [ + '-DG_LOG_DOMAIN="@0@"'.format(libnm_name), + '-DNETWORKMANAGER_COMPILATION=0', + ], + include_directories: [ + top_inc, + shared_inc, + ], + dependencies: [ + ], +) + +shared_nm_std_aux_dep = declare_dependency( + link_with: shared_nm_std_aux, + include_directories: [ + top_inc, + shared_inc, + ], +) + +############################################################################### + +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/c-list-util.c', - '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, ], dependencies: [ glib_dep, + shared_nm_std_aux_dep, ], ) -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, @@ -121,54 +149,38 @@ 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'), - c_args: shared_nm_utils_c_args, +############################################################################### + +shared_nm_udev_aux = static_library( + 'nm-udev-aux', + sources: files('nm-udev-aux/nm-udev-utils.c'), + 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, ], ) -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, ], dependencies: [ glib_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, libudev_dep, ], ) ############################################################################### -test_shared_general = executable( - 'nm-utils/tests/test-shared-general', - [ 'nm-utils/tests/test-shared-general.c', ], - c_args: [ - '-DNETWORKMANAGER_COMPILATION_TEST', - '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)', - ], - dependencies: shared_nm_utils_base_dep, - link_with: shared_c_siphash, -) -test( - 'shared/nm-utils/test-shared-general', - test_script, - args: test_args + [test_shared_general.full_path()] -) - -############################################################################### - libnm_systemd_shared = static_library( 'nm-systemd-shared', sources: files( @@ -209,7 +221,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"', @@ -222,7 +234,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, @@ -238,7 +250,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"', @@ -253,3 +265,21 @@ libnm_systemd_shared_no_logging_dep = declare_dependency( libnm_systemd_logging_stub, ], ) + +############################################################################### + +test_shared_general = executable( + 'nm-utils/tests/test-shared-general', + [ 'nm-utils/tests/test-shared-general.c', ], + c_args: [ + '-DNETWORKMANAGER_COMPILATION_TEST', + '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)', + ], + dependencies: shared_nm_glib_aux_dep, + link_with: shared_c_siphash, +) +test( + 'shared/nm-utils/test-shared-general', + test_script, + args: test_args + [test_shared_general.full_path()] +) 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 845b4c3ef5..82c6f1e955 100644 --- a/shared/nm-utils/nm-dedup-multi.h +++ b/shared/nm-glib-aux/nm-dedup-multi.h @@ -23,7 +23,7 @@ #define __NM_DEDUP_MULTI_H__ #include "nm-obj.h" -#include "c-list-util.h" +#include "nm-std-aux/c-list-util.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-dispatcher-api.h b/shared/nm-libnm-core-aux/nm-dispatcher-api.h index b1f28e71d4..e6d0d92f85 100644 --- a/shared/nm-dispatcher-api.h +++ b/shared/nm-libnm-core-aux/nm-dispatcher-api.h @@ -18,6 +18,9 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ +#ifndef __NM_DISPACHER_API_H__ +#define __NM_DISPACHER_API_H__ + #define NMD_SCRIPT_DIR_DEFAULT NMCONFDIR "/dispatcher.d" #define NMD_SCRIPT_DIR_PRE_UP NMD_SCRIPT_DIR_DEFAULT "/pre-up.d" #define NMD_SCRIPT_DIR_PRE_DOWN NMD_SCRIPT_DIR_DEFAULT "/pre-down.d" @@ -59,3 +62,4 @@ typedef enum { DISPATCH_RESULT_TIMEOUT = 4, } DispatchResult; +#endif /* __NM_DISPACHER_API_H__ */ diff --git a/shared/nm-common-macros.h b/shared/nm-libnm-core-intern/nm-common-macros.h index f5aa3a1eaf..f5aa3a1eaf 100644 --- a/shared/nm-common-macros.h +++ b/shared/nm-libnm-core-intern/nm-common-macros.h diff --git a/shared/nm-ethtool-utils.c b/shared/nm-libnm-core-intern/nm-ethtool-utils.c index 3313274ad1..3313274ad1 100644 --- a/shared/nm-ethtool-utils.c +++ b/shared/nm-libnm-core-intern/nm-ethtool-utils.c diff --git a/shared/nm-ethtool-utils.h b/shared/nm-libnm-core-intern/nm-ethtool-utils.h index 5f22a9a06e..5f22a9a06e 100644 --- a/shared/nm-ethtool-utils.h +++ b/shared/nm-libnm-core-intern/nm-ethtool-utils.h diff --git a/shared/nm-libnm-core-utils.c b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c index d1e5f75460..d1e5f75460 100644 --- a/shared/nm-libnm-core-utils.c +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c diff --git a/shared/nm-libnm-core-utils.h b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h index 35d6c5ad5b..35d6c5ad5b 100644 --- a/shared/nm-libnm-core-utils.h +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h diff --git a/shared/nm-utils/c-list-util.c b/shared/nm-std-aux/c-list-util.c index 44ca26a558..44ca26a558 100644 --- a/shared/nm-utils/c-list-util.c +++ b/shared/nm-std-aux/c-list-util.c diff --git a/shared/nm-utils/c-list-util.h b/shared/nm-std-aux/c-list-util.h index 648bacc744..648bacc744 100644 --- a/shared/nm-utils/c-list-util.h +++ b/shared/nm-std-aux/c-list-util.h diff --git a/shared/nm-dbus-compat.h b/shared/nm-std-aux/nm-dbus-compat.h index dd97b5fd62..dd97b5fd62 100644 --- a/shared/nm-dbus-compat.h +++ b/shared/nm-std-aux/nm-dbus-compat.h diff --git a/shared/nm-utils/unaligned.h b/shared/nm-std-aux/unaligned.h index 00c17f8769..00c17f8769 100644 --- a/shared/nm-utils/unaligned.h +++ b/shared/nm-std-aux/unaligned.h diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c index 509b235a0f..02d7159342 100644 --- a/shared/nm-test-utils-impl.c +++ b/shared/nm-test-utils-impl.c @@ -23,7 +23,7 @@ #include <sys/wait.h> #include "NetworkManager.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-test-libnm-utils.h" 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/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 f56bd15e50..83cffd7f3d 100644 --- a/shared/nm-utils/tests/test-shared-general.c +++ b/shared/nm-utils/tests/test-shared-general.c @@ -21,9 +21,9 @@ #include "nm-default.h" -#include "nm-utils/nm-time-utils.h" -#include "nm-utils/nm-random-utils.h" -#include "nm-utils/unaligned.h" +#include "nm-std-aux/unaligned.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/shared/systemd/sd-adapt-shared/unaligned.h b/shared/systemd/sd-adapt-shared/unaligned.h index 17dc04446c..ac1a6928c5 100644 --- a/shared/systemd/sd-adapt-shared/unaligned.h +++ b/shared/systemd/sd-adapt-shared/unaligned.h @@ -1,3 +1,3 @@ #pragma once -#include "nm-utils/unaligned.h" +#include "nm-std-aux/unaligned.h" diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 0f63239129..13cb1daedb 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -25,9 +25,9 @@ #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-libnm-core-intern/nm-common-macros.h" #include "nm-utils.h" #include "nm-setting-connection.h" #include "nm-setting-ip4-config.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/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index dc85a8b287..9cd3a51973 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -35,7 +35,7 @@ #include "nm-device-bt.h" #include "nm-core-internal.h" #include "platform/nm-platform.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.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/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 253740a225..bd4fbcc37f 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -36,12 +36,12 @@ #include <linux/rtnetlink.h> #include <linux/pkt_sched.h> -#include "nm-utils/nm-dedup-multi.h" -#include "nm-utils/nm-random-utils.h" -#include "nm-utils/unaligned.h" +#include "nm-std-aux/unaligned.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" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-device-private.h" #include "NetworkManagerUtils.h" #include "nm-manager.h" diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c index e5b1ee52e1..831054ba22 100644 --- a/src/devices/nm-lldp-listener.c +++ b/src/devices/nm-lldp-listener.c @@ -24,9 +24,9 @@ #include <net/ethernet.h> +#include "nm-std-aux/unaligned.h" #include "platform/nm-platform.h" -#include "nm-utils/unaligned.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..287f4d1b18 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -30,14 +30,14 @@ #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" #include "nm-config.h" #include "nm-core-internal.h" #include "nm-ip4-config.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "devices/nm-device-logging.h" _LOG_DECLARE_SELF(NMDeviceTeam); diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c index dcc161d28f..da7d06855a 100644 --- a/src/devices/wifi/nm-device-iwd.c +++ b/src/devices/wifi/nm-device-iwd.c @@ -22,7 +22,7 @@ #include "nm-device-iwd.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "devices/nm-device.h" #include "devices/nm-device-private.h" #include "nm-utils.h" @@ -39,7 +39,7 @@ #include "nm-config.h" #include "nm-iwd-manager.h" #include "nm-dbus-manager.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "devices/nm-device-logging.h" _LOG_DECLARE_SELF(NMDeviceIwd); diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 6486967227..3a58c62031 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -28,7 +28,7 @@ #include "nm-device-wifi-p2p.h" #include "nm-wifi-ap.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "devices/nm-device.h" #include "devices/nm-device-private.h" #include "nm-dbus-manager.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/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c index fac14d69d6..4be089c099 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -32,7 +32,7 @@ #define sd_booted() FALSE #endif -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-modem.h" #include "nm-modem-broadband.h" diff --git a/src/dhcp/meson.build b/src/dhcp/meson.build index a5dd3151a9..c1f28be0e3 100644 --- a/src/dhcp/meson.build +++ b/src/dhcp/meson.build @@ -8,7 +8,7 @@ cflags = [ executable( name, name + '.c', - dependencies: nm_core_dep, + dependencies: libnm_core_dep, c_args: cflags, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, 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 70ed871503..1cd5ba2782 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -26,8 +26,8 @@ #include <ctype.h> #include <net/if_arp.h> -#include "nm-utils/nm-dedup-multi.h" -#include "nm-utils/unaligned.h" +#include "nm-glib-aux/nm-dedup-multi.h" +#include "nm-std-aux/unaligned.h" #include "nm-utils.h" #include "nm-config.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..5d262ba3c7 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" @@ -42,7 +42,7 @@ #include "nm-setting-connection.h" #include "devices/nm-device.h" #include "NetworkManagerUtils.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1" #define SYSTEMD_RESOLVED_MANAGER_IFACE "org.freedesktop.resolve1.Manager" diff --git a/src/initrd/meson.build b/src/initrd/meson.build index a12b718a9c..fa8c016b8d 100644 --- a/src/initrd/meson.build +++ b/src/initrd/meson.build @@ -10,7 +10,7 @@ libnmi_core = static_library( c_args: nm_cflags, sources: sources, include_directories: src_inc, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, ) name = 'nm-initrd-generator' @@ -19,7 +19,7 @@ executable( name + '.c', c_args: nm_cflags, include_directories: src_inc, - dependencies: [ nm_core_dep ], + dependencies: [ libnm_core_dep ], link_with: [libnetwork_manager_base, libnmi_core], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, 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/meson.build b/src/meson.build index 20a14f9f00..a3ac4625ac 100644 --- a/src/meson.build +++ b/src/meson.build @@ -13,7 +13,7 @@ nm_cflags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON' nm_dep = declare_dependency( include_directories: src_inc, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, compile_args: nm_cflags, ) @@ -49,7 +49,7 @@ sources = files( deps = [ libsystemd_dep, libudev_dep, - nm_core_dep, + libnm_core_dep, ] if enable_wext @@ -149,7 +149,7 @@ nm_deps = [ dl_dep, libndp_dep, libudev_dep, - nm_core_dep, + libnm_core_dep, shared_n_acd_dep, logind_dep, ] @@ -186,7 +186,7 @@ deps = [ dl_dep, libndp_dep, libudev_dep, - nm_core_dep, + libnm_core_dep, ] name = 'nm-iface-helper' @@ -216,7 +216,7 @@ if enable_tests deps = [ libudev_dep, - nm_core_dep, + libnm_core_dep, ] test_cflags = ['-DNETWORKMANAGER_COMPILATION_TEST'] diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 7b9f2cc701..17568c30b5 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -22,7 +22,7 @@ #include "nm-active-connection.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-dbus-interface.h" #include "devices/nm-device.h" #include "settings/nm-settings-connection.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 6f55e62a79..b0cc914e77 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -37,10 +37,10 @@ #include <net/if_arp.h> #include <net/ethernet.h> -#include "nm-utils/nm-random-utils.h" -#include "nm-utils/nm-io-utils.h" -#include "nm-utils/unaligned.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-std-aux/unaligned.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..1a455c4280 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -28,10 +28,10 @@ #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" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-dbus-object.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index c0ef1bb6b0..d656edc844 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -23,7 +23,7 @@ #include "nm-dispatcher.h" -#include "nm-dispatcher-api.h" +#include "nm-libnm-core-aux/nm-dispatcher-api.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" #include "nm-connectivity.h" diff --git a/src/nm-hostname-manager.c b/src/nm-hostname-manager.c index d405a32016..3fcd848261 100644 --- a/src/nm-hostname-manager.c +++ b/src/nm-hostname-manager.c @@ -28,7 +28,7 @@ #include <selinux/selinux.h> #endif -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-dbus-interface.h" #include "nm-connection.h" #include "nm-utils.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..40e068ac5b 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -27,9 +27,9 @@ #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-libnm-core-intern/nm-common-macros.h" #include "nm-dbus-manager.h" #include "vpn/nm-vpn-manager.h" #include "devices/nm-device.h" @@ -54,7 +54,7 @@ #include "nm-core-internal.h" #include "nm-config.h" #include "nm-audit-manager.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-checkpoint.h" #include "nm-checkpoint-manager.h" #include "nm-dbus-object.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-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/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 d8b18a3faf..d4b0115252 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -41,12 +41,14 @@ #include <sys/socket.h> #include <unistd.h> +#include "nm-std-aux/unaligned.h" + #include "nm-utils.h" #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" @@ -56,9 +58,8 @@ #include "wifi/nm-wifi-utils.h" #include "wifi/nm-wifi-utils-wext.h" #include "wpan/nm-wpan-utils.h" -#include "nm-utils/unaligned.h" -#include "nm-utils/nm-io-utils.h" -#include "nm-utils/nm-udev-utils.h" +#include "nm-glib-aux/nm-io-utils.h" +#include "nm-udev-aux/nm-udev-utils.h" /*****************************************************************************/ diff --git a/src/platform/nm-netlink.h b/src/platform/nm-netlink.h index 094a3c6fde..b12fd243ab 100644 --- a/src/platform/nm-netlink.h +++ b/src/platform/nm-netlink.h @@ -25,7 +25,7 @@ #include <linux/rtnetlink.h> #include <linux/genetlink.h> -#include "nm-utils/unaligned.h" +#include "nm-std-aux/unaligned.h" /*****************************************************************************/ diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c index 93cd0b3c8b..456871a78d 100644 --- a/src/platform/nm-platform-utils.c +++ b/src/platform/nm-platform-utils.c @@ -35,7 +35,7 @@ #include "nm-utils.h" #include "nm-setting-wired.h" -#include "nm-ethtool-utils.h" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" #include "nm-core-utils.h" diff --git a/src/platform/nm-platform-utils.h b/src/platform/nm-platform-utils.h index bad77aee38..f5491679a2 100644 --- a/src/platform/nm-platform-utils.h +++ b/src/platform/nm-platform-utils.h @@ -23,7 +23,7 @@ #include "nm-platform.h" #include "nm-setting-wired.h" -#include "nm-ethtool-utils.h" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" /*****************************************************************************/ diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 88508c97f7..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-utils/nm-udev-utils.h" -#include "nm-utils/nm-secret-utils.h" +#include "nm-glib-aux/nm-dedup-multi.h" +#include "nm-udev-aux/nm-udev-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/nmp-rules-manager.c b/src/platform/nmp-rules-manager.c index aceed31dac..970afcde50 100644 --- a/src/platform/nmp-rules-manager.c +++ b/src/platform/nmp-rules-manager.c @@ -22,7 +22,7 @@ #include <linux/fib_rules.h> #include <linux/rtnetlink.h> -#include "nm-utils/c-list-util.h" +#include "nm-std-aux/c-list-util.h" #include "nmp-object.h" /*****************************************************************************/ 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/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" diff --git a/src/ppp/meson.build b/src/ppp/meson.build index a0f2df505f..04c539e3de 100644 --- a/src/ppp/meson.build +++ b/src/ppp/meson.build @@ -2,7 +2,7 @@ name = 'nm-pppd-plugin' deps = [ dl_dep, - nm_core_dep, + libnm_core_dep, ] nm_pppd_plugin = shared_module( diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index 8924c39f42..814dee85a6 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -24,7 +24,7 @@ #include <pwd.h> -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-dbus-interface.h" #include "nm-secret-agent.h" #include "nm-auth-utils.h" diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 8d1f95833f..3fdaa59814 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -25,7 +25,7 @@ #include "c-list/src/c-list.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-config.h" #include "nm-config-data.h" #include "nm-dbus-interface.h" diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 9298826dbf..8e18a33e0d 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -36,7 +36,7 @@ #include <selinux/selinux.h> #endif -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-dbus-interface.h" #include "nm-connection.h" #include "nm-setting-8021x.h" @@ -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-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index 89272edbb3..5160dbf0e2 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -30,7 +30,7 @@ #include <sys/stat.h> #include <gmodule.h> -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-setting-connection.h" #include "settings/nm-settings-plugin.h" #include "nm-config.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..e5423b181e 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" @@ -53,7 +53,7 @@ #include "nm-setting-generic.h" #include "nm-core-internal.h" #include "nm-utils.h" -#include "nm-ethtool-utils.h" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" #include "platform/nm-platform.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h index 84c22094f3..c7729df50d 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h @@ -22,7 +22,7 @@ #define _UTILS_H_ #include "nm-connection.h" -#include "nm-ethtool-utils.h" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" #include "shvar.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..80b1bffe1f 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" @@ -50,7 +50,7 @@ #include "nm-core-internal.h" #include "NetworkManagerUtils.h" #include "nm-meta-setting.h" -#include "nm-ethtool-utils.h" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" #include "nms-ifcfg-rh-common.h" #include "nms-ifcfg-rh-reader.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/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index ca280fbfec..49ab04d4db 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -49,7 +49,7 @@ #include "nm-setting-vlan.h" #include "nm-setting-dcb.h" #include "nm-core-internal.h" -#include "nm-ethtool-utils.h" +#include "nm-libnm-core-intern/nm-ethtool-utils.h" #include "NetworkManagerUtils.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" /*****************************************************************************/ diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index f46689eb02..12d21aba44 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -29,7 +29,7 @@ #include "NetworkManagerUtils.h" #include "nm-supplicant-config.h" #include "nm-core-internal.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #define WPAS_DBUS_IFACE_INTERFACE WPAS_DBUS_INTERFACE ".Interface" #define WPAS_DBUS_IFACE_INTERFACE_WPS WPAS_DBUS_INTERFACE ".Interface.WPS" diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 9dea4fb593..257a9462c8 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -38,7 +38,7 @@ libnm_systemd_core = static_library( ) ], dependencies: [ - nm_core_dep, + libnm_core_dep, ], c_args: [ '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD', diff --git a/src/tests/meson.build b/src/tests/meson.build index 153128f237..17857676b3 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -36,7 +36,7 @@ exe = executable( test_unit, [test_unit + '.c'], include_directories: src_inc, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, c_args: cflags, link_with: [ libnm_systemd_core, |