diff --git a/.gitignore b/.gitignore index 8d50a621be..2a0a1d2a4b 100644 --- a/.gitignore +++ b/.gitignore @@ -135,10 +135,6 @@ test-*.trs /examples/C/qt/monitor-nm-running /examples/C/qt/monitor-nm-running.moc -/shared/nm-glib-aux/tests/test-json-aux -/shared/nm-glib-aux/tests/test-shared-general -/shared/nm-platform/tests/test-nm-platform - /introspection/org.freedesktop.NetworkManager*.[ch] /src/libnm-core-public/nm-version-macros.h @@ -152,16 +148,19 @@ test-*.trs /src/libnm-core-impl/tests/test-need-secrets /src/libnm-core-impl/tests/test-secrets /src/libnm-core-impl/tests/test-setting +/src/libnm-glib-aux/tests/test-json-aux +/src/libnm-glib-aux/tests/test-shared-general +/src/libnm-platform/tests/test-nm-platform -/libnm/nm-property-infos-dbus.xml -/libnm/nm-property-infos-ifcfg-rh.xml -/libnm/nm-property-infos-keyfile.xml -/libnm/nm-property-infos-nmcli.xml -/libnm/nm-settings-docs-gir.xml -/libnm/tests/test-libnm -/libnm/tests/test-nm-client -/libnm/tests/test-remote-settings-client -/libnm/tests/test-secret-agent +/src/libnm-client-impl/nm-property-infos-dbus.xml +/src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml +/src/libnm-client-impl/nm-property-infos-keyfile.xml +/src/libnm-client-impl/nm-property-infos-nmcli.xml +/src/libnm-client-impl/nm-settings-docs-gir.xml +/src/libnm-client-impl/tests/test-libnm +/src/libnm-client-impl/tests/test-nm-client +/src/libnm-client-impl/tests/test-remote-settings-client +/src/libnm-client-impl/tests/test-secret-agent /clients/cli/generate-docs-nm-settings-nmcli /clients/cli/generate-docs-nm-settings-nmcli.xml @@ -352,15 +351,27 @@ test-*.trs /libnm/nm-ifcfg-rh-docs.xml /libnm/nm-keyfile-docs.xml /libnm/nm-property-docs.xml +/libnm/nm-property-infos-dbus.xml +/libnm/nm-property-infos-ifcfg-rh.xml +/libnm/nm-property-infos-keyfile.xml +/libnm/nm-property-infos-nmcli.xml /libnm/nm-setting-docs-overrides.xml /libnm/nm-setting-docs.xml +/libnm/nm-settings-docs-gir.xml /libnm/nm-settings-docs-overrides.xml /libnm/nm-settings-docs.xml /libnm/nm-settings-ifcfg-rh-docs.xml /libnm/nm-settings-keyfile-docs.xml /libnm/tests/test-general +/libnm/tests/test-libnm +/libnm/tests/test-nm-client +/libnm/tests/test-remote-settings-client +/libnm/tests/test-secret-agent /policy/org.freedesktop.NetworkManager.policy /policy/org.freedesktop.NetworkManager.policy.in +/shared/nm-glib-aux/tests/test-json-aux +/shared/nm-glib-aux/tests/test-shared-general +/shared/nm-platform/tests/test-nm-platform /shared/nm-utils/tests/test-shared-general /shared/nm-version-macros.h /src/devices/tests/test-arping diff --git a/Makefile.am b/Makefile.am index 5d75cddccd..036628ec42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,22 +110,23 @@ include config-extra.h.mk DISTCLEANFILES += config-extra.h -$(src_libnm_core_public_mkenums_h): config-extra.h -$(src_libnm_core_public_mkenums_c): config-extra.h -src/libnm-core-impl/.dirstamp: config-extra.h -src/libnm-core-impl/.dirstamp: config-extra.h -shared/.dirstamp: config-extra.h -shared/nm-base/.dirstamp: config-extra.h -shared/nm-glib-aux/.dirstamp: config-extra.h -shared/nm-glib-aux/tests/.dirstamp: config-extra.h -shared/nm-platform/.dirstamp: config-extra.h -shared/nm-platform/tests/.dirstamp: config-extra.h -shared/nm-std-aux/.dirstamp: config-extra.h -shared/nm-udev-aux/.dirstamp: config-extra.h -shared/systemd/.dirstamp: config-extra.h -shared/systemd/src/basic/.dirstamp: config-extra.h -shared/systemd/src/shared/.dirstamp: config-extra.h -src/core/dhcp/.dirstamp: config-extra.h +$(src_libnm_core_public_mkenums_h): config-extra.h +$(src_libnm_core_public_mkenums_c): config-extra.h +src/libnm-core-impl/.dirstamp: config-extra.h +src/libnm-core-impl/.dirstamp: config-extra.h +src/libnm-base/.dirstamp: config-extra.h +src/libnm-glib-aux/.dirstamp: config-extra.h +src/libnm-glib-aux/tests/.dirstamp: config-extra.h +src/libnm-platform/.dirstamp: config-extra.h +src/libnm-platform/tests/.dirstamp: config-extra.h +src/libnm-std-aux/.dirstamp: config-extra.h +src/libnm-udev-aux/.dirstamp: config-extra.h +src/libnm-systemd-shared/.dirstamp: config-extra.h +src/libnm-systemd-shared/src/basic/.dirstamp: config-extra.h +src/libnm-systemd-shared/src/shared/.dirstamp: config-extra.h +src/libnm-client-public/.dirstamp: config-extra.h +src/libnm-client-public/.dirstamp: config-extra.h +src/core/dhcp/.dirstamp: config-extra.h ############################################################################### @@ -214,368 +215,413 @@ DISTCLEANFILES += $(polkit_policy_DATA) ############################################################################### EXTRA_DIST += \ - shared/c-stdaux/src/c-stdaux.h \ + src/c-stdaux/src/c-stdaux.h \ $(NULL) ############################################################################### -noinst_LTLIBRARIES += shared/libcsiphash.la +noinst_LTLIBRARIES += src/c-siphash/libc-siphash.la -shared_libcsiphash_la_CFLAGS = \ +src_c_siphash_libc_siphash_la_CFLAGS = \ $(AM_CFLAGS) \ -std=c11 \ - -I$(srcdir)/shared/c-stdaux/src \ + -I$(srcdir)/src/c-stdaux/src \ $(NULL) -shared_libcsiphash_la_CPPFLAGS = \ +src_c_siphash_libc_siphash_la_CPPFLAGS = \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -shared_libcsiphash_la_LDFLAGS = \ +src_c_siphash_libc_siphash_la_LDFLAGS = \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_libcsiphash_la_SOURCES = \ - shared/c-siphash/src/c-siphash.c \ - shared/c-siphash/src/c-siphash.h \ +src_c_siphash_libc_siphash_la_SOURCES = \ + src/c-siphash/src/c-siphash.c \ + src/c-siphash/src/c-siphash.h \ $(NULL) ############################################################################### -noinst_LTLIBRARIES += shared/libcrbtree.la +noinst_LTLIBRARIES += src/c-rbtree/libc-rbtree.la -shared_libcrbtree_la_CFLAGS = \ +src_c_rbtree_libc_rbtree_la_CFLAGS = \ $(AM_CFLAGS) \ -std=c11 \ - -I$(srcdir)/shared/c-stdaux/src \ + -I$(srcdir)/src/c-stdaux/src \ $(NULL) -shared_libcrbtree_la_CPPFLAGS = \ +src_c_rbtree_libc_rbtree_la_CPPFLAGS = \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -shared_libcrbtree_la_LDFLAGS = \ +src_c_rbtree_libc_rbtree_la_LDFLAGS = \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_libcrbtree_la_SOURCES = \ - shared/c-rbtree/src/c-rbtree.c \ - shared/c-rbtree/src/c-rbtree.h \ - shared/c-rbtree/src/c-rbtree-private.h \ +src_c_rbtree_libc_rbtree_la_SOURCES = \ + src/c-rbtree/src/c-rbtree.c \ + src/c-rbtree/src/c-rbtree.h \ + src/c-rbtree/src/c-rbtree-private.h \ $(NULL) ############################################################################### -noinst_LTLIBRARIES += shared/libnacd.la +noinst_LTLIBRARIES += src/n-acd/libn-acd.la -shared_libnacd_la_CFLAGS = \ +src_n_acd_libn_acd_la_CFLAGS = \ $(AM_CFLAGS) \ -std=c11 \ -Wno-pointer-arith \ -Wno-vla \ $(NULL) -shared_libnacd_la_CPPFLAGS = \ +src_n_acd_libn_acd_la_CPPFLAGS = \ -D_GNU_SOURCE \ -DSO_ATTACH_BPF=50 \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ - -I$(srcdir)/shared/c-stdaux/src \ - -I$(srcdir)/shared/c-list/src \ - -I$(srcdir)/shared/c-siphash/src \ - -I$(srcdir)/shared/c-rbtree/src \ + -I$(srcdir)/src/c-stdaux/src \ + -I$(srcdir)/src/c-list/src \ + -I$(srcdir)/src/c-siphash/src \ + -I$(srcdir)/src/c-rbtree/src \ $(NULL) -shared_libnacd_la_LDFLAGS = \ +src_n_acd_libn_acd_la_LDFLAGS = \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_libnacd_la_SOURCES = \ - shared/n-acd/src/n-acd.c \ - shared/n-acd/src/n-acd.h \ - shared/n-acd/src/n-acd-private.h \ - shared/n-acd/src/n-acd-probe.c \ - shared/n-acd/src/util/timer.c \ - shared/n-acd/src/util/timer.h \ +src_n_acd_libn_acd_la_SOURCES = \ + src/n-acd/src/n-acd.c \ + src/n-acd/src/n-acd.h \ + src/n-acd/src/n-acd-private.h \ + src/n-acd/src/n-acd-probe.c \ + src/n-acd/src/util/timer.c \ + src/n-acd/src/util/timer.h \ $(NULL) if WITH_EBPF -shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf.c +src_n_acd_libn_acd_la_SOURCES += src/n-acd/src/n-acd-bpf.c else -shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf-fallback.c +src_n_acd_libn_acd_la_SOURCES += src/n-acd/src/n-acd-bpf-fallback.c endif ############################################################################### -noinst_LTLIBRARIES += shared/libndhcp4.la +noinst_LTLIBRARIES += src/n-dhcp4/libn-dhcp4.la -shared_libndhcp4_la_CFLAGS = \ +src_n_dhcp4_libn_dhcp4_la_CFLAGS = \ $(AM_CFLAGS) \ -std=c11 \ -Wno-error=declaration-after-statement \ -Wno-pointer-arith \ $(NULL) -shared_libndhcp4_la_CPPFLAGS = \ +src_n_dhcp4_libn_dhcp4_la_CPPFLAGS = \ -D_GNU_SOURCE \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ - -I$(srcdir)/shared/c-stdaux/src \ - -I$(srcdir)/shared/c-list/src \ - -I$(srcdir)/shared/c-siphash/src \ + -I$(srcdir)/src/c-stdaux/src \ + -I$(srcdir)/src/c-list/src \ + -I$(srcdir)/src/c-siphash/src \ $(NULL) -shared_libndhcp4_la_LDFLAGS = \ - $(SANITIZER_LIB_LDFLAGS) +src_n_dhcp4_libn_dhcp4_la_LDFLAGS = \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) -shared_libndhcp4_la_SOURCES = \ - shared/n-dhcp4/src/n-dhcp4-c-connection.c \ - shared/n-dhcp4/src/n-dhcp4-c-lease.c \ - shared/n-dhcp4/src/n-dhcp4-c-probe.c \ - shared/n-dhcp4/src/n-dhcp4-client.c \ - shared/n-dhcp4/src/n-dhcp4-incoming.c \ - shared/n-dhcp4/src/n-dhcp4-outgoing.c \ - shared/n-dhcp4/src/n-dhcp4-private.h \ - shared/n-dhcp4/src/n-dhcp4-socket.c \ - shared/n-dhcp4/src/n-dhcp4.h \ - shared/n-dhcp4/src/util/packet.c \ - shared/n-dhcp4/src/util/packet.h \ - shared/n-dhcp4/src/util/socket.c \ - shared/n-dhcp4/src/util/socket.h \ +src_n_dhcp4_libn_dhcp4_la_SOURCES = \ + src/n-dhcp4/src/n-dhcp4-c-connection.c \ + src/n-dhcp4/src/n-dhcp4-c-lease.c \ + src/n-dhcp4/src/n-dhcp4-c-probe.c \ + src/n-dhcp4/src/n-dhcp4-client.c \ + src/n-dhcp4/src/n-dhcp4-incoming.c \ + src/n-dhcp4/src/n-dhcp4-outgoing.c \ + src/n-dhcp4/src/n-dhcp4-private.h \ + src/n-dhcp4/src/n-dhcp4-socket.c \ + src/n-dhcp4/src/n-dhcp4.h \ + src/n-dhcp4/src/util/packet.c \ + src/n-dhcp4/src/util/packet.h \ + src/n-dhcp4/src/util/socket.c \ + src/n-dhcp4/src/util/socket.h \ $(NULL) ############################################################################### -noinst_LTLIBRARIES += shared/nm-std-aux/libnm-std-aux.la +noinst_LTLIBRARIES += src/libnm-std-aux/libnm-std-aux.la -shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \ +src_libnm_std_aux_libnm_std_aux_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -shared_nm_std_aux_libnm_std_aux_la_SOURCES = \ - shared/c-list/src/c-list.h \ - shared/nm-std-aux/c-list-util.c \ - shared/nm-std-aux/c-list-util.h \ - shared/nm-std-aux/nm-dbus-compat.h \ - shared/nm-std-aux/nm-default-std.h \ - shared/nm-std-aux/nm-networkmanager-compilation.h \ - shared/nm-std-aux/nm-std-aux.h \ - shared/nm-std-aux/nm-std-utils.c \ - shared/nm-std-aux/nm-std-utils.h \ - shared/nm-std-aux/unaligned.h \ +src_libnm_std_aux_libnm_std_aux_la_SOURCES = \ + src/c-list/src/c-list.h \ + src/libnm-std-aux/c-list-util.c \ + src/libnm-std-aux/c-list-util.h \ + src/libnm-std-aux/nm-dbus-compat.h \ + src/libnm-std-aux/nm-default-std.h \ + src/libnm-std-aux/nm-networkmanager-compilation.h \ + src/libnm-std-aux/nm-std-aux.h \ + src/libnm-std-aux/nm-std-utils.c \ + src/libnm-std-aux/nm-std-utils.h \ + src/libnm-std-aux/unaligned.h \ $(NULL) -shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \ +src_libnm_std_aux_libnm_std_aux_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) +EXTRA_DIST += src/libnm-std-aux/meson.build + ############################################################################### -shared_nm_glib_aux_cppflags = \ +src_libnm_glib_aux_cppflags = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(GLIB_CFLAGS) \ $(NULL) -noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la +noinst_LTLIBRARIES += src/libnm-glib-aux/libnm-glib-aux.la -shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \ - $(shared_nm_glib_aux_cppflags) \ +src_libnm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \ + $(src_libnm_glib_aux_cppflags) \ $(NULL) -shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \ - shared/nm-glib-aux/nm-c-list.h \ - shared/nm-glib-aux/nm-dbus-aux.c \ - shared/nm-glib-aux/nm-dbus-aux.h \ - shared/nm-glib-aux/nm-dedup-multi.c \ - shared/nm-glib-aux/nm-dedup-multi.h \ - shared/nm-glib-aux/nm-default-glib-i18n-lib.h \ - shared/nm-glib-aux/nm-default-glib-i18n-prog.h \ - shared/nm-glib-aux/nm-default-glib.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-gassert-patch.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-json-aux.c \ - shared/nm-glib-aux/nm-json-aux.h \ - shared/nm-glib-aux/nm-keyfile-aux.c \ - shared/nm-glib-aux/nm-keyfile-aux.h \ - shared/nm-glib-aux/nm-logging-base.c \ - shared/nm-glib-aux/nm-logging-base.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-ref-string.c \ - shared/nm-glib-aux/nm-ref-string.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-str-buf.h \ - shared/nm-glib-aux/nm-time-utils.c \ - shared/nm-glib-aux/nm-time-utils.h \ - shared/nm-glib-aux/nm-value-type.h \ +src_libnm_glib_aux_libnm_glib_aux_la_SOURCES = \ + src/libnm-glib-aux/nm-c-list.h \ + src/libnm-glib-aux/nm-dbus-aux.c \ + src/libnm-glib-aux/nm-dbus-aux.h \ + src/libnm-glib-aux/nm-dedup-multi.c \ + src/libnm-glib-aux/nm-dedup-multi.h \ + src/libnm-glib-aux/nm-default-glib-i18n-lib.h \ + src/libnm-glib-aux/nm-default-glib-i18n-prog.h \ + src/libnm-glib-aux/nm-default-glib.h \ + src/libnm-glib-aux/nm-enum-utils.c \ + src/libnm-glib-aux/nm-enum-utils.h \ + src/libnm-glib-aux/nm-errno.c \ + src/libnm-glib-aux/nm-errno.h \ + src/libnm-glib-aux/nm-gassert-patch.h \ + src/libnm-glib-aux/nm-glib.h \ + src/libnm-glib-aux/nm-hash-utils.c \ + src/libnm-glib-aux/nm-hash-utils.h \ + src/libnm-glib-aux/nm-io-utils.c \ + src/libnm-glib-aux/nm-io-utils.h \ + src/libnm-glib-aux/nm-jansson.h \ + src/libnm-glib-aux/nm-json-aux.c \ + src/libnm-glib-aux/nm-json-aux.h \ + src/libnm-glib-aux/nm-keyfile-aux.c \ + src/libnm-glib-aux/nm-keyfile-aux.h \ + src/libnm-glib-aux/nm-logging-base.c \ + src/libnm-glib-aux/nm-logging-base.h \ + src/libnm-glib-aux/nm-logging-fwd.h \ + src/libnm-glib-aux/nm-logging-syslog.h \ + src/libnm-glib-aux/nm-macros-internal.h \ + src/libnm-glib-aux/nm-obj.h \ + src/libnm-glib-aux/nm-random-utils.c \ + src/libnm-glib-aux/nm-random-utils.h \ + src/libnm-glib-aux/nm-ref-string.c \ + src/libnm-glib-aux/nm-ref-string.h \ + src/libnm-glib-aux/nm-secret-utils.c \ + src/libnm-glib-aux/nm-secret-utils.h \ + src/libnm-glib-aux/nm-shared-utils.c \ + src/libnm-glib-aux/nm-shared-utils.h \ + src/libnm-glib-aux/nm-str-buf.h \ + src/libnm-glib-aux/nm-test-utils.h \ + src/libnm-glib-aux/nm-time-utils.c \ + src/libnm-glib-aux/nm-time-utils.h \ + src/libnm-glib-aux/nm-value-type.h \ $(NULL) -shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \ +src_libnm_glib_aux_libnm_glib_aux_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \ +src_libnm_glib_aux_libnm_glib_aux_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) +EXTRA_DIST += src/libnm-glib-aux/meson.build + ############################################################################### -noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la +noinst_LTLIBRARIES += src/libnm-udev-aux/libnm-udev-aux.la -shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \ - $(shared_nm_glib_aux_cppflags) \ +src_libnm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \ + $(src_libnm_glib_aux_cppflags) \ $(LIBUDEV_CFLAGS) \ $(NULL) -shared_nm_udev_aux_libnm_udev_aux_la_SOURCES = \ - shared/nm-udev-aux/nm-udev-utils.c \ - shared/nm-udev-aux/nm-udev-utils.h \ +src_libnm_udev_aux_libnm_udev_aux_la_SOURCES = \ + src/libnm-udev-aux/nm-udev-utils.c \ + src/libnm-udev-aux/nm-udev-utils.h \ $(NULL) -shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \ +src_libnm_udev_aux_libnm_udev_aux_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \ +src_libnm_udev_aux_libnm_udev_aux_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ $(NULL) +EXTRA_DIST += src/libnm-udev-aux/meson.build + ############################################################################### -noinst_LTLIBRARIES += shared/nm-base/libnm-base.la +noinst_LTLIBRARIES += src/libnm-base/libnm-base.la -shared_nm_base_libnm_base_la_CPPFLAGS = \ - $(shared_nm_glib_aux_cppflags) \ +src_libnm_base_libnm_base_la_CPPFLAGS = \ + $(src_libnm_glib_aux_cppflags) \ + -I$(srcdir)/src \ + -I$(builddir)/src \ $(NULL) -shared_nm_base_libnm_base_la_SOURCES = \ - shared/nm-base/nm-base.h \ - shared/nm-base/nm-ethtool-base.c \ - shared/nm-base/nm-ethtool-base.h \ - shared/nm-base/nm-ethtool-utils-base.h \ +src_libnm_base_libnm_base_la_SOURCES = \ + src/libnm-base/nm-base.h \ + src/libnm-base/nm-ethtool-base.c \ + src/libnm-base/nm-ethtool-base.h \ + src/libnm-base/nm-ethtool-utils-base.h \ $(NULL) -shared_nm_base_libnm_base_la_LDFLAGS = \ +src_libnm_base_libnm_base_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_base_libnm_base_la_LIBADD = \ +src_libnm_base_libnm_base_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) +EXTRA_DIST += src/libnm-base/meson.build + ############################################################################### -noinst_LTLIBRARIES += shared/nm-log-core/libnm-log-core.la +noinst_LTLIBRARIES += src/libnm-log-core/libnm-log-core.la -shared_nm_log_core_libnm_log_core_la_CPPFLAGS = \ +src_libnm_log_core_libnm_log_core_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(GLIB_CFLAGS) \ $(SYSTEMD_JOURNAL_CFLAGS) \ $(NULL) -shared_nm_log_core_libnm_log_core_la_SOURCES = \ - shared/nm-log-core/nm-logging.c \ - shared/nm-log-core/nm-logging.h \ +src_libnm_log_core_libnm_log_core_la_SOURCES = \ + src/libnm-log-core/nm-logging.c \ + src/libnm-log-core/nm-logging.h \ $(NULL) -shared_nm_log_core_libnm_log_core_la_LDFLAGS = \ +src_libnm_log_core_libnm_log_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_log_core_libnm_log_core_la_LIBADD = \ +src_libnm_log_core_libnm_log_core_la_LIBADD = \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(NULL) +EXTRA_DIST += src/libnm-log-core/meson.build + +noinst_LTLIBRARIES += src/libnm-log-null/libnm-log-null.la + +src_libnm_log_null_libnm_log_null_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/src \ + -I$(builddir)/src \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(NULL) + +src_libnm_log_null_libnm_log_null_la_SOURCES = \ + src/libnm-log-null/nm-logging-null.c \ + $(NULL) + +src_libnm_log_null_libnm_log_null_la_LIBADD = \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) \ + $(NULL) + +EXTRA_DIST += src/libnm-log-null/meson.build + ############################################################################### -noinst_LTLIBRARIES += shared/nm-platform/libnm-platform.la +noinst_LTLIBRARIES += src/libnm-platform/libnm-platform.la -shared_nm_platform_libnm_platform_la_CPPFLAGS = \ - $(shared_nm_glib_aux_cppflags) \ +src_libnm_platform_libnm_platform_la_CPPFLAGS = \ + $(src_libnm_glib_aux_cppflags) \ + -I$(srcdir)/src \ + -I$(builddir)/src \ $(NULL) -shared_nm_platform_libnm_platform_la_SOURCES = \ - shared/nm-platform/nm-netlink.c \ - shared/nm-platform/nm-netlink.h \ - shared/nm-platform/nm-platform-utils.c \ - shared/nm-platform/nm-platform-utils.h \ - shared/nm-platform/nmp-base.h \ - shared/nm-platform/nmp-netns.c \ - shared/nm-platform/nmp-netns.h \ +src_libnm_platform_libnm_platform_la_SOURCES = \ + src/libnm-platform/nm-netlink.c \ + src/libnm-platform/nm-netlink.h \ + src/libnm-platform/nm-platform-utils.c \ + src/libnm-platform/nm-platform-utils.h \ + src/libnm-platform/nmp-base.h \ + src/libnm-platform/nmp-netns.c \ + src/libnm-platform/nmp-netns.h \ $(NULL) -shared_nm_platform_libnm_platform_la_LDFLAGS = \ +src_libnm_platform_libnm_platform_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_platform_libnm_platform_la_LIBADD = \ +src_libnm_platform_libnm_platform_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) +EXTRA_DIST += src/libnm-platform/meson.build + ############################################################################### -check_programs += shared/nm-platform/tests/test-nm-platform +check_programs += src/libnm-platform/tests/test-nm-platform -shared_nm_platform_tests_test_nm_platform_CPPFLAGS = \ +src_libnm_platform_tests_test_nm_platform_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(SYSTEMD_JOURNAL_CFLAGS) \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -shared_nm_platform_tests_test_nm_platform_LDFLAGS = \ +src_libnm_platform_tests_test_nm_platform_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -shared_nm_platform_tests_test_nm_platform_LDADD = \ - shared/nm-platform/libnm-platform.la \ - shared/nm-log-core/libnm-log-core.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ +src_libnm_platform_tests_test_nm_platform_LDADD = \ + src/libnm-platform/libnm-platform.la \ + src/libnm-log-core/libnm-log-core.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(SYSTEMD_JOURNAL_LIBS) \ $(GLIB_LIBS) \ $(NULL) EXTRA_DIST += \ - shared/nm-platform/tests/meson.build \ + src/libnm-platform/tests/meson.build \ $(NULL) ############################################################################### @@ -584,8 +630,8 @@ noinst_LTLIBRARIES += src/libnm-core-aux-intern/libnm-core-aux-intern.la src_libnm_core_aux_intern_libnm_core_aux_intern_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(builddir)/shared \ - -I$(srcdir)/shared \ + -I$(builddir)/src \ + -I$(srcdir)/src \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ $(CODE_COVERAGE_CFLAGS) \ @@ -623,8 +669,6 @@ noinst_LTLIBRARIES += src/libnm-core-aux-extern/libnm-core-aux-extern.la src_libnm_core_aux_extern_libnm_core_aux_extern_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(builddir)/shared \ - -I$(srcdir)/shared \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ -I$(srcdir)/src \ @@ -657,70 +701,109 @@ EXTRA_DIST += \ ############################################################################### -noinst_LTLIBRARIES += libnm/nm-libnm-aux/libnm-libnm-aux.la +noinst_LTLIBRARIES += src/libnm-client-aux-extern/libnm-client-aux-extern.la -libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \ +src_libnm_client_aux_extern_libnm_client_aux_extern_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -libnm_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \ - libnm/nm-libnm-aux/nm-libnm-aux.c \ - libnm/nm-libnm-aux/nm-libnm-aux.h \ +src_libnm_client_aux_extern_libnm_client_aux_extern_la_SOURCES = \ + src/libnm-client-aux-extern/nm-libnm-aux.c \ + src/libnm-client-aux-extern/nm-libnm-aux.h \ $(NULL) -libnm_nm_libnm_aux_libnm_libnm_aux_la_LDFLAGS = \ +src_libnm_client_aux_extern_libnm_client_aux_extern_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -libnm_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \ +src_libnm_client_aux_extern_libnm_client_aux_extern_la_LIBADD = \ $(GLIB_LIBS) \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(NULL) -$(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_lib_h_pub_mkenums) - -EXTRA_DIST += libnm/nm-libnm-aux/README.md - -############################################################################### +$(src_libnm_client_aux_extern_libnm_client_aux_extern_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_aux_extern_libnm_client_aux_extern_la_OBJECTS): $(src_libnm_client_public_mkenums_h) EXTRA_DIST += \ - shared/nm-glib-aux/tests/meson.build \ - shared/README.md \ + src/libnm-client-aux-extern/README.md \ + src/libnm-client-aux-extern/meson.build \ $(NULL) ############################################################################### -check_programs += shared/nm-glib-aux/tests/test-shared-general +noinst_LTLIBRARIES += src/libnm-client-test/libnm-client-test.la -shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \ +src_libnm_client_test_libnm_client_test_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -shared_nm_glib_aux_tests_test_shared_general_LDFLAGS = \ +src_libnm_client_test_libnm_client_test_la_SOURCES = \ + src/libnm-client-test/nm-test-libnm-utils.h \ + src/libnm-client-test/nm-test-utils-impl.c \ + $(NULL) + +src_libnm_client_test_libnm_client_test_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +src_libnm_client_test_libnm_client_test_la_LIBADD = \ + $(GLIB_LIBS) \ + $(NULL) + +$(src_libnm_client_test_libnm_client_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_test_libnm_client_test_la_OBJECTS): $(src_libnm_client_public_mkenums_h) + +EXTRA_DIST += \ + src/libnm-client-test/meson.build \ + $(NULL) + +############################################################################### + +EXTRA_DIST += \ + src/libnm-glib-aux/tests/meson.build \ + $(NULL) + +check_programs += src/libnm-glib-aux/tests/test-shared-general + +src_libnm_glib_aux_tests_test_shared_general_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/src \ + -I$(builddir)/src \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + $(NULL) + +src_libnm_glib_aux_tests_test_shared_general_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -shared_nm_glib_aux_tests_test_shared_general_LDADD = \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ +src_libnm_glib_aux_tests_test_shared_general_LDADD = \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-log-null/libnm-log-null.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -728,28 +811,29 @@ shared_nm_glib_aux_tests_test_shared_general_LDADD = \ if WITH_JANSSON -check_programs += shared/nm-glib-aux/tests/test-json-aux +check_programs += src/libnm-glib-aux/tests/test-json-aux -shared_nm_glib_aux_tests_test_json_aux_CPPFLAGS = \ +src_libnm_glib_aux_tests_test_json_aux_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(JANSSON_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -shared_nm_glib_aux_tests_test_json_aux_LDFLAGS = \ +src_libnm_glib_aux_tests_test_json_aux_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -shared_nm_glib_aux_tests_test_json_aux_LDADD = \ +src_libnm_glib_aux_tests_test_json_aux_LDADD = \ $(JANSSON_LIBS) \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-log-null/libnm-log-null.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -988,8 +1072,8 @@ dbusinterfaces_DATA = \ CLEANFILES += $(introspection_sources) CLEANFILES += $(DBUS_INTERFACE_DOCS) -$(libnm_libnm_static_la_OBJECTS): $(introspection_sources) -$(libnm_libnm_la_OBJECTS): $(introspection_sources) +$(src_libnm_client_impl_libnm_client_impl_la_OBJECTS): $(introspection_sources) +$(src_libnm_client_impl_libnm_la_OBJECTS): $(introspection_sources) EXTRA_DIST += \ $(dbusinterfaces_DATA) \ @@ -1183,8 +1267,6 @@ EXTRA_DIST += \ dflt_cppflags_libnm_core = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ -I$(srcdir)/src \ @@ -1196,6 +1278,9 @@ dflt_cppflags_libnm_core = \ noinst_LTLIBRARIES += src/libnm-core-impl/libnm-core-impl.la +src/libnm-client-public/nm-enum-types.h.stamp: src/libnm-client-public/.dirstamp +src/libnm-client-public/nm-enum-types.c.stamp: src/libnm-client-public/.dirstamp + GLIB_GENERATED += \ $(src_libnm_core_public_mkenums_h) \ $(src_libnm_core_public_mkenums_c) \ @@ -1210,8 +1295,8 @@ src/libnm-core-public/nm-core-enum-types.c.stamp: src/ $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) $(dispatcher_nm_dispatcher_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_core_impl_libnm_core_impl_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_libnm_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_impl_libnm_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_contrib_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_NetworkManager_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(src_libnm_core_public_mkenums_h) @@ -1333,6 +1418,8 @@ src_libnm_core_impl_tests_cppflags = \ -I$(builddir)/src/libnm-core-impl/tests \ -I$(srcdir)/src/libnm-core-impl/tests \ -I$(srcdir)/src/libnm-core-impl \ + -I$(srcdir)/src/ \ + -I$(builddir)/src/ \ $(dflt_cppflags_libnm_core) \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) @@ -1360,12 +1447,12 @@ src_libnm_core_impl_tests_ldadd = \ src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-base/libnm-base.la \ - shared/systemd/libnm-systemd-shared.la \ - shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-base/libnm-base.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ + src/libnm-log-null/libnm-log-null.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -1433,277 +1520,280 @@ EXTRA_DIST += \ ############################################################################### libnm_lib_h_pub_real = \ - libnm/NetworkManager.h \ - libnm/nm-access-point.h \ - libnm/nm-active-connection.h \ - libnm/nm-autoptr.h \ - libnm/nm-checkpoint.h \ - libnm/nm-client.h \ - libnm/nm-device-6lowpan.h \ - libnm/nm-device-adsl.h \ - libnm/nm-device-bond.h \ - libnm/nm-device-bridge.h \ - libnm/nm-device-bt.h \ - libnm/nm-device-dummy.h \ - libnm/nm-device-ethernet.h \ - libnm/nm-device-generic.h \ - libnm/nm-device-infiniband.h \ - libnm/nm-device-ip-tunnel.h \ - libnm/nm-device-macsec.h \ - libnm/nm-device-macvlan.h \ - libnm/nm-device-modem.h \ - libnm/nm-device-olpc-mesh.h \ - libnm/nm-device-ovs-bridge.h \ - libnm/nm-device-ovs-interface.h \ - libnm/nm-device-ovs-port.h \ - libnm/nm-device-ppp.h \ - libnm/nm-device-team.h \ - libnm/nm-device-tun.h \ - libnm/nm-device-veth.h \ - libnm/nm-device-vlan.h \ - libnm/nm-device-vrf.h \ - libnm/nm-device-vxlan.h \ - libnm/nm-device-wifi-p2p.h \ - libnm/nm-device-wifi.h \ - libnm/nm-device-wimax.h \ - libnm/nm-device-wireguard.h \ - libnm/nm-device-wpan.h \ - libnm/nm-device.h \ - libnm/nm-dhcp-config.h \ - libnm/nm-ethtool-utils.h \ - libnm/nm-ip-config.h \ - libnm/nm-object.h \ - libnm/nm-remote-connection.h \ - libnm/nm-secret-agent-old.h \ - libnm/nm-types.h \ - libnm/nm-vpn-connection.h \ - libnm/nm-vpn-editor.h \ - libnm/nm-vpn-plugin-old.h \ - libnm/nm-vpn-service-plugin.h \ - libnm/nm-wifi-p2p-peer.h \ - libnm/nm-wimax-nsp.h -libnm_lib_h_pub_mkenums = \ - libnm/nm-enum-types.h + src/libnm-client-public/NetworkManager.h \ + src/libnm-client-public/nm-access-point.h \ + src/libnm-client-public/nm-active-connection.h \ + src/libnm-client-public/nm-autoptr.h \ + src/libnm-client-public/nm-checkpoint.h \ + src/libnm-client-public/nm-client.h \ + src/libnm-client-public/nm-device-6lowpan.h \ + src/libnm-client-public/nm-device-adsl.h \ + src/libnm-client-public/nm-device-bond.h \ + src/libnm-client-public/nm-device-bridge.h \ + src/libnm-client-public/nm-device-bt.h \ + src/libnm-client-public/nm-device-dummy.h \ + src/libnm-client-public/nm-device-ethernet.h \ + src/libnm-client-public/nm-device-generic.h \ + src/libnm-client-public/nm-device-infiniband.h \ + src/libnm-client-public/nm-device-ip-tunnel.h \ + src/libnm-client-public/nm-device-macsec.h \ + src/libnm-client-public/nm-device-macvlan.h \ + src/libnm-client-public/nm-device-modem.h \ + src/libnm-client-public/nm-device-olpc-mesh.h \ + src/libnm-client-public/nm-device-ovs-bridge.h \ + src/libnm-client-public/nm-device-ovs-interface.h \ + src/libnm-client-public/nm-device-ovs-port.h \ + src/libnm-client-public/nm-device-ppp.h \ + src/libnm-client-public/nm-device-team.h \ + src/libnm-client-public/nm-device-tun.h \ + src/libnm-client-public/nm-device-veth.h \ + src/libnm-client-public/nm-device-vlan.h \ + src/libnm-client-public/nm-device-vrf.h \ + src/libnm-client-public/nm-device-vxlan.h \ + src/libnm-client-public/nm-device-wifi-p2p.h \ + src/libnm-client-public/nm-device-wifi.h \ + src/libnm-client-public/nm-device-wimax.h \ + src/libnm-client-public/nm-device-wireguard.h \ + src/libnm-client-public/nm-device-wpan.h \ + src/libnm-client-public/nm-device.h \ + src/libnm-client-public/nm-dhcp-config.h \ + src/libnm-client-public/nm-ethtool-utils.h \ + src/libnm-client-public/nm-ip-config.h \ + src/libnm-client-public/nm-object.h \ + src/libnm-client-public/nm-remote-connection.h \ + src/libnm-client-public/nm-secret-agent-old.h \ + src/libnm-client-public/nm-types.h \ + src/libnm-client-public/nm-vpn-connection.h \ + src/libnm-client-public/nm-vpn-editor.h \ + src/libnm-client-public/nm-vpn-plugin-old.h \ + src/libnm-client-public/nm-vpn-service-plugin.h \ + src/libnm-client-public/nm-wifi-p2p-peer.h \ + src/libnm-client-public/nm-wimax-nsp.h \ + $(NULL) +src_libnm_client_public_mkenums_h = \ + src/libnm-client-public/nm-enum-types.h \ + $(NULL) libnm_lib_h_priv = \ - libnm/nm-dbus-helpers.h \ - libnm/nm-default-client.h \ - libnm/nm-default-libnm.h \ - libnm/nm-device-private.h \ - libnm/nm-dhcp4-config.h \ - libnm/nm-dhcp6-config.h \ - libnm/nm-dns-manager.h \ - libnm/nm-ip4-config.h \ - libnm/nm-ip6-config.h \ - libnm/nm-libnm-utils.h \ - libnm/nm-object-private.h \ - libnm/nm-remote-connection-private.h \ + src/libnm-client-impl/nm-dbus-helpers.h \ + src/libnm-client-aux-extern/nm-default-client.h \ + src/libnm-client-impl/nm-default-libnm.h \ + src/libnm-client-impl/nm-device-private.h \ + src/libnm-client-impl/nm-dhcp4-config.h \ + src/libnm-client-impl/nm-dhcp6-config.h \ + src/libnm-client-impl/nm-dns-manager.h \ + src/libnm-client-impl/nm-ip4-config.h \ + src/libnm-client-impl/nm-ip6-config.h \ + src/libnm-client-impl/nm-libnm-utils.h \ + src/libnm-client-impl/nm-object-private.h \ + src/libnm-client-impl/nm-remote-connection-private.h \ $(NULL) libnm_lib_c_real = \ - libnm/nm-client.c \ - libnm/nm-object.c \ - libnm/nm-device.c \ - libnm/nm-active-connection.c \ + src/libnm-client-impl/nm-client.c \ + src/libnm-client-impl/nm-object.c \ + src/libnm-client-impl/nm-device.c \ + src/libnm-client-impl/nm-active-connection.c \ \ - libnm/nm-access-point.c \ - libnm/nm-checkpoint.c \ - libnm/nm-dbus-helpers.c \ - libnm/nm-device-6lowpan.c \ - libnm/nm-device-adsl.c \ - libnm/nm-device-bond.c \ - libnm/nm-device-bridge.c \ - libnm/nm-device-bt.c \ - libnm/nm-device-dummy.c \ - libnm/nm-device-ethernet.c \ - libnm/nm-device-generic.c \ - libnm/nm-device-infiniband.c \ - libnm/nm-device-ip-tunnel.c \ - libnm/nm-device-macsec.c \ - libnm/nm-device-macvlan.c \ - libnm/nm-device-modem.c \ - libnm/nm-device-olpc-mesh.c \ - libnm/nm-device-ovs-bridge.c \ - libnm/nm-device-ovs-interface.c \ - libnm/nm-device-ovs-port.c \ - libnm/nm-device-ppp.c \ - libnm/nm-device-team.c \ - libnm/nm-device-tun.c \ - libnm/nm-device-veth.c \ - libnm/nm-device-vlan.c \ - libnm/nm-device-vrf.c \ - libnm/nm-device-vxlan.c \ - libnm/nm-device-wifi-p2p.c \ - libnm/nm-device-wifi.c \ - libnm/nm-device-wimax.c \ - libnm/nm-device-wireguard.c \ - libnm/nm-device-wpan.c \ - libnm/nm-dhcp-config.c \ - libnm/nm-dhcp4-config.c \ - libnm/nm-dhcp6-config.c \ - libnm/nm-dns-manager.c \ - libnm/nm-ip-config.c \ - libnm/nm-ip4-config.c \ - libnm/nm-ip6-config.c \ - libnm/nm-libnm-utils.c \ - libnm/nm-remote-connection.c \ - libnm/nm-secret-agent-old.c \ - libnm/nm-vpn-connection.c \ - libnm/nm-vpn-editor.c \ - libnm/nm-vpn-plugin-old.c \ - libnm/nm-vpn-service-plugin.c \ - libnm/nm-wifi-p2p-peer.c \ - libnm/nm-wimax-nsp.c \ + src/libnm-client-impl/nm-access-point.c \ + src/libnm-client-impl/nm-checkpoint.c \ + src/libnm-client-impl/nm-dbus-helpers.c \ + src/libnm-client-impl/nm-device-6lowpan.c \ + src/libnm-client-impl/nm-device-adsl.c \ + src/libnm-client-impl/nm-device-bond.c \ + src/libnm-client-impl/nm-device-bridge.c \ + src/libnm-client-impl/nm-device-bt.c \ + src/libnm-client-impl/nm-device-dummy.c \ + src/libnm-client-impl/nm-device-ethernet.c \ + src/libnm-client-impl/nm-device-generic.c \ + src/libnm-client-impl/nm-device-infiniband.c \ + src/libnm-client-impl/nm-device-ip-tunnel.c \ + src/libnm-client-impl/nm-device-macsec.c \ + src/libnm-client-impl/nm-device-macvlan.c \ + src/libnm-client-impl/nm-device-modem.c \ + src/libnm-client-impl/nm-device-olpc-mesh.c \ + src/libnm-client-impl/nm-device-ovs-bridge.c \ + src/libnm-client-impl/nm-device-ovs-interface.c \ + src/libnm-client-impl/nm-device-ovs-port.c \ + src/libnm-client-impl/nm-device-ppp.c \ + src/libnm-client-impl/nm-device-team.c \ + src/libnm-client-impl/nm-device-tun.c \ + src/libnm-client-impl/nm-device-veth.c \ + src/libnm-client-impl/nm-device-vlan.c \ + src/libnm-client-impl/nm-device-vrf.c \ + src/libnm-client-impl/nm-device-vxlan.c \ + src/libnm-client-impl/nm-device-wifi-p2p.c \ + src/libnm-client-impl/nm-device-wifi.c \ + src/libnm-client-impl/nm-device-wimax.c \ + src/libnm-client-impl/nm-device-wireguard.c \ + src/libnm-client-impl/nm-device-wpan.c \ + src/libnm-client-impl/nm-dhcp-config.c \ + src/libnm-client-impl/nm-dhcp4-config.c \ + src/libnm-client-impl/nm-dhcp6-config.c \ + src/libnm-client-impl/nm-dns-manager.c \ + src/libnm-client-impl/nm-ip-config.c \ + src/libnm-client-impl/nm-ip4-config.c \ + src/libnm-client-impl/nm-ip6-config.c \ + src/libnm-client-impl/nm-libnm-utils.c \ + src/libnm-client-impl/nm-remote-connection.c \ + src/libnm-client-impl/nm-secret-agent-old.c \ + src/libnm-client-impl/nm-vpn-connection.c \ + src/libnm-client-impl/nm-vpn-editor.c \ + src/libnm-client-impl/nm-vpn-plugin-old.c \ + src/libnm-client-impl/nm-vpn-service-plugin.c \ + src/libnm-client-impl/nm-wifi-p2p-peer.c \ + src/libnm-client-impl/nm-wimax-nsp.c \ + $(NULL) +src_libnm_client_public_mkenums_c = \ + src/libnm-client-public/nm-enum-types.c \ $(NULL) -libnm_lib_c_mkenums = \ - libnm/nm-enum-types.c libnminclude_HEADERS += \ $(libnm_lib_h_pub_real) nodist_libnminclude_HEADERS += \ - $(libnm_lib_h_pub_mkenums) + $(src_libnm_client_public_mkenums_h) ############################################################################### -noinst_LTLIBRARIES += libnm/libnm_static.la +noinst_LTLIBRARIES += src/libnm-client-impl/libnm-client-impl.la -libnm_libnm_static_la_CPPFLAGS = \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ +src_libnm_client_impl_libnm_client_impl_la_CPPFLAGS = \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ $(dflt_cppflags_libnm_core) \ $(INTROSPECTION_CFLAGS) \ $(NULL) -libnm_libnm_static_la_SOURCES = \ +src_libnm_client_impl_libnm_client_impl_la_SOURCES = \ $(libnm_lib_c_real) \ $(NULL) -nodist_libnm_libnm_static_la_SOURCES = \ - $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_c_mkenums) \ +nodist_src_libnm_client_impl_libnm_client_impl_la_SOURCES = \ + $(src_libnm_client_public_mkenums_h) \ + $(src_libnm_client_public_mkenums_c) \ $(NULL) -libnm_libnm_static_la_LIBADD = \ +src_libnm_client_impl_libnm_client_impl_la_LIBADD = \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-base/libnm-base.la \ + src/libnm-base/libnm-base.la \ introspection/libnmdbus.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/systemd/libnm-systemd-shared.la \ - shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-udev-aux/libnm-udev-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ + src/libnm-log-null/libnm-log-null.la \ + src/libnm-udev-aux/libnm-udev-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(DL_LIBS) \ $(UUID_LIBS) \ $(LIBUDEV_LIBS) \ $(NULL) -$(libnm_libnm_static_la_OBJECTS) : $(libnm_lib_h_pub_mkenums) -$(libnm_libnm_static_la_OBJECTS) : $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_impl_libnm_client_impl_la_OBJECTS) : $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_libnm_client_impl_la_OBJECTS) : $(src_libnm_core_public_mkenums_h) ############################################################################### -lib_LTLIBRARIES += libnm/libnm.la +lib_LTLIBRARIES += src/libnm-client-impl/libnm.la GLIB_GENERATED += \ - $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_c_mkenums) + $(src_libnm_client_public_mkenums_h) \ + $(src_libnm_client_public_mkenums_c) nm_enum_types_sources = \ - $(libnm_lib_h_pub_mkenums) \ + $(src_libnm_client_public_mkenums_h) \ $(libnm_lib_h_pub_real) nm_enum_types_MKENUMS_H_FLAGS = --fhead '\#include "nm-core-enum-types.h"\n' -nm_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "libnm/nm-default-libnm.h"\n' +nm_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "libnm-client-impl/nm-default-libnm.h"\n' -$(dispatcher_nm_dispatcher_OBJECTS): $(libnm_lib_h_pub_mkenums) -$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_lib_h_pub_mkenums) -$(libnm_libnm_la_OBJECTS): $(libnm_lib_h_pub_mkenums) -$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(dispatcher_nm_dispatcher_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_libnm_la_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_contrib_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_client_public_mkenums_h) -libnm_libnm_la_CPPFLAGS = \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ +src_libnm_client_impl_libnm_la_CPPFLAGS = \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ $(dflt_cppflags_libnm_core) \ $(LIBUDEV_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -libnm_libnm_la_SOURCES = \ +src_libnm_client_impl_libnm_la_SOURCES = \ $(libnm_lib_h_pub_real) \ $(libnm_lib_h_priv) \ $(NULL) -EXTRA_libnm_libnm_la_DEPENDENCIES = \ - libnm/libnm.ver +EXTRA_src_libnm_client_impl_libnm_la_DEPENDENCIES = \ + src/libnm-client-impl/libnm.ver -libnm_libnm_la_LIBADD = \ - libnm/libnm_static.la \ +src_libnm_client_impl_libnm_la_LIBADD = \ + src/libnm-client-impl/libnm-client-impl.la \ $(NULL) -libnm_libnm_la_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ +src_libnm_client_impl_libnm_la_LDFLAGS = \ + -Wl,--version-script="$(srcdir)/src/libnm-client-impl/libnm.ver" \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ -version-info "1:0:1" -check-local-exports-libnm: libnm/libnm.la - $(srcdir)/tools/check-exports.sh "$(builddir)/libnm/.libs/libnm.so" "$(srcdir)/libnm/libnm.ver" +check-local-exports-libnm: src/libnm-client-impl/libnm.la + $(srcdir)/tools/check-exports.sh "$(builddir)/src/libnm-client-impl/.libs/libnm.so" "$(srcdir)/src/libnm-client-impl/libnm.ver" check_local += check-local-exports-libnm -pkgconfig_DATA += libnm/libnm.pc +pkgconfig_DATA += src/libnm-client-impl/libnm.pc DISTCLEANFILES += \ - libnm/libnm.pc + src/libnm-client-impl/libnm.pc EXTRA_DIST += \ - libnm/nm-enum-types.c.template \ - libnm/nm-enum-types.h.template \ + src/libnm-client-public/nm-enum-types.c.template \ + src/libnm-client-public/nm-enum-types.h.template \ \ - libnm/libnm.pc.in \ - libnm/libnm.ver + src/libnm-client-impl/libnm.pc.in \ + src/libnm-client-impl/libnm.ver -libnm_NM_1_0_typelib = +src_libnm_client_impl_NM_1_0_typelib = if HAVE_INTROSPECTION -libnm_NM_1_0_typelib += libnm/NM-1.0.typelib +src_libnm_client_impl_NM_1_0_typelib += src/libnm-client-impl/NM-1.0.typelib -libnm/NM-1.0.gir: libnm/libnm.la -libnm_NM_1_0_gir_INCLUDES = Gio-2.0 -libnm_NM_1_0_gir_PACKAGES = gio-2.0 -libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm -libnm_NM_1_0_gir_CFLAGS = \ - $(libnm_libnm_la_CPPFLAGS) \ +src/libnm-client-impl/NM-1.0.gir: src/libnm-client-impl/libnm.la +src_libnm_client_impl_NM_1_0_gir_INCLUDES = Gio-2.0 +src_libnm_client_impl_NM_1_0_gir_PACKAGES = gio-2.0 +src_libnm_client_impl_NM_1_0_gir_EXPORT_PACKAGES = libnm +src_libnm_client_impl_NM_1_0_gir_CFLAGS = \ + $(src_libnm_client_impl_libnm_la_CPPFLAGS) \ -DNETWORKMANAGER_COMPILATION \ $(NULL) -libnm_NM_1_0_gir_LIBS = libnm/libnm.la -libnm_NM_1_0_gir_FILES = \ +src_libnm_client_impl_NM_1_0_gir_LIBS = src/libnm-client-impl/libnm.la +src_libnm_client_impl_NM_1_0_gir_FILES = \ $(src_libnm_core_public_mkenums_h) \ $(src_libnm_core_impl_lib_h_pub_real) \ $(src_libnm_core_public_mkenums_c) \ $(src_libnm_core_impl_lib_c_real) \ - $(libnm_lib_h_pub_mkenums) \ + $(src_libnm_client_public_mkenums_h) \ $(libnm_lib_h_pub_real) \ - $(libnm_lib_c_mkenums) \ + $(src_libnm_client_public_mkenums_c) \ $(libnm_lib_c_real) -libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm +src_libnm_client_impl_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm -libnm/libnm.typelib: libnm/libnm.gir - $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/src/libnm-core-public --includedir=$(builddir)/src/libnm-core-public --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ +src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir + $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/src/libnm-core-public --includedir=$(builddir)/src/libnm-core-public --includedir=$(srcdir)/libnm-client-public --includedir=$(builddir)/libnm-client-public $< -o $@ -INTROSPECTION_GIRS += libnm/NM-1.0.gir +INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir libnm_noinst_data = \ clients/cli/generate-docs-nm-settings-nmcli.xml \ - libnm/nm-property-infos-dbus.xml \ - libnm/nm-property-infos-ifcfg-rh.xml \ - libnm/nm-property-infos-keyfile.xml \ - libnm/nm-property-infos-nmcli.xml \ - libnm/nm-settings-docs-gir.xml \ + src/libnm-client-impl/nm-property-infos-dbus.xml \ + src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml \ + src/libnm-client-impl/nm-property-infos-keyfile.xml \ + src/libnm-client-impl/nm-property-infos-nmcli.xml \ + src/libnm-client-impl/nm-settings-docs-gir.xml \ man/nm-settings-docs-dbus.xml \ man/nm-settings-docs-nmcli.xml \ $(NULL) @@ -1727,26 +1817,26 @@ endif libnm_docs_sources = $(src_libnm_core_impl_lib_c_settings_real) -libnm/nm-property-infos-%.xml: tools/generate-docs-nm-property-infos.pl $(libnm_docs_sources) +src/libnm-client-impl/nm-property-infos-%.xml: tools/generate-docs-nm-property-infos.pl $(libnm_docs_sources) $(AM_V_GEN) $(srcdir)/tools/generate-docs-nm-property-infos.pl $(patsubst nm-property-infos-%.xml,%,$(notdir $@)) $@ $(filter-out $<,$^) -libnm/nm-settings-docs-gir.xml: tools/generate-docs-nm-settings-docs-gir.py libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la $(libnm_docs_sources) +src/libnm-client-impl/nm-settings-docs-gir.xml: tools/generate-docs-nm-settings-docs-gir.py src/libnm-client-impl/NM-1.0.gir src/libnm-client-impl/NM-1.0.typelib src/libnm-client-impl/libnm.la $(libnm_docs_sources) $(AM_V_GEN) \ - export GI_TYPELIB_PATH=$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ - export LD_LIBRARY_PATH=$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ - $(call set_sanitizer_env,$(abs_builddir)/libnm/.libs/libnm.so); \ + export GI_TYPELIB_PATH=$(abs_builddir)/src/libnm-client-impl$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ + export LD_LIBRARY_PATH=$(abs_builddir)/src/libnm-client-impl/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ + $(call set_sanitizer_env,$(abs_builddir)/src/libnm-client-impl/.libs/libnm.so); \ "$(PYTHON)" \ $(srcdir)/tools/generate-docs-nm-settings-docs-gir.py \ - --gir $(builddir)/libnm/NM-1.0.gir \ + --gir $(builddir)/src/libnm-client-impl/NM-1.0.gir \ --output $@ -man/nm-settings-docs-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli.xml libnm/nm-property-infos-nmcli.xml libnm/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent +man/nm-settings-docs-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli.xml src/libnm-client-impl/nm-property-infos-nmcli.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py --only-from-first $@ $(wordlist 1,3,$^) -clients/common/settings-docs-input.xml: libnm/nm-property-infos-nmcli.xml libnm/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py +clients/common/settings-docs-input.xml: src/libnm-client-impl/nm-property-infos-nmcli.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^) -man/nm-settings-docs-%.xml: libnm/nm-property-infos-%.xml libnm/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent +man/nm-settings-docs-%.xml: src/libnm-client-impl/nm-property-infos-%.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^) EXTRA_DIST += $(libnm_noinst_data) @@ -1758,114 +1848,106 @@ EXTRA_DIST += \ tools/generate-docs-nm-property-infos.pl \ tools/generate-docs-nm-settings-docs-merge.py \ tools/generate-docs-nm-settings-docs-gir.py \ - libnm/meson.build \ + src/libnm-client-impl/meson.build \ $(NULL) ############################################################################### -check_programs += libnm/tests/test-libnm +check_programs += src/libnm-client-impl/tests/test-libnm -libnm_tests_programs_req_introspection = \ - libnm/tests/test-nm-client \ - libnm/tests/test-remote-settings-client \ - libnm/tests/test-secret-agent +src_libnm_client_impl_tests_programs_req_introspection = \ + src/libnm-client-impl/tests/test-nm-client \ + src/libnm-client-impl/tests/test-remote-settings-client \ + src/libnm-client-impl/tests/test-secret-agent if HAVE_INTROSPECTION -check_programs += $(libnm_tests_programs_req_introspection) +check_programs += $(src_libnm_client_impl_tests_programs_req_introspection) else -check_programs_norun += $(libnm_tests_programs_req_introspection) +check_programs_norun += $(src_libnm_client_impl_tests_programs_req_introspection) endif -libnm_tests_cppflags = \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ +src_libnm_client_impl_tests_cppflags = \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(dflt_cppflags_libnm_core) \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) -libnm_tests_ldadd = \ - libnm/libnm_static.la \ +src_libnm_client_impl_tests_ldadd = \ + src/libnm-client-test/libnm-client-test.la \ + src/libnm-client-impl/libnm-client-impl.la \ $(GLIB_LIBS) \ $(NULL) -libnm_tests_ldflags = \ +src_libnm_client_impl_tests_ldflags = \ $(SANITIZER_EXEC_LDFLAGS) -libnm_tests_test_libnm_CPPFLAGS = $(libnm_tests_cppflags) -libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags) -libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags) -libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags) +src_libnm_client_impl_tests_test_libnm_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags) +src_libnm_client_impl_tests_test_nm_client_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags) +src_libnm_client_impl_tests_test_remote_settings_client_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags) +src_libnm_client_impl_tests_test_secret_agent_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags) -libnm_tests_test_libnm_SOURCES = \ - shared/nm-utils/nm-compat.c \ - libnm/tests/test-libnm.c \ +src_libnm_client_impl_tests_test_libnm_SOURCES = \ + src/contrib/nm-compat.c \ + src/contrib/nm-compat.h \ + src/libnm-client-impl/tests/test-libnm.c \ $(NULL) -libnm_tests_test_nm_client_SOURCES = \ - shared/nm-test-utils-impl.c \ - shared/nm-test-libnm-utils.h \ - libnm/tests/test-nm-client.c +src_libnm_client_impl_tests_test_libnm_LDADD = $(src_libnm_client_impl_tests_ldadd) +src_libnm_client_impl_tests_test_nm_client_LDADD = $(src_libnm_client_impl_tests_ldadd) +src_libnm_client_impl_tests_test_remote_settings_client_LDADD = $(src_libnm_client_impl_tests_ldadd) +src_libnm_client_impl_tests_test_secret_agent_LDADD = $(src_libnm_client_impl_tests_ldadd) -libnm_tests_test_remote_settings_client_SOURCES = \ - shared/nm-test-utils-impl.c \ - shared/nm-test-libnm-utils.h \ - libnm/tests/test-remote-settings-client.c +src_libnm_client_impl_tests_test_libnm_LDFLAGS = $(src_libnm_client_impl_tests_ldflags) +src_libnm_client_impl_tests_test_nm_client_LDFLAGS = $(src_libnm_client_impl_tests_ldflags) +src_libnm_client_impl_tests_test_remote_settings_client_LDFLAGS = $(src_libnm_client_impl_tests_ldflags) +src_libnm_client_impl_tests_test_secret_agent_LDFLAGS = $(src_libnm_client_impl_tests_ldflags) -libnm_tests_test_secret_agent_SOURCES = \ - shared/nm-test-utils-impl.c \ - shared/nm-test-libnm-utils.h \ - libnm/tests/test-secret-agent.c - -libnm_tests_test_libnm_LDADD = $(libnm_tests_ldadd) -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) - -libnm_tests_test_libnm_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags) - -$(libnm_tests_test_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_tests_test_nm_client_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_tests_test_remote_settings_client_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_tests_test_secret_agent_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_impl_tests_test_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_tests_test_nm_client_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_tests_test_remote_settings_client_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_tests_test_secret_agent_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) # tools/test-networkmanager-service.py uses libnm's typelib. Ensure it # is built first. -$(libnm_tests_test_nm_client_OBJECTS): $(libnm_NM_1_0_typelib) -$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib) -$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_NM_1_0_typelib) +$(src_libnm_client_impl_tests_test_nm_client_OBJECTS): $(src_libnm_client_impl_NM_1_0_typelib) +$(src_libnm_client_impl_tests_test_remote_settings_client_OBJECTS): $(src_libnm_client_impl_NM_1_0_typelib) +$(src_libnm_client_impl_tests_test_secret_agent_OBJECTS): $(src_libnm_client_impl_NM_1_0_typelib) + +EXTRA_DIST += \ + src/libnm-client-impl/tests/meson.build ############################################################################### # just test, that we can build "nm-vpn-plugin-utils.c" -check_ltlibraries += libnm/tests/libnm-vpn-plugin-utils-test.la +check_ltlibraries += src/contrib/tests/libnm-vpn-plugin-utils-test.la -libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \ - shared/nm-utils/nm-vpn-plugin-utils.c \ - shared/nm-utils/nm-vpn-plugin-utils.h \ +src_contrib_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \ + src/contrib/nm-vpn-plugin-utils.c \ + src/contrib/nm-vpn-plugin-utils.h \ $(NULL) -libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ +src_contrib_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) -libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ +src_contrib_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) EXTRA_DIST += \ - libnm/tests/meson.build + src/contrib/meson.build \ + src/contrib/tests/meson.build \ + $(NULL) ############################################################################### # src/core/ @@ -1928,169 +2010,154 @@ check_local += check-config-options libsystemd_cppflags = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/shared/systemd/ \ - -I$(srcdir)/shared/systemd/sd-adapt-shared \ - -I$(srcdir)/shared/systemd/src/basic \ - -I$(srcdir)/shared/systemd/src/shared \ + -I$(srcdir)/src/ \ + -I$(builddir)/src/ \ + -I$(srcdir)/src/libnm-systemd-shared/ \ + -I$(srcdir)/src/libnm-systemd-shared/sd-adapt-shared \ + -I$(srcdir)/src/libnm-systemd-shared/src/basic \ + -I$(srcdir)/src/libnm-systemd-shared/src/shared \ $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) -noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la +noinst_LTLIBRARIES += src/libnm-systemd-shared/libnm-systemd-shared.la -shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \ +src_libnm_systemd_shared_libnm_systemd_shared_la_CPPFLAGS = \ $(libsystemd_cppflags) \ $(NULL) -shared_systemd_libnm_systemd_logging_stub_la_SOURCES = \ - shared/systemd/nm-logging-stub.c \ +src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \ + src/libnm-systemd-shared/nm-default-systemd-shared.h \ + src/libnm-systemd-shared/nm-sd-utils-shared.c \ + src/libnm-systemd-shared/nm-sd-utils-shared.h \ + src/libnm-systemd-shared/sd-adapt-shared/architecture.h \ + src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h \ + src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/build.h \ + src/libnm-systemd-shared/sd-adapt-shared/copy.h \ + src/libnm-systemd-shared/sd-adapt-shared/def.h \ + src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h \ + src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/errno-list.h \ + src/libnm-systemd-shared/sd-adapt-shared/glob-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/gunicode.h \ + src/libnm-systemd-shared/sd-adapt-shared/idn-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/ioprio.h \ + src/libnm-systemd-shared/sd-adapt-shared/locale-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_network.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h \ + src/libnm-systemd-shared/sd-adapt-shared/mkdir.h \ + src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h \ + src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h \ + src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/unaligned.h \ + src/libnm-systemd-shared/sd-adapt-shared/user-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/virt.h \ + src/libnm-systemd-shared/src/basic/alloc-util.c \ + src/libnm-systemd-shared/src/basic/alloc-util.h \ + src/libnm-systemd-shared/src/basic/async.h \ + src/libnm-systemd-shared/src/basic/cgroup-util.h \ + src/libnm-systemd-shared/src/basic/env-file.c \ + src/libnm-systemd-shared/src/basic/env-file.h \ + src/libnm-systemd-shared/src/basic/env-util.c \ + src/libnm-systemd-shared/src/basic/env-util.h \ + src/libnm-systemd-shared/src/basic/errno-util.h \ + src/libnm-systemd-shared/src/basic/escape.c \ + src/libnm-systemd-shared/src/basic/escape.h \ + src/libnm-systemd-shared/src/basic/ether-addr-util.c \ + src/libnm-systemd-shared/src/basic/ether-addr-util.h \ + src/libnm-systemd-shared/src/basic/extract-word.c \ + src/libnm-systemd-shared/src/basic/extract-word.h \ + src/libnm-systemd-shared/src/basic/fd-util.c \ + src/libnm-systemd-shared/src/basic/fd-util.h \ + src/libnm-systemd-shared/src/basic/fileio.c \ + src/libnm-systemd-shared/src/basic/fileio.h \ + src/libnm-systemd-shared/src/basic/format-util.c \ + src/libnm-systemd-shared/src/basic/format-util.h \ + src/libnm-systemd-shared/src/basic/fs-util.c \ + src/libnm-systemd-shared/src/basic/fs-util.h \ + src/libnm-systemd-shared/src/basic/hash-funcs.c \ + src/libnm-systemd-shared/src/basic/hash-funcs.h \ + src/libnm-systemd-shared/src/basic/hashmap.c \ + src/libnm-systemd-shared/src/basic/hashmap.h \ + src/libnm-systemd-shared/src/basic/hexdecoct.c \ + src/libnm-systemd-shared/src/basic/hexdecoct.h \ + src/libnm-systemd-shared/src/basic/hostname-util.c \ + src/libnm-systemd-shared/src/basic/hostname-util.h \ + src/libnm-systemd-shared/src/basic/in-addr-util.c \ + src/libnm-systemd-shared/src/basic/in-addr-util.h \ + src/libnm-systemd-shared/src/basic/io-util.c \ + src/libnm-systemd-shared/src/basic/io-util.h \ + src/libnm-systemd-shared/src/basic/list.h \ + src/libnm-systemd-shared/src/basic/log.h \ + src/libnm-systemd-shared/src/basic/macro.h \ + src/libnm-systemd-shared/src/basic/memory-util.c \ + src/libnm-systemd-shared/src/basic/memory-util.h \ + src/libnm-systemd-shared/src/basic/mempool.c \ + src/libnm-systemd-shared/src/basic/mempool.h \ + src/libnm-systemd-shared/src/basic/missing_fcntl.h \ + src/libnm-systemd-shared/src/basic/missing_random.h \ + src/libnm-systemd-shared/src/basic/missing_socket.h \ + src/libnm-systemd-shared/src/basic/missing_stat.h \ + src/libnm-systemd-shared/src/basic/missing_syscall.h \ + src/libnm-systemd-shared/src/basic/missing_type.h \ + src/libnm-systemd-shared/src/basic/parse-util.c \ + src/libnm-systemd-shared/src/basic/parse-util.h \ + src/libnm-systemd-shared/src/basic/path-util.c \ + src/libnm-systemd-shared/src/basic/path-util.h \ + src/libnm-systemd-shared/src/basic/prioq.c \ + src/libnm-systemd-shared/src/basic/prioq.h \ + src/libnm-systemd-shared/src/basic/process-util.c \ + src/libnm-systemd-shared/src/basic/process-util.h \ + src/libnm-systemd-shared/src/basic/random-util.c \ + src/libnm-systemd-shared/src/basic/random-util.h \ + src/libnm-systemd-shared/src/basic/ratelimit.c \ + src/libnm-systemd-shared/src/basic/ratelimit.h \ + src/libnm-systemd-shared/src/basic/set.h \ + src/libnm-systemd-shared/src/basic/signal-util.c \ + src/libnm-systemd-shared/src/basic/signal-util.h \ + src/libnm-systemd-shared/src/basic/siphash24.h \ + src/libnm-systemd-shared/src/basic/socket-util.c \ + src/libnm-systemd-shared/src/basic/socket-util.h \ + src/libnm-systemd-shared/src/basic/sort-util.h \ + src/libnm-systemd-shared/src/basic/sparse-endian.h \ + src/libnm-systemd-shared/src/basic/stat-util.c \ + src/libnm-systemd-shared/src/basic/stat-util.h \ + src/libnm-systemd-shared/src/basic/stdio-util.h \ + src/libnm-systemd-shared/src/basic/string-table.c \ + src/libnm-systemd-shared/src/basic/string-table.h \ + src/libnm-systemd-shared/src/basic/string-util.c \ + src/libnm-systemd-shared/src/basic/string-util.h \ + src/libnm-systemd-shared/src/basic/strv.c \ + src/libnm-systemd-shared/src/basic/strv.h \ + src/libnm-systemd-shared/src/basic/strxcpyx.c \ + src/libnm-systemd-shared/src/basic/strxcpyx.h \ + src/libnm-systemd-shared/src/basic/time-util.c \ + src/libnm-systemd-shared/src/basic/time-util.h \ + src/libnm-systemd-shared/src/basic/tmpfile-util.c \ + src/libnm-systemd-shared/src/basic/tmpfile-util.h \ + src/libnm-systemd-shared/src/basic/umask-util.h \ + src/libnm-systemd-shared/src/basic/utf8.c \ + src/libnm-systemd-shared/src/basic/utf8.h \ + src/libnm-systemd-shared/src/basic/util.c \ + src/libnm-systemd-shared/src/basic/util.h \ + src/libnm-systemd-shared/src/shared/dns-domain.c \ + src/libnm-systemd-shared/src/shared/dns-domain.h \ + src/libnm-systemd-shared/src/shared/log-link.h \ + src/libnm-systemd-shared/src/shared/web-util.c \ + src/libnm-systemd-shared/src/shared/web-util.h \ $(NULL) -shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \ - $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(NULL) - -noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la - -shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \ - $(libsystemd_cppflags) \ - $(NULL) - -shared_systemd_libnm_systemd_shared_la_SOURCES = \ - shared/systemd/nm-default-systemd-shared.h \ - shared/systemd/nm-sd-utils-shared.c \ - shared/systemd/nm-sd-utils-shared.h \ - shared/systemd/sd-adapt-shared/architecture.h \ - shared/systemd/sd-adapt-shared/arphrd-list.h \ - shared/systemd/sd-adapt-shared/blockdev-util.h \ - shared/systemd/sd-adapt-shared/build.h \ - shared/systemd/sd-adapt-shared/copy.h \ - shared/systemd/sd-adapt-shared/def.h \ - shared/systemd/sd-adapt-shared/dhcp-server-internal.h \ - shared/systemd/sd-adapt-shared/dirent-util.h \ - shared/systemd/sd-adapt-shared/errno-list.h \ - shared/systemd/sd-adapt-shared/glob-util.h \ - shared/systemd/sd-adapt-shared/gunicode.h \ - shared/systemd/sd-adapt-shared/idn-util.h \ - shared/systemd/sd-adapt-shared/ioprio.h \ - shared/systemd/sd-adapt-shared/locale-util.h \ - shared/systemd/sd-adapt-shared/memfd-util.h \ - shared/systemd/sd-adapt-shared/missing_fs.h \ - shared/systemd/sd-adapt-shared/missing_keyctl.h \ - shared/systemd/sd-adapt-shared/missing_magic.h \ - shared/systemd/sd-adapt-shared/missing_network.h \ - shared/systemd/sd-adapt-shared/missing_sched.h \ - shared/systemd/sd-adapt-shared/missing_timerfd.h \ - shared/systemd/sd-adapt-shared/mkdir.h \ - shared/systemd/sd-adapt-shared/namespace-util.h \ - shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \ - shared/systemd/sd-adapt-shared/nulstr-util.h \ - shared/systemd/sd-adapt-shared/raw-clone.h \ - shared/systemd/sd-adapt-shared/rlimit-util.h \ - shared/systemd/sd-adapt-shared/terminal-util.h \ - shared/systemd/sd-adapt-shared/unaligned.h \ - shared/systemd/sd-adapt-shared/user-util.h \ - shared/systemd/sd-adapt-shared/virt.h \ - shared/systemd/src/basic/alloc-util.c \ - shared/systemd/src/basic/alloc-util.h \ - shared/systemd/src/basic/async.h \ - shared/systemd/src/basic/cgroup-util.h \ - shared/systemd/src/basic/env-file.c \ - shared/systemd/src/basic/env-file.h \ - shared/systemd/src/basic/env-util.c \ - shared/systemd/src/basic/env-util.h \ - shared/systemd/src/basic/errno-util.h \ - shared/systemd/src/basic/escape.c \ - shared/systemd/src/basic/escape.h \ - shared/systemd/src/basic/ether-addr-util.c \ - shared/systemd/src/basic/ether-addr-util.h \ - shared/systemd/src/basic/extract-word.c \ - shared/systemd/src/basic/extract-word.h \ - shared/systemd/src/basic/fd-util.c \ - shared/systemd/src/basic/fd-util.h \ - shared/systemd/src/basic/fileio.c \ - shared/systemd/src/basic/fileio.h \ - shared/systemd/src/basic/format-util.c \ - shared/systemd/src/basic/format-util.h \ - shared/systemd/src/basic/fs-util.c \ - shared/systemd/src/basic/fs-util.h \ - shared/systemd/src/basic/hash-funcs.c \ - shared/systemd/src/basic/hash-funcs.h \ - shared/systemd/src/basic/hashmap.c \ - shared/systemd/src/basic/hashmap.h \ - shared/systemd/src/basic/hexdecoct.c \ - shared/systemd/src/basic/hexdecoct.h \ - shared/systemd/src/basic/hostname-util.c \ - shared/systemd/src/basic/hostname-util.h \ - shared/systemd/src/basic/in-addr-util.c \ - shared/systemd/src/basic/in-addr-util.h \ - shared/systemd/src/basic/io-util.c \ - shared/systemd/src/basic/io-util.h \ - shared/systemd/src/basic/list.h \ - shared/systemd/src/basic/log.h \ - shared/systemd/src/basic/macro.h \ - shared/systemd/src/basic/memory-util.c \ - shared/systemd/src/basic/memory-util.h \ - shared/systemd/src/basic/mempool.c \ - shared/systemd/src/basic/mempool.h \ - shared/systemd/src/basic/missing_fcntl.h \ - shared/systemd/src/basic/missing_random.h \ - shared/systemd/src/basic/missing_socket.h \ - shared/systemd/src/basic/missing_stat.h \ - shared/systemd/src/basic/missing_syscall.h \ - shared/systemd/src/basic/missing_type.h \ - shared/systemd/src/basic/parse-util.c \ - shared/systemd/src/basic/parse-util.h \ - shared/systemd/src/basic/path-util.c \ - shared/systemd/src/basic/path-util.h \ - shared/systemd/src/basic/prioq.c \ - shared/systemd/src/basic/prioq.h \ - shared/systemd/src/basic/process-util.c \ - shared/systemd/src/basic/process-util.h \ - shared/systemd/src/basic/random-util.c \ - shared/systemd/src/basic/random-util.h \ - shared/systemd/src/basic/ratelimit.c \ - shared/systemd/src/basic/ratelimit.h \ - shared/systemd/src/basic/set.h \ - shared/systemd/src/basic/signal-util.c \ - shared/systemd/src/basic/signal-util.h \ - shared/systemd/src/basic/siphash24.h \ - shared/systemd/src/basic/socket-util.c \ - shared/systemd/src/basic/socket-util.h \ - shared/systemd/src/basic/sort-util.h \ - shared/systemd/src/basic/sparse-endian.h \ - shared/systemd/src/basic/stat-util.c \ - shared/systemd/src/basic/stat-util.h \ - shared/systemd/src/basic/stdio-util.h \ - shared/systemd/src/basic/string-table.c \ - shared/systemd/src/basic/string-table.h \ - shared/systemd/src/basic/string-util.c \ - shared/systemd/src/basic/string-util.h \ - shared/systemd/src/basic/strv.c \ - shared/systemd/src/basic/strv.h \ - shared/systemd/src/basic/strxcpyx.c \ - shared/systemd/src/basic/strxcpyx.h \ - shared/systemd/src/basic/time-util.c \ - shared/systemd/src/basic/time-util.h \ - shared/systemd/src/basic/tmpfile-util.c \ - shared/systemd/src/basic/tmpfile-util.h \ - shared/systemd/src/basic/umask-util.h \ - shared/systemd/src/basic/utf8.c \ - shared/systemd/src/basic/utf8.h \ - shared/systemd/src/basic/util.c \ - shared/systemd/src/basic/util.h \ - shared/systemd/src/shared/dns-domain.c \ - shared/systemd/src/shared/dns-domain.h \ - shared/systemd/src/shared/log-link.h \ - shared/systemd/src/shared/web-util.c \ - shared/systemd/src/shared/web-util.h \ - $(NULL) - -shared_systemd_libnm_systemd_shared_la_LIBADD = \ +src_libnm_systemd_shared_libnm_systemd_shared_la_LIBADD = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) @@ -2471,18 +2538,18 @@ src_core_libNetworkManager_la_LIBADD = \ src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-platform/libnm-platform.la \ - shared/nm-base/libnm-base.la \ - shared/nm-log-core/libnm-log-core.la \ - shared/nm-udev-aux/libnm-udev-aux.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ + src/libnm-platform/libnm-platform.la \ + src/libnm-base/libnm-base.la \ + src/libnm-log-core/libnm-log-core.la \ + src/libnm-udev-aux/libnm-udev-aux.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ src/core/libnm-systemd-core.la \ - shared/systemd/libnm-systemd-shared.la \ - shared/libnacd.la \ - shared/libndhcp4.la \ - shared/libcrbtree.la \ - shared/libcsiphash.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ + src/n-acd/libn-acd.la \ + src/n-dhcp4/libn-dhcp4.la \ + src/c-rbtree/libc-rbtree.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ @@ -2584,18 +2651,18 @@ src_core_nm_iface_helper_LDADD = \ src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-platform/libnm-platform.la \ - shared/nm-base/libnm-base.la \ - shared/nm-log-core/libnm-log-core.la \ - shared/nm-udev-aux/libnm-udev-aux.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ + src/libnm-platform/libnm-platform.la \ + src/libnm-base/libnm-base.la \ + src/libnm-log-core/libnm-log-core.la \ + src/libnm-udev-aux/libnm-udev-aux.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ src/core/libnm-systemd-core.la \ - shared/systemd/libnm-systemd-shared.la \ - shared/libnacd.la \ - shared/libndhcp4.la \ - shared/libcrbtree.la \ - shared/libcsiphash.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ + src/n-acd/libn-acd.la \ + src/n-dhcp4/libn-dhcp4.la \ + src/c-rbtree/libc-rbtree.la \ + src/c-siphash/libc-siphash.la \ $(SYSTEMD_JOURNAL_LIBS) \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ @@ -2638,17 +2705,17 @@ src_core_initrd_nm_initrd_generator_LDADD = \ src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-platform/libnm-platform.la \ - shared/nm-base/libnm-base.la \ - shared/nm-log-core/libnm-log-core.la \ - shared/nm-udev-aux/libnm-udev-aux.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/systemd/libnm-systemd-shared.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libndhcp4.la \ - shared/libcsiphash.la \ + src/libnm-platform/libnm-platform.la \ + src/libnm-base/libnm-base.la \ + src/libnm-log-core/libnm-log-core.la \ + src/libnm-udev-aux/libnm-udev-aux.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/n-dhcp4/libn-dhcp4.la \ + src/c-siphash/libc-siphash.la \ $(SYSTEMD_JOURNAL_LIBS) \ $(GLIB_LIBS) \ $(NULL) @@ -2671,9 +2738,9 @@ src_core_initrd_tests_test_dt_reader_LDFLAGS = \ src_core_initrd_tests_test_dt_reader_LDADD = \ src/core/initrd/libnmi-core.la \ src/core/libNetworkManagerTest.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -2691,9 +2758,9 @@ src_core_initrd_tests_test_ibft_reader_LDFLAGS = \ src_core_initrd_tests_test_ibft_reader_LDADD = \ src/core/initrd/libnmi-core.la \ src/core/libNetworkManagerTest.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -2926,9 +2993,9 @@ src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \ src_core_initrd_tests_test_cmdline_reader_LDADD = \ src/core/initrd/libnmi-core.la \ src/core/libNetworkManagerTest.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -2953,8 +3020,8 @@ libexec_PROGRAMS += src/core/dhcp/nm-dhcp-helper src_core_dhcp_nm_dhcp_helper_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ $(GLIB_CFLAGS) \ $(NULL) @@ -3013,8 +3080,8 @@ pppd_plugin_LTLIBRARIES += src/core/ppp/nm-pppd-plugin.la src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ $(GLIB_CFLAGS) @@ -4303,8 +4370,8 @@ src_core_tests_test_systemd_LDFLAGS = \ src_core_tests_test_systemd_LDADD = \ src/core/libnm-systemd-core.la \ - shared/systemd/libnm-systemd-shared.la \ - shared/libcsiphash.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) @@ -4345,14 +4412,12 @@ noinst_LTLIBRARIES += \ dispatcher_cppflags = \ $(dflt_cppflags) \ - -I$(builddir)/shared \ - -I$(srcdir)/shared \ -I$(builddir)/dispatcher \ -I$(srcdir)/dispatcher \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ $(GLIB_CFLAGS) \ $(NULL) @@ -4365,7 +4430,7 @@ dispatcher_libnm_dispatcher_core_la_SOURCES = \ dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags) dispatcher_libnm_dispatcher_core_la_LIBADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) dispatcher_nm_dispatcher_SOURCES = \ @@ -4381,10 +4446,10 @@ dispatcher_nm_dispatcher_LDFLAGS = \ dispatcher_nm_dispatcher_LDADD = \ dispatcher/libnm-dispatcher-core.la \ - libnm/libnm.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-client-impl/libnm.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freedesktop.nm_dispatcher.service.in @@ -4427,14 +4492,12 @@ check_programs += dispatcher/tests/test-dispatcher-envp dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(builddir)/shared \ - -I$(srcdir)/shared \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ -I$(srcdir)/src \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ @@ -4448,6 +4511,8 @@ dispatcher_tests_test_dispatcher_envp_SOURCES = \ nodist_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources) +$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_client_public_mkenums_h) dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ @@ -4455,10 +4520,10 @@ dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ dispatcher_tests_test_dispatcher_envp_LDADD = \ dispatcher/libnm-dispatcher-core.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ - libnm/libnm.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) @@ -4483,12 +4548,12 @@ bin_PROGRAMS += clients/nm-online clients_nm_online_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ + -I$(srcdir)/src \ + -I$(builddir)/src \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(GLIB_CFLAGS) \ $(NULL) @@ -4498,16 +4563,16 @@ clients_nm_online_LDFLAGS = \ $(NULL) clients_nm_online_LDADD = \ - libnm/libnm.la \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-client-impl/libnm.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(NULL) $(clients_nm_online_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_nm_online_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_nm_online_OBJECTS): $(src_libnm_client_public_mkenums_h) EXTRA_DIST += \ clients/meson.build @@ -4518,14 +4583,12 @@ EXTRA_DIST += \ clients_cppflags = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ -I$(builddir)/clients/common \ -I$(srcdir)/clients/common \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ @@ -4553,12 +4616,12 @@ clients_common_libnmc_base_la_CPPFLAGS = \ $(NULL) clients_common_libnmc_base_la_LIBADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) $(clients_common_libnmc_base_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_common_libnmc_base_la_OBJECTS): $(src_libnm_client_public_mkenums_h) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp clients_common_settings_doc_h = clients/common/settings-docs.h @@ -4600,11 +4663,12 @@ clients_common_libnmc_la_CPPFLAGS = \ $(NULL) clients_common_libnmc_la_LIBADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) $(clients_common_libnmc_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(clients_common_libnmc_la_OBJECTS): $(src_libnm_client_public_mkenums_h) $(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h) $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp @@ -4629,14 +4693,15 @@ clients_common_tests_test_clients_common_LDADD = \ clients/common/libnmc-base.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-base/libnm-base.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ - libnm/libnm.la \ + src/libnm-base/libnm-base.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) $(clients_common_tests_test_clients_common_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(clients_common_tests_test_clients_common_OBJECTS): $(src_libnm_client_public_mkenums_h) ############################################################################### @@ -4653,13 +4718,12 @@ check_programs += clients/common/tests/test-libnm-core-aux clients_common_tests_test_libnm_core_aux_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(builddir)/shared \ - -I$(srcdir)/shared \ - -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ -I$(srcdir)/src \ + -I$(builddir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ @@ -4673,15 +4737,15 @@ clients_common_tests_test_libnm_core_aux_LDFLAGS = \ clients_common_tests_test_libnm_core_aux_LDADD = \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ - libnm/libnm.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) $(clients_common_tests_test_libnm_core_aux_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(src_libnm_client_public_mkenums_h) ############################################################################### # clients/cli @@ -4720,12 +4784,12 @@ clients_cli_nmcli_LDADD = \ clients/common/libnmc-base.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-base/libnm-base.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ - libnm/libnm.la \ + src/libnm-base/libnm-base.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(READLINE_LIBS) @@ -4734,7 +4798,7 @@ clients_cli_nmcli_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) $(clients_cli_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cli_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cli_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h) install-data-hook-nmcli: $(mkinstalldirs) $(DESTDIR)$(completiondir) @@ -4765,14 +4829,14 @@ clients_cli_generate_docs_nm_settings_nmcli_CPPFLAGS = \ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \ clients/common/libnmc.la \ clients/common/libnmc-base.la \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-base/libnm-base.la \ - libnm/libnm.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ + src/libnm-base/libnm-base.la \ + src/libnm-client-impl/libnm.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -4782,7 +4846,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDFLAGS = \ $(NULL) $(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h) ############################################################################### @@ -4852,6 +4916,7 @@ clients_tui_newt_libnmt_newt_a_CPPFLAGS = \ $(NULL) $(clients_tui_newt_libnmt_newt_a_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(src_libnm_client_public_mkenums_h) bin_PROGRAMS += clients/tui/nmtui @@ -4954,19 +5019,20 @@ clients_tui_nmtui_LDADD = \ clients/tui/newt/libnmt-newt.a \ clients/common/libnmc.la \ clients/common/libnmc-base.la \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-base/libnm-base.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ - libnm/libnm.la \ + src/libnm-base/libnm-base.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NEWT_LIBS) \ $(NULL) $(clients_tui_nmtui_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(clients_tui_nmtui_OBJECTS): $(src_libnm_client_public_mkenums_h) nmtui_links = nmtui-edit nmtui-connect nmtui-hostname @@ -5019,7 +5085,7 @@ clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS = \ $(NULL) $(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(src_libnm_client_public_mkenums_h) libexec_PROGRAMS += clients/cloud-setup/nm-cloud-setup @@ -5039,20 +5105,20 @@ clients_cloud_setup_nm_cloud_setup_LDFLAGS = \ clients_cloud_setup_nm_cloud_setup_LDADD = \ clients/cloud-setup/libnm-cloud-setup-core.a \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-base/libnm-base.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ - libnm/libnm.la \ + src/libnm-base/libnm-base.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(LIBCURL_LIBS) \ $(NULL) $(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(src_libnm_client_public_mkenums_h) if HAVE_SYSTEMD @@ -5104,20 +5170,20 @@ clients_cloud_setup_tests_test_cloud_setup_general_LDFLAGS = \ clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \ clients/cloud-setup/libnm-cloud-setup-core.a \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - shared/nm-base/libnm-base.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ - shared/libcsiphash.la \ - libnm/libnm.la \ + src/libnm-base/libnm-base.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(LIBCURL_LIBS) \ $(NULL) $(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_client_public_mkenums_h) endif @@ -5128,8 +5194,8 @@ endif check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-client.py mkdir -p "$(builddir)/clients/tests/" "$(builddir)/clients/cli/nmcli" --version - GI_TYPELIB_PATH="$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \ - LD_LIBRARY_PATH="$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \ + GI_TYPELIB_PATH="$(abs_builddir)/src/libnm-client-impl$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \ + LD_LIBRARY_PATH="$(abs_builddir)/src/libnm-client-impl/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \ NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \ NM_TEST_CLIENT_NMCLI_PATH=clients/cli/nmcli \ "$(PYTHON)" \ @@ -5259,9 +5325,9 @@ if HAVE_INTROSPECTION man/nm-settings-%.xml: man/nm-settings-%.xsl man/nm-settings-docs-%.xml man/common.ent $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $< $(word 2,$^) -man/nm-settings-keyfile.xml: man/nm-settings-keyfile.xsl libnm/nm-property-infos-keyfile.xml man/common.ent +man/nm-settings-keyfile.xml: man/nm-settings-keyfile.xsl src/libnm-client-impl/nm-property-infos-keyfile.xml man/common.ent $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $< $(word 2,$^) -man/nm-settings-ifcfg-rh.xml: man/nm-settings-ifcfg-rh.xsl libnm/nm-property-infos-ifcfg-rh.xml man/common.ent +man/nm-settings-ifcfg-rh.xml: man/nm-settings-ifcfg-rh.xsl src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml man/common.ent $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $< $(word 2,$^) CLEANFILES += $(man_nm_settings_xml) @@ -5362,10 +5428,10 @@ if ENABLE_VAPIGEN VAPIGEN_VAPIS += \ vapi/libnm.vapi -vapi/libnm.vapi: $(builddir)/libnm/NM-1.0.gir vapi/libnm.deps vapi/NM-1.0.metadata +vapi/libnm.vapi: $(builddir)/src/libnm-client-impl/NM-1.0.gir vapi/libnm.deps vapi/NM-1.0.metadata vapi_libnm_vapi_METADATADIRS = $(srcdir)/vapi -vapi_libnm_vapi_FILES = $(builddir)/libnm/NM-1.0.gir +vapi_libnm_vapi_FILES = $(builddir)/src/libnm-client-impl/NM-1.0.gir vapi_libnm_vapi_DEPS = gio-2.0 vapi_DATA += \ @@ -5433,21 +5499,12 @@ EXTRA_DIST += \ \ po/meson.build \ \ - 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-test-utils.h \ - shared/nm-utils/nm-vpn-editor-plugin-call.h \ - shared/nm-utils/nm-vpn-plugin-macros.h \ - shared/nm-utils/nm-vpn-plugin-utils.c \ - shared/nm-utils/nm-vpn-plugin-utils.h \ - shared/meson.build \ - \ src/meson.build \ \ src/libnm-core-public/nm-version-macros.h.in \ \ + src/contrib/nm-vpn-editor-plugin-call.h \ + \ tools/check-config-options.sh \ tools/check-docs.sh \ tools/check-exports.sh \ diff --git a/Makefile.examples b/Makefile.examples index 7690baf252..d427397830 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -3,10 +3,10 @@ ############################################################################### examples_C_glib_cppflags = \ - -I$(top_builddir)/src/libnm-core-public \ -I$(top_srcdir)/src/libnm-core-public \ - -I$(top_builddir)/libnm \ - -I$(top_srcdir)/libnm \ + -I$(top_builddir)/src/libnm-core-public \ + -I$(top_srcdir)/src/libnm-client-public \ + -I$(top_builddir)/src/libnm-client-public \ $(GLIB_CFLAGS) examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) @@ -26,24 +26,24 @@ examples_C_glib_add_connection_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus examples_C_glib_add_connection_gdbus_LDADD = \ $(GLIB_LIBS) \ $(UUID_LIBS) -$(examples_C_glib_add_connection_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_add_connection_gdbus_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_add_connection_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) examples_C_glib_add_connection_libnm_LDADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) -$(examples_C_glib_add_connection_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_add_connection_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_get_active_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_get_active_connections_gdbus_LDADD = \ $(GLIB_LIBS) -$(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_get_ap_info_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) examples_C_glib_get_ap_info_libnm_LDADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) -$(examples_C_glib_get_ap_info_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_get_ap_info_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_list_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_list_connections_gdbus_LDADD = \ @@ -51,9 +51,9 @@ examples_C_glib_list_connections_gdbus_LDADD = \ examples_C_glib_list_connections_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) examples_C_glib_list_connections_libnm_LDADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) -$(examples_C_glib_list_connections_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(examples_C_glib_list_connections_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_monitor_nm_running_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_monitor_nm_running_gdbus_LDADD = \ diff --git a/clients/cli/agent.c b/clients/cli/agent.c index a3c60c46e7..fbbf9790cf 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include diff --git a/clients/cli/common.c b/clients/cli/common.c index 934ff70ef0..6e21559f99 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "common.h" @@ -13,11 +13,11 @@ #include #include -#include "nm-libnm-aux/nm-libnm-aux.h" +#include "libnm-client-aux-extern/nm-libnm-aux.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "utils.h" diff --git a/clients/cli/connections.c b/clients/cli/connections.c index ee7b8fbbe9..97c50f5ba7 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "connections.h" diff --git a/clients/cli/devices.c b/clients/cli/devices.c index eea82653c0..dd231448b7 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "devices.h" @@ -12,7 +12,7 @@ #include #include -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "common.h" #include "connections.h" #include "nm-client-utils.h" diff --git a/clients/cli/general.c b/clients/cli/general.c index 8094ad7c71..960d635874 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/cli/generate-docs-nm-settings-nmcli.c b/clients/cli/generate-docs-nm-settings-nmcli.c index d277b132e4..da2eed6d79 100644 --- a/clients/cli/generate-docs-nm-settings-nmcli.c +++ b/clients/cli/generate-docs-nm-settings-nmcli.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-meta-setting-desc.h" diff --git a/clients/cli/meson.build b/clients/cli/meson.build index cef0b880ff..8feaefd8e4 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -24,7 +24,7 @@ executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, @@ -46,7 +46,7 @@ generate_docs_nm_settings_nmcli = executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 3945721105..49ade6827b 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -4,7 +4,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcli.h" diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 2f07a2751e..9f5de2077f 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "polkit-agent.h" diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 4de1a37ebf..5258c03f3a 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2015 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "settings.h" diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 0a62c35cfa..537cf1f35a 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -4,7 +4,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "utils.h" diff --git a/clients/cloud-setup/main.c b/clients/cloud-setup/main.c index 7cee355d75..04db9e9d4d 100644 --- a/clients/cloud-setup/main.c +++ b/clients/cloud-setup/main.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" -#include "nm-libnm-aux/nm-libnm-aux.h" +#include "libnm-client-aux-extern/nm-libnm-aux.h" #include "nm-cloud-setup-utils.h" #include "nmcs-provider-ec2.h" diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index 853fa4394e..e8b74b7a03 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -35,7 +35,7 @@ libnm_cloud_setup_core = static_library( libnmc_base_dep, libnmc_dep, libcurl_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, ], ) @@ -58,7 +58,7 @@ executable( libnm_glib_aux_dep_link, libcurl_dep, ], - link_with: libnm_systemd_logging_stub, + link_with: libnm_log_null, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, diff --git a/clients/cloud-setup/nm-cloud-setup-utils.c b/clients/cloud-setup/nm-cloud-setup-utils.c index f5550a1286..1cb14a8349 100644 --- a/clients/cloud-setup/nm-cloud-setup-utils.c +++ b/clients/cloud-setup/nm-cloud-setup-utils.c @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-cloud-setup-utils.h" #include #include -#include "nm-glib-aux/nm-time-utils.h" -#include "nm-glib-aux/nm-logging-base.h" -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-time-utils.h" +#include "libnm-glib-aux/nm-logging-base.h" +#include "libnm-glib-aux/nm-str-buf.h" /*****************************************************************************/ diff --git a/clients/cloud-setup/nm-cloud-setup-utils.h b/clients/cloud-setup/nm-cloud-setup-utils.h index 52edd27994..d863170160 100644 --- a/clients/cloud-setup/nm-cloud-setup-utils.h +++ b/clients/cloud-setup/nm-cloud-setup-utils.h @@ -3,7 +3,7 @@ #ifndef __NM_CLOUD_SETUP_UTILS_H__ #define __NM_CLOUD_SETUP_UTILS_H__ -#include "nm-glib-aux/nm-logging-fwd.h" +#include "libnm-glib-aux/nm-logging-fwd.h" /*****************************************************************************/ diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c index 144513fce5..618ab1be10 100644 --- a/clients/cloud-setup/nm-http-client.c +++ b/clients/cloud-setup/nm-http-client.c @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-http-client.h" #include #include "nm-cloud-setup-utils.h" -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-str-buf.h" #define NM_CURL_DEBUG 0 diff --git a/clients/cloud-setup/nmcs-provider-azure.c b/clients/cloud-setup/nmcs-provider-azure.c index 0a5d522cc3..a46f56a40d 100644 --- a/clients/cloud-setup/nmcs-provider-azure.c +++ b/clients/cloud-setup/nmcs-provider-azure.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcs-provider-azure.h" diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c index 1e060034f5..f716827db8 100644 --- a/clients/cloud-setup/nmcs-provider-ec2.c +++ b/clients/cloud-setup/nmcs-provider-ec2.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcs-provider-ec2.h" diff --git a/clients/cloud-setup/nmcs-provider-gcp.c b/clients/cloud-setup/nmcs-provider-gcp.c index 1deaea10f3..eacfd5e248 100644 --- a/clients/cloud-setup/nmcs-provider-gcp.c +++ b/clients/cloud-setup/nmcs-provider-gcp.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcs-provider-gcp.h" diff --git a/clients/cloud-setup/nmcs-provider.c b/clients/cloud-setup/nmcs-provider.c index c700d8e1a3..678152aa95 100644 --- a/clients/cloud-setup/nmcs-provider.c +++ b/clients/cloud-setup/nmcs-provider.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcs-provider.h" diff --git a/clients/cloud-setup/tests/test-cloud-setup-general.c b/clients/cloud-setup/tests/test-cloud-setup-general.c index e7d898e0e4..82ec7adf62 100644 --- a/clients/cloud-setup/tests/test-cloud-setup-general.c +++ b/clients/cloud-setup/tests/test-cloud-setup-general.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-cloud-setup-utils.h" #include "libnm-core-aux-intern/nm-libnm-core-utils.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index 0e1a6bf5cf..701f8e1834 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -3,12 +3,12 @@ * Copyright (C) 2010 - 2017 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-client-utils.h" -#include "nm-glib-aux/nm-secret-utils.h" -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" #include "nm-utils.h" #include "nm-device-bond.h" #include "nm-device-bridge.h" diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c index dd493f28ae..cd4cbdd548 100644 --- a/clients/common/nm-meta-setting-access.c +++ b/clients/common/nm-meta-setting-access.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2017 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-meta-setting-access.h" diff --git a/clients/common/nm-meta-setting-base-impl.c b/clients/common/nm-meta-setting-base-impl.c index 523c0d5db3..da85e5683b 100644 --- a/clients/common/nm-meta-setting-base-impl.c +++ b/clients/common/nm-meta-setting-base-impl.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 - 2018 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-meta-setting-base.h" diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index c0d086e433..c814066719 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-meta-setting-desc.h" @@ -13,8 +13,8 @@ #include #include "libnm-core-aux-intern/nm-common-macros.h" -#include "nm-glib-aux/nm-enum-utils.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-enum-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "libnm-core-aux-extern/nm-libnm-core-aux.h" diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index 2f520b216a..29416dcbf8 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -6,9 +6,9 @@ #ifndef __NM_META_SETTING_DESC_H__ #define __NM_META_SETTING_DESC_H__ -#include "nm-glib-aux/nm-obj.h" +#include "libnm-glib-aux/nm-obj.h" #include "nm-meta-setting-base.h" -#include "nm-base/nm-ethtool-base.h" +#include "libnm-base/nm-ethtool-base.h" struct _NMDevice; diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index c83aa128bb..29c25b4e67 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -18,7 +18,7 @@ * https://github.com/lxde/lxqt-policykit/tree/master/src */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-polkit-listener.h" @@ -26,10 +26,10 @@ #include #include -#include "nm-glib-aux/nm-dbus-aux.h" -#include "nm-glib-aux/nm-str-buf.h" -#include "nm-glib-aux/nm-secret-utils.h" -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" #include "libnm-core-aux-intern/nm-auth-subject.h" #include "c-list/src/c-list.h" diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 1857432538..69617d0fee 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -16,7 +16,7 @@ * replace ShellNetworkAgent. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-secret-agent-simple.h" @@ -25,7 +25,7 @@ #include "nm-vpn-service-plugin.h" #include "nm-vpn-helpers.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" /*****************************************************************************/ diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index 15c47c3ecc..72691e34c2 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -8,7 +8,7 @@ * @short_description: VPN-related utilities */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-vpn-helpers.h" @@ -17,8 +17,8 @@ #include "nm-client-utils.h" #include "nm-utils.h" -#include "nm-glib-aux/nm-io-utils.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" /*****************************************************************************/ diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index b95dffeb8c..ef74e97dff 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -28,7 +28,7 @@ exe = executable( libnm_nm_default_dep, libnm_glib_aux_dep_link, ], - link_with: libnm_systemd_logging_stub, + link_with: libnm_log_null, ) test( diff --git a/clients/common/tests/test-clients-common.c b/clients/common/tests/test-clients-common.c index 4336f0d533..f06b01208c 100644 --- a/clients/common/tests/test-clients-common.c +++ b/clients/common/tests/test-clients-common.c @@ -3,13 +3,13 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-meta-setting-access.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ diff --git a/clients/common/tests/test-libnm-core-aux.c b/clients/common/tests/test-libnm-core-aux.c index a0bfea25d2..c4db4d6a39 100644 --- a/clients/common/tests/test-libnm-core-aux.c +++ b/clients/common/tests/test-libnm-core-aux.c @@ -3,12 +3,12 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "libnm-core-aux-extern/nm-libnm-core-aux.h" #include "libnm-core-aux-intern/nm-libnm-core-utils.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ diff --git a/clients/meson.build b/clients/meson.build index 428dee462a..3d360e0f1a 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -6,7 +6,7 @@ executable( dependencies: [ libnm_dep, libnm_nm_default_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, libnm_glib_aux_dep_link, ], link_args: ldflags_linker_script_binary, diff --git a/clients/nm-online.c b/clients/nm-online.c index c5cdeb38a0..6c807a6084 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -16,14 +16,14 @@ * Robert Love */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include #include #include -#include "nm-libnm-aux/nm-libnm-aux.h" +#include "libnm-client-aux-extern/nm-libnm-aux.h" #define PROGRESS_STEPS 15 diff --git a/clients/tui/meson.build b/clients/tui/meson.build index ccda1f0c5f..d421238869 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -50,13 +50,13 @@ executable( libnmc_base_dep, libnmc_dep, libnmt_newt_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, libnm_glib_aux_dep_link, ], - link_with: libnm_systemd_logging_stub, + link_with: libnm_log_null, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c index 212d04afa2..d86a154cb2 100644 --- a/clients/tui/newt/nmt-newt-button-box.c +++ b/clients/tui/newt/nmt-newt-button-box.c @@ -16,7 +16,7 @@ * within each of the two sections. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-button-box.h" diff --git a/clients/tui/newt/nmt-newt-button.c b/clients/tui/newt/nmt-newt-button.c index 1a30a63d4c..09ca1648a8 100644 --- a/clients/tui/newt/nmt-newt-button.c +++ b/clients/tui/newt/nmt-newt-button.c @@ -10,7 +10,7 @@ * #NmtNewtButton implements a button widget. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-button.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-checkbox.c b/clients/tui/newt/nmt-newt-checkbox.c index f806494277..cf825e08d9 100644 --- a/clients/tui/newt/nmt-newt-checkbox.c +++ b/clients/tui/newt/nmt-newt-checkbox.c @@ -10,7 +10,7 @@ * #NmtNewtCheckbox implements a checkbox widget. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-checkbox.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-component.c b/clients/tui/newt/nmt-newt-component.c index 64648ea6bb..8d7a9005c9 100644 --- a/clients/tui/newt/nmt-newt-component.c +++ b/clients/tui/newt/nmt-newt-component.c @@ -11,7 +11,7 @@ * wrap a (single) #newtComponent. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-component.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c index dfb5891661..4cc8db242a 100644 --- a/clients/tui/newt/nmt-newt-container.c +++ b/clients/tui/newt/nmt-newt-container.c @@ -13,7 +13,7 @@ * #NmtNewtGrid is the most generic container type. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-container.h" diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c index c08ad00a24..7e8edd6cad 100644 --- a/clients/tui/newt/nmt-newt-entry-numeric.c +++ b/clients/tui/newt/nmt-newt-entry-numeric.c @@ -13,7 +13,7 @@ * #NmtNewtEntryValidator functions, so you should not set your own. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c index 2c2ee13535..76a96df2f2 100644 --- a/clients/tui/newt/nmt-newt-entry.c +++ b/clients/tui/newt/nmt-newt-entry.c @@ -13,7 +13,7 @@ * See also #NmtNewtEntryNumeric, for numeric-only entries. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-entry.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c index 23118e3403..825f7cfe61 100644 --- a/clients/tui/newt/nmt-newt-form.c +++ b/clients/tui/newt/nmt-newt-form.c @@ -11,7 +11,7 @@ * "form" (aka dialog) to the user. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c index 9fdd615a72..a68a496bce 100644 --- a/clients/tui/newt/nmt-newt-grid.c +++ b/clients/tui/newt/nmt-newt-grid.c @@ -27,7 +27,7 @@ * must be implemented by the container... */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-grid.h" diff --git a/clients/tui/newt/nmt-newt-hacks.c b/clients/tui/newt/nmt-newt-hacks.c index 4120acbb3f..40114a29a7 100644 --- a/clients/tui/newt/nmt-newt-hacks.c +++ b/clients/tui/newt/nmt-newt-hacks.c @@ -11,7 +11,7 @@ * functions that were added after 0.52.15. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-hacks.h" diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c index 1902b57f2d..32c7809d4d 100644 --- a/clients/tui/newt/nmt-newt-label.c +++ b/clients/tui/newt/nmt-newt-label.c @@ -12,7 +12,7 @@ * See also #NmtNewtTextbox, for multiline. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-label.h" diff --git a/clients/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c index 7031fc0f99..cfe23647a1 100644 --- a/clients/tui/newt/nmt-newt-listbox.c +++ b/clients/tui/newt/nmt-newt-listbox.c @@ -18,7 +18,7 @@ * presses Return on a selection. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-listbox.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c index c8d8034dd9..1822c9d953 100644 --- a/clients/tui/newt/nmt-newt-popup.c +++ b/clients/tui/newt/nmt-newt-popup.c @@ -13,7 +13,7 @@ * #NmtNewtForm containing an #NmtNewtListbox to select from. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-popup.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c index 6075563950..fa73ea4a07 100644 --- a/clients/tui/newt/nmt-newt-section.c +++ b/clients/tui/newt/nmt-newt-section.c @@ -22,7 +22,7 @@ * extent of the section. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-section.h" diff --git a/clients/tui/newt/nmt-newt-separator.c b/clients/tui/newt/nmt-newt-separator.c index c0dde744bc..70c505ca6b 100644 --- a/clients/tui/newt/nmt-newt-separator.c +++ b/clients/tui/newt/nmt-newt-separator.c @@ -12,7 +12,7 @@ * between widgets in containers that don't implement padding. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-separator.h" diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c index f3a2d1f0c4..e0fdb3b9a2 100644 --- a/clients/tui/newt/nmt-newt-stack.c +++ b/clients/tui/newt/nmt-newt-stack.c @@ -16,7 +16,7 @@ * children. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-stack.h" diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c index c8e3d576e5..128e539b91 100644 --- a/clients/tui/newt/nmt-newt-textbox.c +++ b/clients/tui/newt/nmt-newt-textbox.c @@ -11,7 +11,7 @@ * word-wrapping. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-textbox.h" diff --git a/clients/tui/newt/nmt-newt-toggle-button.c b/clients/tui/newt/nmt-newt-toggle-button.c index cbc813fb30..c48931e5d7 100644 --- a/clients/tui/newt/nmt-newt-toggle-button.c +++ b/clients/tui/newt/nmt-newt-toggle-button.c @@ -10,7 +10,7 @@ * #NmtNewtToggleButton implements a two-state toggle button. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index af24824558..1216b8d356 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -8,7 +8,7 @@ * @short_description: Utility functions */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c index 902949527a..8b5647aa9b 100644 --- a/clients/tui/newt/nmt-newt-widget.c +++ b/clients/tui/newt/nmt-newt-widget.c @@ -21,7 +21,7 @@ * FIXME: need RTL support */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-widget.h" #include "nmt-newt-form.h" diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index 01f22f64ca..162e8b1b38 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -12,7 +12,7 @@ * shared between nmtui, nm-connection-editor, and gnome-control-center. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-editor-bindings.h" diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 21dc3aef92..fd73cd8312 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -12,7 +12,7 @@ * nm-connection-editor, and gnome-control-center. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-editor-utils.h" #if 0 diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c index bb3651d956..265457d658 100644 --- a/clients/tui/nmt-address-list.c +++ b/clients/tui/nmt-address-list.c @@ -15,7 +15,7 @@ * functions. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index e8a90d0a31..5d0596728a 100644 --- a/clients/tui/nmt-connect-connection-list.c +++ b/clients/tui/nmt-connect-connection-list.c @@ -11,7 +11,7 @@ * access points displayed by "nmtui connect". */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c index dcc2c6d24d..e831f4e474 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -21,7 +21,7 @@ * to implement that then we should make it just an #NmtNewtEntry. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-device-entry.h" diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c index 52535e077c..9b31e06f79 100644 --- a/clients/tui/nmt-edit-connection-list.c +++ b/clients/tui/nmt-edit-connection-list.c @@ -11,7 +11,7 @@ * "nmtui edit". */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmtui.h" #include "nmtui-edit.h" diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c index 9bd07066c9..8c79e8d967 100644 --- a/clients/tui/nmt-editor-grid.c +++ b/clients/tui/nmt-editor-grid.c @@ -24,7 +24,7 @@ * section border into account as well. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor-grid.h" diff --git a/clients/tui/nmt-editor-page-device.c b/clients/tui/nmt-editor-page-device.c index 18f886bda5..950f4db12f 100644 --- a/clients/tui/nmt-editor-page-device.c +++ b/clients/tui/nmt-editor-page-device.c @@ -15,7 +15,7 @@ * an actual page type. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor-page-device.h" diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c index 24ff9bebca..6d90d71e99 100644 --- a/clients/tui/nmt-editor-page.c +++ b/clients/tui/nmt-editor-page.c @@ -11,7 +11,7 @@ * A "page" is a set of related #NmtEditorSections. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor-page.h" diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c index 0b85cd2935..c95fc6ff9c 100644 --- a/clients/tui/nmt-editor-section.c +++ b/clients/tui/nmt-editor-section.c @@ -10,7 +10,7 @@ * #NmtEditorSection is the abstract base class for #NmtEditor sections. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor-section.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index 2f5a09b097..69b5e3398a 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -10,7 +10,7 @@ * #NmtEditor is the top-level form for editing a connection. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor.h" diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c index e6d1306d5c..b801eec4c7 100644 --- a/clients/tui/nmt-ip-entry.c +++ b/clients/tui/nmt-ip-entry.c @@ -14,7 +14,7 @@ * contains a valid IP address. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 1f4cab9384..3f71f4c9e4 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -13,7 +13,7 @@ * on whether it currently contains a valid hardware address. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-mac-entry.h" diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c index 7b1c0f3be1..eab25a23c1 100644 --- a/clients/tui/nmt-mtu-entry.c +++ b/clients/tui/nmt-mtu-entry.c @@ -17,7 +17,7 @@ * indicating the units used by the entry. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index 8dfc38f861..d3fab1ffda 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -12,7 +12,7 @@ * can't just use #GBinding. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-bond.h" diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c index 228acc20c0..30163d1524 100644 --- a/clients/tui/nmt-page-bridge-port.c +++ b/clients/tui/nmt-page-bridge-port.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Bridge ports */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-bridge-port.h" diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c index 7fc85eb2ed..52af8db127 100644 --- a/clients/tui/nmt-page-bridge.c +++ b/clients/tui/nmt-page-bridge.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Bridge connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-bridge.h" diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c index 8e1e69f3f2..d7e0d144b5 100644 --- a/clients/tui/nmt-page-dsl.c +++ b/clients/tui/nmt-page-dsl.c @@ -8,7 +8,7 @@ * @short_description: The editor page for DSL connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-dsl.h" #include "nmt-page-ethernet.h" diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c index 61ef811ca8..f5dc91194a 100644 --- a/clients/tui/nmt-page-ethernet.c +++ b/clients/tui/nmt-page-ethernet.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Ethernet connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-ethernet.h" diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c index 0529caf367..c0e3611bdc 100644 --- a/clients/tui/nmt-page-infiniband.c +++ b/clients/tui/nmt-page-infiniband.c @@ -8,7 +8,7 @@ * @short_description: The editor page for InfiniBand connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-infiniband.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-ip-tunnel.c b/clients/tui/nmt-page-ip-tunnel.c index ab58038989..da6d12b9cc 100644 --- a/clients/tui/nmt-page-ip-tunnel.c +++ b/clients/tui/nmt-page-ip-tunnel.c @@ -7,7 +7,7 @@ * @short_description: The editor page for IP tunnel connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-ip-tunnel.h" diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c index 1f01155bf4..ecd714473a 100644 --- a/clients/tui/nmt-page-ip4.c +++ b/clients/tui/nmt-page-ip4.c @@ -8,7 +8,7 @@ * @short_description: The editor page for IP4 configuration */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c index f4e4f3d0ea..f79c553db4 100644 --- a/clients/tui/nmt-page-ip6.c +++ b/clients/tui/nmt-page-ip6.c @@ -8,7 +8,7 @@ * @short_description: The editor page for IP6 configuration */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c index b60835af09..b7cb554092 100644 --- a/clients/tui/nmt-page-ppp.c +++ b/clients/tui/nmt-page-ppp.c @@ -8,7 +8,7 @@ * @short_description: The editor page for PPP configuration */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c index fd71140813..13bb84f069 100644 --- a/clients/tui/nmt-page-team-port.c +++ b/clients/tui/nmt-page-team-port.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Team ports. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-team-port.h" diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c index f0a3f839d7..3cda1257a7 100644 --- a/clients/tui/nmt-page-team.c +++ b/clients/tui/nmt-page-team.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Team connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-team.h" diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c index 549156dd33..299a726721 100644 --- a/clients/tui/nmt-page-vlan.c +++ b/clients/tui/nmt-page-vlan.c @@ -8,7 +8,7 @@ * @short_description: The editor page for VLAN connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-editor-bindings.h" diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c index 817e23bde6..247a0e4e3e 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -12,7 +12,7 @@ * properties. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c index 679bf05229..5f68946b33 100644 --- a/clients/tui/nmt-password-dialog.c +++ b/clients/tui/nmt-password-dialog.c @@ -11,7 +11,7 @@ * secrets when activating a connection. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-password-dialog.h" #include "nm-secret-agent-simple.h" diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c index c4c54a26bf..45073c7e47 100644 --- a/clients/tui/nmt-password-fields.c +++ b/clients/tui/nmt-password-fields.c @@ -12,7 +12,7 @@ * "Show password" checkbox that toggles whether the password is visible. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-password-fields.h" diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c index d2e54122e7..ffccf38d2d 100644 --- a/clients/tui/nmt-route-editor.c +++ b/clients/tui/nmt-route-editor.c @@ -12,7 +12,7 @@ * wide to fit into the main window. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-route-editor.h" #include "nmt-route-table.h" diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c index 545eaf14ea..5cd150b087 100644 --- a/clients/tui/nmt-route-entry.c +++ b/clients/tui/nmt-route-entry.c @@ -13,7 +13,7 @@ * This is used as a building block by #NmtRouteTable. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c index e38149450a..fcb14e6a1d 100644 --- a/clients/tui/nmt-route-table.c +++ b/clients/tui/nmt-route-table.c @@ -11,7 +11,7 @@ * and buttons to add and remove entries. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c index 9a2f6d241c..a6ce554de7 100644 --- a/clients/tui/nmt-slave-list.c +++ b/clients/tui/nmt-slave-list.c @@ -11,7 +11,7 @@ * slaves of a connection. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-slave-list.h" diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c index 39889e11c6..bac763f696 100644 --- a/clients/tui/nmt-utils.c +++ b/clients/tui/nmt-utils.c @@ -8,7 +8,7 @@ * @short_description: Miscellaneous nmtui-specific utilities */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-utils.h" diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c index d25c01c77e..9c8ac47519 100644 --- a/clients/tui/nmt-widget-list.c +++ b/clients/tui/nmt-widget-list.c @@ -17,7 +17,7 @@ * FIXME: The way this works is sort of weird. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-widget-list.h" diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 356badb011..23439ced73 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -11,7 +11,7 @@ * including presenting a password dialog if necessary. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index 8a88e1162a..534643a764 100644 --- a/clients/tui/nmtui-edit.c +++ b/clients/tui/nmtui-edit.c @@ -10,7 +10,7 @@ * nmtui-edit implements editing #NMConnections. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c index 07e0f6058c..1d93fd04ae 100644 --- a/clients/tui/nmtui-hostname.c +++ b/clients/tui/nmtui-hostname.c @@ -10,7 +10,7 @@ * nmtui-hostname implements the "set hostname" functionality */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt.h" diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 73ead40e8f..914b043470 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -11,14 +11,14 @@ * nmtui_edit(), and nmtui_hostname(). */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmtui.h" #include #include -#include "nm-libnm-aux/nm-libnm-aux.h" +#include "libnm-client-aux-extern/nm-libnm-aux.h" #include "nmt-newt.h" #include "nm-editor-bindings.h" diff --git a/configure.ac b/configure.ac index ba64a95835..0489ff8072 100644 --- a/configure.ac +++ b/configure.ac @@ -1305,7 +1305,6 @@ AC_SUBST(AM_CFLAGS) AC_CONFIG_FILES([ Makefile -libnm/libnm.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile @@ -1313,6 +1312,7 @@ docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc +src/libnm-client-impl/libnm.pc src/libnm-core-public/nm-version-macros.h ]) AC_OUTPUT diff --git a/contrib/scripts/nm-code-format.sh b/contrib/scripts/nm-code-format.sh index 2de32aafc6..a44506585c 100755 --- a/contrib/scripts/nm-code-format.sh +++ b/contrib/scripts/nm-code-format.sh @@ -8,17 +8,17 @@ die() { } EXCLUDE=( - ":(exclude)shared/c-list" - ":(exclude)shared/c-list" - ":(exclude)shared/c-list" - ":(exclude)shared/c-rbtree" - ":(exclude)shared/c-siphash" - ":(exclude)shared/c-stdaux" - ":(exclude)shared/n-acd" - ":(exclude)shared/n-dhcp4" - ":(exclude)shared/nm-std-aux/unaligned.h" - ":(exclude)shared/systemd/src" + ":(exclude)src/c-list" + ":(exclude)src/c-list" + ":(exclude)src/c-list" + ":(exclude)src/c-rbtree" + ":(exclude)src/c-siphash" + ":(exclude)src/c-stdaux" ":(exclude)src/core/systemd/src" + ":(exclude)src/libnm-std-aux/unaligned.h" + ":(exclude)src/libnm-systemd-shared/src" + ":(exclude)src/n-acd" + ":(exclude)src/n-dhcp4" ) NM_ROOT="$(git rev-parse --show-toplevel)" || die "not inside a git repository" diff --git a/dispatcher/meson.build b/dispatcher/meson.build index d53cc19580..0bfa4590a5 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -20,7 +20,7 @@ libnm_dispatcher_core = static_library( dependencies: [ libnm_dep, libnm_nm_default_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, ], ) diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c index 78885712f2..f754a3fa70 100644 --- a/dispatcher/nm-dispatcher-utils.c +++ b/dispatcher/nm-dispatcher-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-dispatcher-utils.h" diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c index 06744ff3ab..3447f65ef3 100644 --- a/dispatcher/nm-dispatcher.c +++ b/dispatcher/nm-dispatcher.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c index 20097b56e6..a25e921746 100644 --- a/dispatcher/tests/test-dispatcher-envp.c +++ b/dispatcher/tests/test-dispatcher-envp.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include #include @@ -11,7 +11,7 @@ #include "nm-dispatcher-utils.h" #include "libnm-core-aux-extern/nm-dispatcher-api.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" #include "nmdbus-dispatcher.h" diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index c868fff790..3de6976b70 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -17,8 +17,11 @@ DOC_SOURCE_DIR= \ $(top_srcdir)/src/libnm-core-public \ $(top_builddir)/src/libnm-core-impl \ $(top_srcdir)/src/libnm-core-impl \ - $(top_srcdir)/libnm \ - $(top_builddir)/libnm + $(top_srcdir)/src/libnm-client-public \ + $(top_builddir)/src/libnm-client-public \ + $(top_srcdir)/src/libnm-client-impl \ + $(top_builddir)/src/libnm-client-impl \ + $(NULL) # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators="NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?" @@ -30,8 +33,8 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml FIXXREF_OPTIONS= # Used for dependencies. -HFILE_GLOB=$(top_srcdir)/src/libnm-core-public/*.h $(top_srcdir)/libnm/*.h -CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/libnm/*.c +HFILE_GLOB=$(top_srcdir)/src/libnm-core-public/*.h $(top_srcdir)/src/libnm-client-public/*.h +CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/src/libnm-client-impl/*.c # Header files to ignore when scanning. IGNORE_HFILES= \ @@ -88,14 +91,14 @@ extra_files = libnm.png GTKDOC_CFLAGS = \ -I$(top_builddir)/src/libnm-core-public \ -I$(top_srcdir)/src/libnm-core-public \ - -I$(top_builddir)/libnm \ - -I$(top_srcdir)/libnm \ + -I$(top_srcdir)/src/libnm-client-public \ + -I$(top_builddir)/src/libnm-client-public \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/libnm/libnm.la \ + $(top_builddir)/src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(SANITIZER_EXEC_LDFLAGS) diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 7cb5c646ee..746335c4ce 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -54,7 +54,7 @@ gnome.gtkdoc( main_xml: libnm_name + '-docs.xml', src_dir: [ libnm_core_public_inc, - libnm_inc, + libnm_client_public_inc, ], dependencies: libnm_dep, scan_args: scan_args, diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build index 41c46ca806..cf26fdf4bf 100644 --- a/examples/C/glib/meson.build +++ b/examples/C/glib/meson.build @@ -1,9 +1,9 @@ # SPDX-License-Identifier: LGPL-2.1-or-later examples = [ - ['add-connection-gdbus', [libnm_enum_sources[1]], [uuid_dep]], + ['add-connection-gdbus', [libnm_client_public_enum_sources[1]], [uuid_dep]], ['add-connection-libnm', [], [libnm_dep]], - ['get-active-connections-gdbus', [libnm_enum_sources[1]], []], + ['get-active-connections-gdbus', [libnm_client_public_enum_sources[1]], []], ['get-ap-info-libnm', [], [libnm_dep]], ['list-connections-gdbus', [], []], ['list-connections-libnm', [], [libnm_dep]], diff --git a/meson.build b/meson.build index 1b114ef923..856919fdd5 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'NetworkManager', 'c', # NOTE: When incrementing version also: # - add corresponding NM_VERSION_x_y_z macros in -# "shared/nm-version-macros.h.in" +# "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac version: '1.31.1', license: 'GPL2+', @@ -919,9 +919,7 @@ fi content_files = [] subdir('introspection') -subdir('shared') subdir('src') -subdir('libnm') subdir('dispatcher') subdir('clients') subdir('data') diff --git a/po/POTFILES.in b/po/POTFILES.in index db73203878..2314ab721b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -52,41 +52,6 @@ clients/tui/nmtui-edit.c clients/tui/nmtui-hostname.c clients/tui/nmtui.c data/org.freedesktop.NetworkManager.policy.in.in -libnm/nm-client.c -libnm/nm-device-6lowpan.c -libnm/nm-device-adsl.c -libnm/nm-device-bond.c -libnm/nm-device-bridge.c -libnm/nm-device-bt.c -libnm/nm-device-dummy.c -libnm/nm-device-ethernet.c -libnm/nm-device-generic.c -libnm/nm-device-infiniband.c -libnm/nm-device-ip-tunnel.c -libnm/nm-device-macvlan.c -libnm/nm-device-modem.c -libnm/nm-device-olpc-mesh.c -libnm/nm-device-ovs-bridge.c -libnm/nm-device-ovs-interface.c -libnm/nm-device-ovs-port.c -libnm/nm-device-team.c -libnm/nm-device-tun.c -libnm/nm-device-veth.c -libnm/nm-device-vlan.c -libnm/nm-device-vrf.c -libnm/nm-device-vxlan.c -libnm/nm-device-wifi-p2p.c -libnm/nm-device-wifi.c -libnm/nm-device-wimax.c -libnm/nm-device-wpan.c -libnm/nm-device.c -libnm/nm-object.c -libnm/nm-remote-connection.c -libnm/nm-secret-agent-old.c -libnm/nm-vpn-plugin-old.c -libnm/nm-vpn-service-plugin.c -shared/nm-glib-aux/nm-shared-utils.c -shared/nm-log-core/nm-logging.c src/core/NetworkManagerUtils.c src/core/devices/adsl/nm-device-adsl.c src/core/devices/bluetooth/nm-bluez-manager.c @@ -122,6 +87,39 @@ src/core/nm-iface-helper.c src/core/nm-manager.c src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +src/libnm-client-impl/nm-client.c +src/libnm-client-impl/nm-device-6lowpan.c +src/libnm-client-impl/nm-device-adsl.c +src/libnm-client-impl/nm-device-bond.c +src/libnm-client-impl/nm-device-bridge.c +src/libnm-client-impl/nm-device-bt.c +src/libnm-client-impl/nm-device-dummy.c +src/libnm-client-impl/nm-device-ethernet.c +src/libnm-client-impl/nm-device-generic.c +src/libnm-client-impl/nm-device-infiniband.c +src/libnm-client-impl/nm-device-ip-tunnel.c +src/libnm-client-impl/nm-device-macvlan.c +src/libnm-client-impl/nm-device-modem.c +src/libnm-client-impl/nm-device-olpc-mesh.c +src/libnm-client-impl/nm-device-ovs-bridge.c +src/libnm-client-impl/nm-device-ovs-interface.c +src/libnm-client-impl/nm-device-ovs-port.c +src/libnm-client-impl/nm-device-team.c +src/libnm-client-impl/nm-device-tun.c +src/libnm-client-impl/nm-device-veth.c +src/libnm-client-impl/nm-device-vlan.c +src/libnm-client-impl/nm-device-vrf.c +src/libnm-client-impl/nm-device-vxlan.c +src/libnm-client-impl/nm-device-wifi-p2p.c +src/libnm-client-impl/nm-device-wifi.c +src/libnm-client-impl/nm-device-wimax.c +src/libnm-client-impl/nm-device-wpan.c +src/libnm-client-impl/nm-device.c +src/libnm-client-impl/nm-object.c +src/libnm-client-impl/nm-remote-connection.c +src/libnm-client-impl/nm-secret-agent-old.c +src/libnm-client-impl/nm-vpn-plugin-old.c +src/libnm-client-impl/nm-vpn-service-plugin.c src/libnm-core-aux-extern/nm-libnm-core-aux.c src/libnm-core-aux-intern/nm-libnm-core-utils.c src/libnm-core-impl/nm-connection.c @@ -183,3 +181,5 @@ src/libnm-core-impl/nm-team-utils.c src/libnm-core-impl/nm-utils.c src/libnm-core-impl/nm-vpn-editor-plugin.c src/libnm-core-impl/nm-vpn-plugin-info.c +src/libnm-glib-aux/nm-shared-utils.c +src/libnm-log-core/nm-logging.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 425b100e5c..58b2f7b288 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -5,8 +5,8 @@ data/NetworkManager.service.in data/org.freedesktop.NetworkManager.policy.in examples/python/NetworkManager.py examples/python/systray/eggtrayicon.c -shared/nm-utils/nm-vpn-editor-plugin-call.h -shared/nm-utils/nm-vpn-plugin-utils.c +src/contrib/nm-vpn-editor-plugin-call.h +src/contrib/nm-vpn-plugin-utils.c vpn-daemons/openvpn vpn-daemons/pptp vpn-daemons/vpnc diff --git a/shared/README.md b/shared/README.md deleted file mode 100644 index ed950fce39..0000000000 --- a/shared/README.md +++ /dev/null @@ -1,108 +0,0 @@ -The "shared/" Directory -======================= - -For NetworkManager we place helper/utility code under "shared/" -in static libraries. The idea is to avoid code duplication but also -provide high quality helper functions that simplify the higher layers. -In NetworkManager there are complicated parts, for example "src/nm-manager.c" -is huge. On the other hand, this helper code should be simple and easy -to understand, so that we can build more complex code on top of it. - -As we statically link them into our binaries, they are all inherently -internal API, that means they cannot be part of libnm's (libnm-core's) public API. -It also means that their API/ABI is not stable. - -We don't care these libraries to be minimal and contain only symbols that are -used by all users. Instead, we expect the linker to throw away unused symbols. -We achieve this by having a symbol versioning file to hide internal symbols -(which gives the linker a possibility to remove them if they are unused) and -compiling with LTO or `"-Wl,--gc-sections"`. Let the tool solve this and not -manual organization. - -Hence these libraries (and their content) are structured this way to satisfy -the following questions: - -1) which dependencies (libraries) do they have? That determines which - other libraries can use it. For example: - - - "shared/nm-std-aux" and "shared/nm-glib-aux" both provide general - purpose helpers, the difference is that the former has no dependency - on glib2 library. Both these libraries are a basic dependency for - many other parts of the code. - - - "shared/nm-udev-aux" has a dependency on libudev, it thus cannot - be in "shared/nm-glib-aux". - - - client code also has a glib2 dependency. That means it can link with - "shared/nm-std-aux" and "shared/nm-glib-aux", but must not link - with "shared/nm-udev-aux" (as it has no direct udev dependenct -- - although clients get it indirectly because libnm already requires - it). - -2) what is their overall purpose? As said, we rely on the linker to - prune unused symbols. But in a few cases we avoid to merge different - code in the same library. For example: - - - "shared/nm-glib-aux" and "shared/nm-base" both only have a - glib2 dependency. Hence, they could be merged. However we - don't do that because "shared/nm-base" is more about NetworkManager - specific code, while "shared/nm-glib-aux" is about general - purpose helpers. - -3) some of these libraries are forked from an upstream. They are kept - separate so that we can re-import future upstream versions. - -Detail -====== - -- `shared/c-list` -- `shared/c-rbtree` -- `shared/c-siphash` -- `shared/c-stdoux` -- `shared/n-acd` -- `shared/n-dhcp4` - - These are forked from upstream and imported with git-subtree. They - in general only have a libc dependency (or dependencies between each - other). - -- `shared/nm-std-aux` - - This contains helper code with only a libc dependency. - Almost all C code depends on this library. - -- `shared/nm-glib-aux` - - Like "shared/nm-std-aux" but also has a glib2 dependency. - Almost all glib2 code depends on this library. - -- `shared/nm-udev/aux` - - Like "shared/nm-glib-aux" but also has a libudev dependency. It - has code related to libudev. - -- `shared/systemd` - - These are forked from upstream systemd and imported with a script. - Under "shared/systemd/src" we try to keep the sources as close to - the original as possible. There is also some adapter code to make - it useable for us. It has a dependency on "shared/nm-glib-aux" - and will need a logging implementation for "shared/nm-glib-aux/nm-logging-fwd.h". - -- `shared/nm-base` - - Depends on "shared/nm-glib-aux" and glib2 but it provides helper code - that more about NetworkManager specifc things. - -- `shared/nm-log-core` - - This is the logging implementation as used by NetworkManager core ("src/"). - It is also a dependency for "shared/nm-platform". - -- `shared/nm-platform` - - Platform implementation. It depends on "shared/nm-log-core", "shared/nm-base" - and "shared/nm-glib-aux". - -- Other than that, there are still a few unorganized files/directories here. - These should be cleaned up. diff --git a/shared/meson.build b/shared/meson.build deleted file mode 100644 index 6d680beb1a..0000000000 --- a/shared/meson.build +++ /dev/null @@ -1,288 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -shared_inc = include_directories('.') - -glib_nm_default_dep = declare_dependency( - include_directories: [ - shared_inc, - top_inc, - ], - dependencies: [ - glib_dep, - ], -) - -libc_siphash = static_library( - 'c-siphash', - sources: 'c-siphash/src/c-siphash.c', - include_directories: include_directories('c-stdaux/src'), -) - -libc_rbtree = static_library( - 'c-rbtree', - sources: 'c-rbtree/src/c-rbtree.c', - include_directories: include_directories('c-stdaux/src'), - c_args: '-std=c11', -) - -if enable_ebpf - n_acd_bpf_source = 'n-acd/src/n-acd-bpf.c' -else - n_acd_bpf_source = 'n-acd/src/n-acd-bpf-fallback.c' -endif - -libn_acd = static_library( - 'n-acd', - sources: files( - 'n-acd/src/n-acd.c', - 'n-acd/src/n-acd-probe.c', - 'n-acd/src/util/timer.c', - n_acd_bpf_source, - ), - include_directories: include_directories( - 'c-list/src', - 'c-rbtree/src', - 'c-siphash/src', - 'c-stdaux/src', - ), - c_args: [ - '-D_GNU_SOURCE', - '-DSO_ATTACH_BPF=50', - '-std=c11', - '-Wno-pointer-arith', - '-Wno-vla', - ], - link_with: [ - libc_rbtree, - libc_siphash, - ], -) - -libn_acd_dep = declare_dependency( - include_directories: shared_inc, - link_with: libn_acd, -) - -libn_dhcp4 = static_library( - 'n-dhcp4', - sources: files( - 'n-dhcp4/src/n-dhcp4-c-connection.c', - 'n-dhcp4/src/n-dhcp4-c-lease.c', - 'n-dhcp4/src/n-dhcp4-client.c', - 'n-dhcp4/src/n-dhcp4-c-probe.c', - 'n-dhcp4/src/n-dhcp4-incoming.c', - 'n-dhcp4/src/n-dhcp4-outgoing.c', - 'n-dhcp4/src/n-dhcp4-socket.c', - 'n-dhcp4/src/util/packet.c', - 'n-dhcp4/src/util/socket.c', - ), - c_args: [ - '-D_GNU_SOURCE', - '-Wno-declaration-after-statement', - '-Wno-pointer-arith', - ], - include_directories: include_directories( - 'c-list/src', - 'c-siphash/src', - 'c-stdaux/src', - ), - link_with: libc_siphash, -) - -libn_dhcp4_dep = declare_dependency( - include_directories: shared_inc, - link_with: libn_dhcp4, -) - -nm_test_utils_impl_source = files('nm-test-utils-impl.c') - -nm_vpn_plugin_utils_source = files('nm-utils/nm-vpn-plugin-utils.c') - -libnm_std_aux = static_library( - 'nm-std-aux', - sources: [ - 'nm-std-aux/c-list-util.c', - 'nm-std-aux/nm-std-utils.c', - ], - include_directories: top_inc, -) - -libnm_glib_aux = static_library( - 'nm-glib-aux', - sources: files( - 'nm-glib-aux/nm-dbus-aux.c', - '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-json-aux.c', - 'nm-glib-aux/nm-keyfile-aux.c', - 'nm-glib-aux/nm-logging-base.c', - 'nm-glib-aux/nm-random-utils.c', - 'nm-glib-aux/nm-ref-string.c', - 'nm-glib-aux/nm-secret-utils.c', - 'nm-glib-aux/nm-shared-utils.c', - 'nm-glib-aux/nm-time-utils.c', - ), - dependencies: glib_nm_default_dep, - link_with: [ - libc_siphash, - libnm_std_aux, - ], -) - -libnm_glib_aux_dep = declare_dependency( - include_directories: [ - shared_inc, - top_inc, - ], - dependencies: [ - glib_nm_default_dep, - ], -) - -libnm_glib_aux_dep_link = declare_dependency( - dependencies: libnm_glib_aux_dep, - link_with: libnm_glib_aux, -) - -libnm_udev_aux = static_library( - 'nm-udev-aux', - sources: 'nm-udev-aux/nm-udev-utils.c', - dependencies: [ - glib_nm_default_dep, - libudev_dep, - ], -) - -libnm_udev_aux_dep = declare_dependency( - include_directories: shared_inc, - link_with: libnm_udev_aux, -) - -libnm_base = static_library( - 'nm-base', - sources: files( - 'nm-base/nm-ethtool-base.c', - ), - dependencies: libnm_glib_aux_dep_link, -) - -libnm_base_dep = declare_dependency( - include_directories: shared_inc, - dependencies: libnm_glib_aux_dep, -) - -libnm_base_dep_link = declare_dependency( - dependencies: libnm_glib_aux_dep_link, - link_with: libnm_base, -) - -libnm_log_core = static_library( - 'nm-log-core', - sources: 'nm-log-core/nm-logging.c', - dependencies: [ - glib_nm_default_dep, - libsystemd_dep, - ], -) - -libnm_log_core_dep = declare_dependency( - include_directories: shared_inc, - dependencies: [ - libnm_glib_aux_dep_link, - ], - link_with: libnm_log_core, -) - -libnm_platform = static_library( - 'nm-platform', - sources: [ - 'nm-platform/nm-netlink.c', - 'nm-platform/nm-platform-utils.c', - 'nm-platform/nmp-netns.c', - ], - dependencies: [ - glib_nm_default_dep, - ], -) - -libnm_platform_dep = declare_dependency( - include_directories: shared_inc, - dependencies: [ - libnm_glib_aux_dep_link, - ], - link_with: libnm_platform, -) - -libnm_systemd_shared = static_library( - 'nm-systemd-shared', - sources: files( - 'systemd/nm-sd-utils-shared.c', - 'systemd/src/basic/alloc-util.c', - 'systemd/src/basic/env-file.c', - 'systemd/src/basic/env-util.c', - 'systemd/src/basic/escape.c', - 'systemd/src/basic/ether-addr-util.c', - 'systemd/src/basic/extract-word.c', - 'systemd/src/basic/fd-util.c', - 'systemd/src/basic/fileio.c', - 'systemd/src/basic/format-util.c', - 'systemd/src/basic/fs-util.c', - 'systemd/src/basic/hash-funcs.c', - 'systemd/src/basic/hashmap.c', - 'systemd/src/basic/hexdecoct.c', - 'systemd/src/basic/hostname-util.c', - 'systemd/src/basic/in-addr-util.c', - 'systemd/src/basic/io-util.c', - 'systemd/src/basic/memory-util.c', - 'systemd/src/basic/mempool.c', - 'systemd/src/basic/parse-util.c', - 'systemd/src/basic/path-util.c', - 'systemd/src/basic/prioq.c', - 'systemd/src/basic/process-util.c', - 'systemd/src/basic/random-util.c', - 'systemd/src/basic/ratelimit.c', - 'systemd/src/basic/signal-util.c', - 'systemd/src/basic/socket-util.c', - 'systemd/src/basic/stat-util.c', - 'systemd/src/basic/string-table.c', - 'systemd/src/basic/string-util.c', - 'systemd/src/basic/strv.c', - 'systemd/src/basic/strxcpyx.c', - 'systemd/src/basic/time-util.c', - 'systemd/src/basic/tmpfile-util.c', - 'systemd/src/basic/utf8.c', - 'systemd/src/basic/util.c', - 'systemd/src/shared/dns-domain.c', - 'systemd/src/shared/web-util.c', - ), - include_directories: include_directories( - 'systemd/sd-adapt-shared', - 'systemd/src/basic', - 'systemd/src/shared', - ), - dependencies: glib_nm_default_dep, -) - -libnm_systemd_shared_dep = declare_dependency( - include_directories: include_directories( - 'systemd/sd-adapt-shared', - 'systemd/src/basic', - 'systemd/src/shared', - ), - dependencies: glib_dep, - link_with: libnm_systemd_shared, -) - -libnm_systemd_logging_stub = static_library( - 'nm-systemd-logging-stub', - sources: 'systemd/nm-logging-stub.c', - dependencies: glib_nm_default_dep, -) - -if enable_tests - subdir('nm-glib-aux/tests') - subdir('nm-platform/tests') -endif diff --git a/shared/systemd/sd-adapt-shared/unaligned.h b/shared/systemd/sd-adapt-shared/unaligned.h deleted file mode 100644 index ac1a6928c5..0000000000 --- a/shared/systemd/sd-adapt-shared/unaligned.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "nm-std-aux/unaligned.h" diff --git a/shared/c-list/.editorconfig b/src/c-list/.editorconfig similarity index 100% rename from shared/c-list/.editorconfig rename to src/c-list/.editorconfig diff --git a/shared/c-list/.github/workflows/ci.yml b/src/c-list/.github/workflows/ci.yml similarity index 100% rename from shared/c-list/.github/workflows/ci.yml rename to src/c-list/.github/workflows/ci.yml diff --git a/shared/c-list/AUTHORS b/src/c-list/AUTHORS similarity index 100% rename from shared/c-list/AUTHORS rename to src/c-list/AUTHORS diff --git a/shared/c-list/NEWS.md b/src/c-list/NEWS.md similarity index 100% rename from shared/c-list/NEWS.md rename to src/c-list/NEWS.md diff --git a/shared/c-list/README.md b/src/c-list/README.md similarity index 100% rename from shared/c-list/README.md rename to src/c-list/README.md diff --git a/shared/c-list/meson.build b/src/c-list/meson.build similarity index 100% rename from shared/c-list/meson.build rename to src/c-list/meson.build diff --git a/shared/c-list/src/c-list.h b/src/c-list/src/c-list.h similarity index 100% rename from shared/c-list/src/c-list.h rename to src/c-list/src/c-list.h diff --git a/shared/c-list/src/meson.build b/src/c-list/src/meson.build similarity index 100% rename from shared/c-list/src/meson.build rename to src/c-list/src/meson.build diff --git a/shared/c-list/src/test-api.c b/src/c-list/src/test-api.c similarity index 100% rename from shared/c-list/src/test-api.c rename to src/c-list/src/test-api.c diff --git a/shared/c-list/src/test-basic.c b/src/c-list/src/test-basic.c similarity index 100% rename from shared/c-list/src/test-basic.c rename to src/c-list/src/test-basic.c diff --git a/shared/c-list/src/test-embed.c b/src/c-list/src/test-embed.c similarity index 100% rename from shared/c-list/src/test-embed.c rename to src/c-list/src/test-embed.c diff --git a/shared/c-rbtree/.editorconfig b/src/c-rbtree/.editorconfig similarity index 100% rename from shared/c-rbtree/.editorconfig rename to src/c-rbtree/.editorconfig diff --git a/shared/c-rbtree/.github/workflows/ci.yml b/src/c-rbtree/.github/workflows/ci.yml similarity index 100% rename from shared/c-rbtree/.github/workflows/ci.yml rename to src/c-rbtree/.github/workflows/ci.yml diff --git a/shared/c-rbtree/.gitmodules b/src/c-rbtree/.gitmodules similarity index 100% rename from shared/c-rbtree/.gitmodules rename to src/c-rbtree/.gitmodules diff --git a/shared/c-rbtree/AUTHORS b/src/c-rbtree/AUTHORS similarity index 100% rename from shared/c-rbtree/AUTHORS rename to src/c-rbtree/AUTHORS diff --git a/shared/c-rbtree/NEWS.md b/src/c-rbtree/NEWS.md similarity index 100% rename from shared/c-rbtree/NEWS.md rename to src/c-rbtree/NEWS.md diff --git a/shared/c-rbtree/README.md b/src/c-rbtree/README.md similarity index 100% rename from shared/c-rbtree/README.md rename to src/c-rbtree/README.md diff --git a/shared/c-rbtree/meson.build b/src/c-rbtree/meson.build similarity index 100% rename from shared/c-rbtree/meson.build rename to src/c-rbtree/meson.build diff --git a/shared/c-rbtree/src/c-rbtree-private.h b/src/c-rbtree/src/c-rbtree-private.h similarity index 100% rename from shared/c-rbtree/src/c-rbtree-private.h rename to src/c-rbtree/src/c-rbtree-private.h diff --git a/shared/c-rbtree/src/c-rbtree.c b/src/c-rbtree/src/c-rbtree.c similarity index 100% rename from shared/c-rbtree/src/c-rbtree.c rename to src/c-rbtree/src/c-rbtree.c diff --git a/shared/c-rbtree/src/c-rbtree.h b/src/c-rbtree/src/c-rbtree.h similarity index 100% rename from shared/c-rbtree/src/c-rbtree.h rename to src/c-rbtree/src/c-rbtree.h diff --git a/shared/c-rbtree/src/libcrbtree.sym b/src/c-rbtree/src/libcrbtree.sym similarity index 100% rename from shared/c-rbtree/src/libcrbtree.sym rename to src/c-rbtree/src/libcrbtree.sym diff --git a/shared/c-rbtree/src/meson.build b/src/c-rbtree/src/meson.build similarity index 100% rename from shared/c-rbtree/src/meson.build rename to src/c-rbtree/src/meson.build diff --git a/shared/c-rbtree/src/test-api.c b/src/c-rbtree/src/test-api.c similarity index 100% rename from shared/c-rbtree/src/test-api.c rename to src/c-rbtree/src/test-api.c diff --git a/shared/c-rbtree/src/test-basic.c b/src/c-rbtree/src/test-basic.c similarity index 100% rename from shared/c-rbtree/src/test-basic.c rename to src/c-rbtree/src/test-basic.c diff --git a/shared/c-rbtree/src/test-map.c b/src/c-rbtree/src/test-map.c similarity index 100% rename from shared/c-rbtree/src/test-map.c rename to src/c-rbtree/src/test-map.c diff --git a/shared/c-rbtree/src/test-misc.c b/src/c-rbtree/src/test-misc.c similarity index 100% rename from shared/c-rbtree/src/test-misc.c rename to src/c-rbtree/src/test-misc.c diff --git a/shared/c-rbtree/src/test-parallel.c b/src/c-rbtree/src/test-parallel.c similarity index 100% rename from shared/c-rbtree/src/test-parallel.c rename to src/c-rbtree/src/test-parallel.c diff --git a/shared/c-rbtree/src/test-posix.c b/src/c-rbtree/src/test-posix.c similarity index 100% rename from shared/c-rbtree/src/test-posix.c rename to src/c-rbtree/src/test-posix.c diff --git a/shared/c-rbtree/subprojects/c-stdaux b/src/c-rbtree/subprojects/c-stdaux similarity index 100% rename from shared/c-rbtree/subprojects/c-stdaux rename to src/c-rbtree/subprojects/c-stdaux diff --git a/shared/c-siphash/.editorconfig b/src/c-siphash/.editorconfig similarity index 100% rename from shared/c-siphash/.editorconfig rename to src/c-siphash/.editorconfig diff --git a/shared/c-siphash/.github/workflows/ci.yml b/src/c-siphash/.github/workflows/ci.yml similarity index 100% rename from shared/c-siphash/.github/workflows/ci.yml rename to src/c-siphash/.github/workflows/ci.yml diff --git a/shared/c-siphash/.gitmodules b/src/c-siphash/.gitmodules similarity index 100% rename from shared/c-siphash/.gitmodules rename to src/c-siphash/.gitmodules diff --git a/shared/c-siphash/AUTHORS b/src/c-siphash/AUTHORS similarity index 100% rename from shared/c-siphash/AUTHORS rename to src/c-siphash/AUTHORS diff --git a/shared/c-siphash/NEWS.md b/src/c-siphash/NEWS.md similarity index 100% rename from shared/c-siphash/NEWS.md rename to src/c-siphash/NEWS.md diff --git a/shared/c-siphash/README.md b/src/c-siphash/README.md similarity index 100% rename from shared/c-siphash/README.md rename to src/c-siphash/README.md diff --git a/shared/c-siphash/meson.build b/src/c-siphash/meson.build similarity index 100% rename from shared/c-siphash/meson.build rename to src/c-siphash/meson.build diff --git a/shared/c-siphash/src/c-siphash.c b/src/c-siphash/src/c-siphash.c similarity index 100% rename from shared/c-siphash/src/c-siphash.c rename to src/c-siphash/src/c-siphash.c diff --git a/shared/c-siphash/src/c-siphash.h b/src/c-siphash/src/c-siphash.h similarity index 100% rename from shared/c-siphash/src/c-siphash.h rename to src/c-siphash/src/c-siphash.h diff --git a/shared/c-siphash/src/libcsiphash.sym b/src/c-siphash/src/libcsiphash.sym similarity index 100% rename from shared/c-siphash/src/libcsiphash.sym rename to src/c-siphash/src/libcsiphash.sym diff --git a/shared/c-siphash/src/meson.build b/src/c-siphash/src/meson.build similarity index 100% rename from shared/c-siphash/src/meson.build rename to src/c-siphash/src/meson.build diff --git a/shared/c-siphash/src/test-api.c b/src/c-siphash/src/test-api.c similarity index 100% rename from shared/c-siphash/src/test-api.c rename to src/c-siphash/src/test-api.c diff --git a/shared/c-siphash/src/test-basic.c b/src/c-siphash/src/test-basic.c similarity index 100% rename from shared/c-siphash/src/test-basic.c rename to src/c-siphash/src/test-basic.c diff --git a/shared/c-siphash/subprojects/c-stdaux b/src/c-siphash/subprojects/c-stdaux similarity index 100% rename from shared/c-siphash/subprojects/c-stdaux rename to src/c-siphash/subprojects/c-stdaux diff --git a/shared/c-stdaux/.editorconfig b/src/c-stdaux/.editorconfig similarity index 100% rename from shared/c-stdaux/.editorconfig rename to src/c-stdaux/.editorconfig diff --git a/shared/c-stdaux/.github/workflows/ci.yml b/src/c-stdaux/.github/workflows/ci.yml similarity index 100% rename from shared/c-stdaux/.github/workflows/ci.yml rename to src/c-stdaux/.github/workflows/ci.yml diff --git a/shared/c-stdaux/AUTHORS b/src/c-stdaux/AUTHORS similarity index 100% rename from shared/c-stdaux/AUTHORS rename to src/c-stdaux/AUTHORS diff --git a/shared/c-stdaux/NEWS.md b/src/c-stdaux/NEWS.md similarity index 100% rename from shared/c-stdaux/NEWS.md rename to src/c-stdaux/NEWS.md diff --git a/shared/c-stdaux/README.md b/src/c-stdaux/README.md similarity index 100% rename from shared/c-stdaux/README.md rename to src/c-stdaux/README.md diff --git a/shared/c-stdaux/meson.build b/src/c-stdaux/meson.build similarity index 100% rename from shared/c-stdaux/meson.build rename to src/c-stdaux/meson.build diff --git a/shared/c-stdaux/src/c-stdaux.h b/src/c-stdaux/src/c-stdaux.h similarity index 100% rename from shared/c-stdaux/src/c-stdaux.h rename to src/c-stdaux/src/c-stdaux.h diff --git a/shared/c-stdaux/src/meson.build b/src/c-stdaux/src/meson.build similarity index 100% rename from shared/c-stdaux/src/meson.build rename to src/c-stdaux/src/meson.build diff --git a/shared/c-stdaux/src/test-api.c b/src/c-stdaux/src/test-api.c similarity index 100% rename from shared/c-stdaux/src/test-api.c rename to src/c-stdaux/src/test-api.c diff --git a/shared/c-stdaux/src/test-basic.c b/src/c-stdaux/src/test-basic.c similarity index 100% rename from shared/c-stdaux/src/test-basic.c rename to src/c-stdaux/src/test-basic.c diff --git a/src/contrib/meson.build b/src/contrib/meson.build new file mode 100644 index 0000000000..2745087a0b --- /dev/null +++ b/src/contrib/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +nm_vpn_plugin_utils_source = files('nm-vpn-plugin-utils.c') + +src_contrib_nm_compat_source = files('nm-compat.c') diff --git a/shared/nm-utils/nm-compat.c b/src/contrib/nm-compat.c similarity index 97% rename from shared/nm-utils/nm-compat.c rename to src/contrib/nm-compat.c index dad4822755..f15c29c9e6 100644 --- a/shared/nm-utils/nm-compat.c +++ b/src/contrib/nm-compat.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-compat.h" diff --git a/shared/nm-utils/nm-compat.h b/src/contrib/nm-compat.h similarity index 67% rename from shared/nm-utils/nm-compat.h rename to src/contrib/nm-compat.h index 559afd5de1..33eaec1253 100644 --- a/shared/nm-utils/nm-compat.h +++ b/src/contrib/nm-compat.h @@ -8,6 +8,8 @@ #include "nm-setting-vpn.h" +/*****************************************************************************/ + const char **_nm_setting_vpn_get_data_keys(NMSettingVpn *setting, guint *out_length); const char **_nm_setting_vpn_get_secret_keys(NMSettingVpn *setting, guint *out_length); @@ -32,4 +34,22 @@ const char **_nm_setting_vpn_get_secret_keys(NMSettingVpn *setting, guint *out_l _nm_setting_vpn_get_secret_keys(setting, out_length) #endif +/*****************************************************************************/ + +/* possibly missing defines from newer libnm API. */ + +#ifndef NM_VPN_PLUGIN_CONFIG_PROXY_PAC + #define NM_VPN_PLUGIN_CONFIG_PROXY_PAC "pac" +#endif + +#ifndef NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES + #define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes" +#endif + +#ifndef NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES + #define NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES "preserve-routes" +#endif + +/*****************************************************************************/ + #endif /* __NM_COMPAT_H__ */ diff --git a/shared/nm-utils/nm-vpn-editor-plugin-call.h b/src/contrib/nm-vpn-editor-plugin-call.h similarity index 99% rename from shared/nm-utils/nm-vpn-editor-plugin-call.h rename to src/contrib/nm-vpn-editor-plugin-call.h index 5772b843ab..be0a6772e2 100644 --- a/shared/nm-utils/nm-vpn-editor-plugin-call.h +++ b/src/contrib/nm-vpn-editor-plugin-call.h @@ -17,7 +17,7 @@ #include /* we make use of other internal header files, you need those too. */ -#include "nm-glib-aux/nm-macros-internal.h" +#include "libnm-glib-aux/nm-macros-internal.h" /*****************************************************************************/ diff --git a/shared/nm-utils/nm-vpn-plugin-utils.c b/src/contrib/nm-vpn-plugin-utils.c similarity index 98% rename from shared/nm-utils/nm-vpn-plugin-utils.c rename to src/contrib/nm-vpn-plugin-utils.c index 89285ecd2f..b10695b74d 100644 --- a/shared/nm-utils/nm-vpn-plugin-utils.c +++ b/src/contrib/nm-vpn-plugin-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2016, 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-vpn-plugin-utils.h" diff --git a/shared/nm-utils/nm-vpn-plugin-utils.h b/src/contrib/nm-vpn-plugin-utils.h similarity index 100% rename from shared/nm-utils/nm-vpn-plugin-utils.h rename to src/contrib/nm-vpn-plugin-utils.h diff --git a/src/contrib/tests/meson.build b/src/contrib/tests/meson.build new file mode 100644 index 0000000000..0356a03f81 --- /dev/null +++ b/src/contrib/tests/meson.build @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +# just test, that we can build "nm-vpn-plugin-utils.c" +static_library( + 'nm-vpn-plugin-utils-test', + sources: nm_vpn_plugin_utils_source, + dependencies: [ + libnm_client_public_dep, + glib_dep, + ], +) diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index 08402729f9..bb72aaf8d7 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -12,7 +12,7 @@ #include #include -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-c-list.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils.h" @@ -24,7 +24,7 @@ #include "platform/nm-platform.h" #include "nm-auth-utils.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" /*****************************************************************************/ diff --git a/src/core/NetworkManagerUtils.h b/src/core/NetworkManagerUtils.h index 2afb5a3ecc..28b0531ac0 100644 --- a/src/core/NetworkManagerUtils.h +++ b/src/core/NetworkManagerUtils.h @@ -8,7 +8,7 @@ #define __NETWORKMANAGER_UTILS_H__ #include "nm-core-utils.h" -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "nm-setting-ip-config.h" #include "nm-setting-ip6-config.h" #include "platform/nm-platform.h" diff --git a/src/core/devices/adsl/nm-atm-manager.c b/src/core/devices/adsl/nm-atm-manager.c index 9be9b5ce43..8aa23f5005 100644 --- a/src/core/devices/adsl/nm-atm-manager.c +++ b/src/core/devices/adsl/nm-atm-manager.c @@ -12,7 +12,7 @@ #include "nm-device-adsl.h" #include "devices/nm-device-factory.h" #include "platform/nm-platform.h" -#include "nm-udev-aux/nm-udev-utils.h" +#include "libnm-udev-aux/nm-udev-utils.h" /*****************************************************************************/ diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c index fe0350c7f9..a9fdcdd7fd 100644 --- a/src/core/devices/bluetooth/nm-bluez-manager.c +++ b/src/core/devices/bluetooth/nm-bluez-manager.c @@ -12,8 +12,8 @@ #include #include -#include "nm-glib-aux/nm-dbus-aux.h" -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-c-list.h" #include "nm-dbus-manager.h" #include "devices/nm-device-factory.h" #include "devices/nm-device-bridge.h" @@ -25,7 +25,7 @@ #include "nm-bluez5-dun.h" #include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" /*****************************************************************************/ diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c index 92d70aa8f9..8139cf629c 100644 --- a/src/core/devices/nm-device-ethernet.c +++ b/src/core/devices/nm-device-ethernet.c @@ -25,7 +25,7 @@ #include "ppp/nm-ppp-manager-call.h" #include "ppp/nm-ppp-status.h" #include "platform/nm-platform.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "nm-dcb.h" #include "settings/nm-settings-connection.h" #include "nm-config.h" @@ -34,7 +34,7 @@ #include "nm-device-factory.h" #include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" -#include "nm-udev-aux/nm-udev-utils.h" +#include "libnm-udev-aux/nm-udev-utils.h" #include "nm-device-veth.h" #define _NMLOG_DEVICE_TYPE NMDeviceEthernet diff --git a/src/core/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c index f9bd8ad8f8..4ad75d1db5 100644 --- a/src/core/devices/nm-device-wireguard.c +++ b/src/core/devices/nm-device-wireguard.c @@ -12,7 +12,7 @@ #include "nm-setting-wireguard.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-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/core/devices/nm-device.c b/src/core/devices/nm-device.c index 28ba196b60..ab66578688 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -23,12 +23,12 @@ #include #include -#include "nm-std-aux/unaligned.h" -#include "nm-glib-aux/nm-dedup-multi.h" -#include "nm-glib-aux/nm-random-utils.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-std-aux/unaligned.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-random-utils.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" -#include "nm-base/nm-ethtool-base.h" +#include "libnm-base/nm-ethtool-base.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-device-private.h" #include "nm-l3cfg.h" @@ -36,7 +36,7 @@ #include "NetworkManagerUtils.h" #include "nm-manager.h" #include "platform/nm-platform.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "platform/nmp-object.h" #include "platform/nmp-rules-manager.h" #include "ndisc/nm-ndisc.h" diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c index c60fb3ada6..41110e2fe3 100644 --- a/src/core/devices/nm-lldp-listener.c +++ b/src/core/devices/nm-lldp-listener.c @@ -9,9 +9,9 @@ #include -#include "nm-std-aux/unaligned.h" +#include "libnm-std-aux/unaligned.h" #include "platform/nm-platform.h" -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-c-list.h" #include "nm-utils.h" #include "systemd/nm-sd.h" diff --git a/src/core/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c index 0aa613bd75..b8d5311a7a 100644 --- a/src/core/devices/ovs/nm-ovsdb.c +++ b/src/core/devices/ovs/nm-ovsdb.c @@ -10,8 +10,8 @@ #include #include -#include "nm-glib-aux/nm-jansson.h" -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-jansson.h" +#include "libnm-glib-aux/nm-str-buf.h" #include "nm-core-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "devices/nm-device.h" diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c index e6e230eed1..6fc5c78f78 100644 --- a/src/core/devices/team/nm-device-team.c +++ b/src/core/devices/team/nm-device-team.c @@ -15,7 +15,7 @@ #include #include -#include "nm-glib-aux/nm-jansson.h" +#include "libnm-glib-aux/nm-jansson.h" #include "NetworkManagerUtils.h" #include "devices/nm-device-private.h" #include "platform/nm-platform.h" @@ -23,7 +23,7 @@ #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" #include "nm-ip4-config.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" #define _NMLOG_DEVICE_TYPE NMDeviceTeam #include "devices/nm-device-logging.h" diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c index dc5bc54a10..d0aae5a5dd 100644 --- a/src/core/devices/wifi/nm-device-iwd.c +++ b/src/core/devices/wifi/nm-device-iwd.c @@ -15,14 +15,14 @@ #include "nm-config.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" -#include "nm-glib-aux/nm-ref-string.h" +#include "libnm-glib-aux/nm-ref-string.h" #include "nm-iwd-manager.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-setting-8021x.h" #include "nm-setting-connection.h" #include "nm-setting-wireless-security.h" #include "nm-setting-wireless.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" #include "nm-utils.h" #include "nm-wifi-common.h" #include "nm-wifi-utils.h" diff --git a/src/core/devices/wifi/nm-device-wifi-p2p.c b/src/core/devices/wifi/nm-device-wifi-p2p.c index 74eba64c39..0a0955deda 100644 --- a/src/core/devices/wifi/nm-device-wifi-p2p.c +++ b/src/core/devices/wifi/nm-device-wifi-p2p.c @@ -16,7 +16,7 @@ #include "devices/nm-device-private.h" #include "nm-act-request.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-glib-aux/nm-ref-string.h" +#include "libnm-glib-aux/nm-ref-string.h" #include "nm-ip4-config.h" #include "nm-manager.h" #include "nm-manager.h" diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c index 3f55d9f15f..19d340a3af 100644 --- a/src/core/devices/wifi/nm-device-wifi.c +++ b/src/core/devices/wifi/nm-device-wifi.c @@ -12,8 +12,8 @@ #include #include -#include "nm-glib-aux/nm-ref-string.h" -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-ref-string.h" +#include "libnm-glib-aux/nm-c-list.h" #include "nm-device-wifi-p2p.h" #include "nm-wifi-ap.h" #include "libnm-core-aux-intern/nm-common-macros.h" diff --git a/src/core/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c index 58f743d93a..ba62a7ea76 100644 --- a/src/core/devices/wifi/nm-iwd-manager.c +++ b/src/core/devices/wifi/nm-iwd-manager.c @@ -13,9 +13,9 @@ #include "nm-manager.h" #include "nm-device-iwd.h" #include "nm-wifi-utils.h" -#include "nm-glib-aux/nm-random-utils.h" +#include "libnm-glib-aux/nm-random-utils.h" #include "settings/nm-settings.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" /*****************************************************************************/ diff --git a/src/core/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c index 7d39e913d5..e07ea0afe4 100644 --- a/src/core/devices/wifi/nm-wifi-ap.c +++ b/src/core/devices/wifi/nm-wifi-ap.c @@ -15,7 +15,7 @@ #include "devices/nm-device.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" -#include "nm-glib-aux/nm-ref-string.h" +#include "libnm-glib-aux/nm-ref-string.h" #include "nm-setting-wireless.h" #include "nm-utils.h" #include "nm-wifi-utils.h" diff --git a/src/core/devices/wifi/nm-wifi-p2p-peer.c b/src/core/devices/wifi/nm-wifi-p2p-peer.c index 40532bb142..6b04204cb1 100644 --- a/src/core/devices/wifi/nm-wifi-p2p-peer.c +++ b/src/core/devices/wifi/nm-wifi-p2p-peer.c @@ -14,7 +14,7 @@ #include "devices/nm-device.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" -#include "nm-glib-aux/nm-ref-string.h" +#include "libnm-glib-aux/nm-ref-string.h" #include "nm-setting-wireless.h" #include "nm-utils.h" #include "nm-wifi-utils.h" diff --git a/src/core/devices/wwan/nm-modem-manager.c b/src/core/devices/wwan/nm-modem-manager.c index 598c689810..4fb9a37895 100644 --- a/src/core/devices/wwan/nm-modem-manager.c +++ b/src/core/devices/wwan/nm-modem-manager.c @@ -17,7 +17,7 @@ #define sd_booted() FALSE #endif -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" #include "nm-modem.h" #include "nm-modem-broadband.h" diff --git a/src/core/dhcp/meson.build b/src/core/dhcp/meson.build index 6743568ea6..ddaa32fb0e 100644 --- a/src/core/dhcp/meson.build +++ b/src/core/dhcp/meson.build @@ -3,7 +3,11 @@ executable( 'nm-dhcp-helper', 'nm-dhcp-helper.c', - dependencies: glib_nm_default_dep, + include_directories: [ + src_inc, + top_inc, + ], + dependencies: glib_dep, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c index c38c814ead..1b5aa1060e 100644 --- a/src/core/dhcp/nm-dhcp-client.c +++ b/src/core/dhcp/nm-dhcp-client.c @@ -14,8 +14,8 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" -#include "nm-glib-aux/nm-random-utils.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-random-utils.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" diff --git a/src/core/dhcp/nm-dhcp-dhclient-utils.c b/src/core/dhcp/nm-dhcp-dhclient-utils.c index ad1e097f39..59682fb5ae 100644 --- a/src/core/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/core/dhcp/nm-dhcp-dhclient-utils.c @@ -12,7 +12,7 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "nm-dhcp-utils.h" #include "nm-ip4-config.h" diff --git a/src/core/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c index c42a0ba53e..6384f3920c 100644 --- a/src/core/dhcp/nm-dhcp-dhclient.c +++ b/src/core/dhcp/nm-dhcp-dhclient.c @@ -21,7 +21,7 @@ #include #include - #include "nm-glib-aux/nm-dedup-multi.h" + #include "libnm-glib-aux/nm-dedup-multi.h" #include "nm-utils.h" #include "nm-dhcp-dhclient-utils.h" diff --git a/src/core/dhcp/nm-dhcp-helper.c b/src/core/dhcp/nm-dhcp-helper.c index 0f98add127..4ffe93f4bf 100644 --- a/src/core/dhcp/nm-dhcp-helper.c +++ b/src/core/dhcp/nm-dhcp-helper.c @@ -3,13 +3,13 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib.h" +#include "libnm-glib-aux/nm-default-glib.h" #include #include #include -#include "nm-utils/nm-vpn-plugin-macros.h" +#include "libnm-glib-aux/nm-logging-syslog.h" #include "nm-dhcp-helper-api.h" diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c index bc114ad80c..9be32e014c 100644 --- a/src/core/dhcp/nm-dhcp-manager.c +++ b/src/core/dhcp/nm-dhcp-manager.c @@ -16,8 +16,8 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-config.h" #include "NetworkManagerUtils.h" diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c index 116e1bdb24..525fe752a9 100644 --- a/src/core/dhcp/nm-dhcp-nettools.c +++ b/src/core/dhcp/nm-dhcp-nettools.c @@ -13,9 +13,9 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" -#include "nm-std-aux/unaligned.h" -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-std-aux/unaligned.h" +#include "libnm-glib-aux/nm-str-buf.h" #include "nm-utils.h" #include "nm-config.h" @@ -26,7 +26,7 @@ #include "platform/nm-platform.h" #include "nm-dhcp-client-logging.h" #include "n-dhcp4/src/n-dhcp4.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "systemd/nm-sd-utils-dhcp.h" /*****************************************************************************/ diff --git a/src/core/dhcp/nm-dhcp-options.c b/src/core/dhcp/nm-dhcp-options.c index 3537cd147e..8f0d7408a9 100644 --- a/src/core/dhcp/nm-dhcp-options.c +++ b/src/core/dhcp/nm-dhcp-options.c @@ -7,7 +7,7 @@ #include "nm-dhcp-options.h" -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-str-buf.h" /*****************************************************************************/ diff --git a/src/core/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c index b92a9073fa..827ebb77aa 100644 --- a/src/core/dhcp/nm-dhcp-systemd.c +++ b/src/core/dhcp/nm-dhcp-systemd.c @@ -13,8 +13,8 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" -#include "nm-std-aux/unaligned.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-std-aux/unaligned.h" #include "nm-utils.h" #include "nm-dhcp-utils.h" diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c index 9867e4c16e..0233943de2 100644 --- a/src/core/dhcp/nm-dhcp-utils.c +++ b/src/core/dhcp/nm-dhcp-utils.c @@ -8,10 +8,10 @@ #include #include -#include "nm-std-aux/unaligned.h" -#include "nm-glib-aux/nm-dedup-multi.h" -#include "nm-glib-aux/nm-str-buf.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-std-aux/unaligned.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-str-buf.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-dhcp-utils.h" #include "nm-utils.h" diff --git a/src/core/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c index 77626f6962..24ea9a448f 100644 --- a/src/core/dhcp/tests/test-dhcp-dhclient.c +++ b/src/core/dhcp/tests/test-dhcp-dhclient.c @@ -9,7 +9,7 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "NetworkManagerUtils.h" #include "dhcp/nm-dhcp-dhclient-utils.h" diff --git a/src/core/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c index 9b54e2cd02..9fd224e339 100644 --- a/src/core/dhcp/tests/test-dhcp-utils.c +++ b/src/core/dhcp/tests/test-dhcp-utils.c @@ -9,7 +9,7 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "nm-utils.h" #include "dhcp/nm-dhcp-utils.h" diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c index 7ecd785f5f..6ef9f924ee 100644 --- a/src/core/dns/nm-dns-dnsmasq.c +++ b/src/core/dns/nm-dns-dnsmasq.c @@ -15,7 +15,7 @@ #include #include -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" #include "nm-utils.h" diff --git a/src/core/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c index bbf212b135..236a8283aa 100644 --- a/src/core/dns/nm-dns-systemd-resolved.c +++ b/src/core/dns/nm-dns-systemd-resolved.c @@ -16,8 +16,8 @@ #include #include -#include "nm-glib-aux/nm-c-list.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" #include "nm-utils.h" @@ -28,7 +28,7 @@ #include "nm-setting-connection.h" #include "devices/nm-device.h" #include "NetworkManagerUtils.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" #define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1" #define SYSTEMD_RESOLVED_MANAGER_IFACE "org.freedesktop.resolve1.Manager" diff --git a/src/core/initrd/nm-initrd-generator.c b/src/core/initrd/nm-initrd-generator.c index f9756df29b..9d4e3656e2 100644 --- a/src/core/initrd/nm-initrd-generator.c +++ b/src/core/initrd/nm-initrd-generator.c @@ -8,7 +8,7 @@ #include "libnm-core-intern/nm-core-internal.h" #include "libnm-core-intern/nm-keyfile-internal.h" #include "nm-initrd-generator.h" -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" #include "nm-config.h" /*****************************************************************************/ diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c index 3bde667888..646faefbd3 100644 --- a/src/core/initrd/nmi-cmdline-reader.c +++ b/src/core/initrd/nmi-cmdline-reader.c @@ -10,7 +10,7 @@ #include "libnm-core-intern/nm-core-internal.h" #include "nm-initrd-generator.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" /*****************************************************************************/ diff --git a/src/core/meson.build b/src/core/meson.build index b466771eb0..6a9ff34fa6 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -6,7 +6,6 @@ core_plugin_dep = declare_dependency( include_directories: [ src_core_inc, top_inc, - shared_inc, libnm_core_public_inc, ], dependencies: [ @@ -19,7 +18,7 @@ core_plugin_dep = declare_dependency( core_default_dep = declare_dependency( include_directories: [ src_core_inc, - shared_inc, + src_inc, top_inc, ], dependencies: [ diff --git a/src/core/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c index f773478f51..8b63f92c91 100644 --- a/src/core/ndisc/nm-lndp-ndisc.c +++ b/src/core/ndisc/nm-lndp-ndisc.c @@ -13,12 +13,12 @@ #include #include -#include "nm-glib-aux/nm-str-buf.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-glib-aux/nm-str-buf.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-ndisc-private.h" #include "NetworkManagerUtils.h" #include "platform/nm-platform.h" -#include "nm-platform/nmp-netns.h" +#include "libnm-platform/nmp-netns.h" #define _NMLOG_PREFIX_NAME "ndisc-lndp" diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c index a5c1b935fc..e92134c53e 100644 --- a/src/core/ndisc/nm-ndisc.c +++ b/src/core/ndisc/nm-ndisc.c @@ -15,7 +15,7 @@ #include "nm-ndisc-private.h" #include "nm-utils.h" #include "platform/nm-platform.h" -#include "nm-platform/nmp-netns.h" +#include "libnm-platform/nmp-netns.h" #include "nm-l3-config-data.h" #define _NMLOG_PREFIX_NAME "ndisc" diff --git a/src/core/nm-auth-manager.c b/src/core/nm-auth-manager.c index 4a7542ccfe..5c0e465aff 100644 --- a/src/core/nm-auth-manager.c +++ b/src/core/nm-auth-manager.c @@ -8,7 +8,7 @@ #include "nm-auth-manager.h" #include "c-list/src/c-list.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "nm-errors.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" diff --git a/src/core/nm-auth-utils.c b/src/core/nm-auth-utils.c index 96c48cc336..006264dd28 100644 --- a/src/core/nm-auth-utils.c +++ b/src/core/nm-auth-utils.c @@ -7,7 +7,7 @@ #include "nm-auth-utils.h" -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-c-list.h" #include "nm-setting-connection.h" #include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-auth-manager.h" diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index 49dd1af64b..de3363e48e 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c @@ -22,11 +22,11 @@ #include #include -#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-glib-aux/nm-time-utils.h" +#include "libnm-std-aux/unaligned.h" +#include "libnm-glib-aux/nm-random-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-time-utils.h" #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-connection.h" diff --git a/src/core/nm-core-utils.h b/src/core/nm-core-utils.h index 5dc4d43202..01d8322568 100644 --- a/src/core/nm-core-utils.h +++ b/src/core/nm-core-utils.h @@ -12,7 +12,7 @@ #include "nm-connection.h" -#include "nm-glib-aux/nm-time-utils.h" +#include "libnm-glib-aux/nm-time-utils.h" /*****************************************************************************/ diff --git a/src/core/nm-dbus-manager.c b/src/core/nm-dbus-manager.c index cae2d71344..7c1e4eab18 100644 --- a/src/core/nm-dbus-manager.c +++ b/src/core/nm-dbus-manager.c @@ -13,10 +13,10 @@ #include #include "c-list/src/c-list.h" -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-c-list.h" #include "nm-dbus-interface.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" #include "nm-dbus-object.h" #include "NetworkManagerUtils.h" #include "libnm-core-aux-intern/nm-auth-subject.h" diff --git a/src/core/nm-default-daemon.h b/src/core/nm-default-daemon.h index 65ca4b5428..57d4c6afd8 100644 --- a/src/core/nm-default-daemon.h +++ b/src/core/nm-default-daemon.h @@ -8,7 +8,7 @@ /*****************************************************************************/ -#include "nm-glib-aux/nm-default-glib-i18n-prog.h" +#include "libnm-glib-aux/nm-default-glib-i18n-prog.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_DAEMON @@ -19,7 +19,7 @@ #include "nm-core-types.h" #include "nm-types.h" -#include "nm-log-core/nm-logging.h" +#include "libnm-log-core/nm-logging.h" /*****************************************************************************/ diff --git a/src/core/nm-firewall-manager.c b/src/core/nm-firewall-manager.c index 8f476e511a..8094261f19 100644 --- a/src/core/nm-firewall-manager.c +++ b/src/core/nm-firewall-manager.c @@ -7,7 +7,7 @@ #include "nm-firewall-manager.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "c-list/src/c-list.h" #include "NetworkManagerUtils.h" diff --git a/src/core/nm-iface-helper.c b/src/core/nm-iface-helper.c index c125d572d9..9dfee8d9e7 100644 --- a/src/core/nm-iface-helper.c +++ b/src/core/nm-iface-helper.c @@ -16,12 +16,12 @@ #include #include -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-c-list.h" #include "main-utils.h" #include "NetworkManagerUtils.h" #include "platform/nm-linux-platform.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "dhcp/nm-dhcp-manager.h" #include "ndisc/nm-ndisc.h" #include "ndisc/nm-lndp-ndisc.h" diff --git a/src/core/nm-ip4-config.c b/src/core/nm-ip4-config.c index 24ff29895c..575d2876f3 100644 --- a/src/core/nm-ip4-config.c +++ b/src/core/nm-ip4-config.c @@ -12,12 +12,12 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "nm-utils.h" #include "platform/nmp-object.h" #include "platform/nm-platform.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "NetworkManagerUtils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-object.h" diff --git a/src/core/nm-ip4-config.h b/src/core/nm-ip4-config.h index a795e152ca..1196a724cd 100644 --- a/src/core/nm-ip4-config.h +++ b/src/core/nm-ip4-config.h @@ -10,7 +10,7 @@ #include "nm-setting-ip4-config.h" -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "platform/nmp-object.h" #include "nm-ip-config.h" diff --git a/src/core/nm-ip6-config.c b/src/core/nm-ip6-config.c index 0b44064fc5..5501e02f5f 100644 --- a/src/core/nm-ip6-config.c +++ b/src/core/nm-ip6-config.c @@ -13,12 +13,12 @@ #include #include -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "nm-utils.h" #include "platform/nmp-object.h" #include "platform/nm-platform.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "nm-ip4-config.h" diff --git a/src/core/nm-ip6-config.h b/src/core/nm-ip6-config.h index 398186da79..7cc00a83f3 100644 --- a/src/core/nm-ip6-config.h +++ b/src/core/nm-ip6-config.h @@ -10,7 +10,7 @@ #include "nm-setting-ip6-config.h" -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "platform/nmp-object.h" #include "nm-ip-config.h" diff --git a/src/core/nm-keep-alive.c b/src/core/nm-keep-alive.c index 197e30eaf4..6275544ca7 100644 --- a/src/core/nm-keep-alive.c +++ b/src/core/nm-keep-alive.c @@ -8,7 +8,7 @@ #include "nm-keep-alive.h" #include "settings/nm-settings-connection.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" /*****************************************************************************/ diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c index 61ef98f45c..cce7364cd4 100644 --- a/src/core/nm-l3-config-data.c +++ b/src/core/nm-l3-config-data.c @@ -8,10 +8,10 @@ #include #include -#include "nm-glib-aux/nm-enum-utils.h" +#include "libnm-glib-aux/nm-enum-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "platform/nmp-object.h" #include "NetworkManagerUtils.h" diff --git a/src/core/nm-l3-config-data.h b/src/core/nm-l3-config-data.h index b3d9cd32ec..f89095f9b9 100644 --- a/src/core/nm-l3-config-data.h +++ b/src/core/nm-l3-config-data.h @@ -3,7 +3,7 @@ #ifndef __NM_L3_CONFIG_DATA_H__ #define __NM_L3_CONFIG_DATA_H__ -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "nm-setting-connection.h" #include "nm-setting-ip6-config.h" #include "platform/nm-platform.h" diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index 8d2e8a8fe1..d67dfab99d 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -16,7 +16,7 @@ #include #include -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-c-list.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-dbus-manager.h" @@ -43,7 +43,7 @@ #include "libnm-core-intern/nm-core-internal.h" #include "nm-config.h" #include "nm-audit-manager.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" #include "nm-checkpoint.h" #include "nm-checkpoint-manager.h" #include "nm-dbus-object.h" diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c index 51957d7e04..17ba5d6453 100644 --- a/src/core/nm-netns.c +++ b/src/core/nm-netns.c @@ -7,14 +7,14 @@ #include "nm-netns.h" -#include "nm-glib-aux/nm-dedup-multi.h" -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-c-list.h" #include "NetworkManagerUtils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-l3cfg.h" #include "platform/nm-platform.h" -#include "nm-platform/nmp-netns.h" +#include "libnm-platform/nmp-netns.h" #include "platform/nmp-rules-manager.h" /*****************************************************************************/ diff --git a/src/core/nm-netns.h b/src/core/nm-netns.h index aab3b52019..58c8265730 100644 --- a/src/core/nm-netns.h +++ b/src/core/nm-netns.h @@ -6,7 +6,7 @@ #ifndef __NM_NETNS_H__ #define __NM_NETNS_H__ -#include "nm-platform/nmp-base.h" +#include "libnm-platform/nmp-base.h" #define NM_TYPE_NETNS (nm_netns_get_type()) #define NM_NETNS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_NETNS, NMNetns)) diff --git a/src/core/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c index b58aef0649..492580a071 100644 --- a/src/core/nm-pacrunner-manager.c +++ b/src/core/nm-pacrunner-manager.c @@ -15,7 +15,7 @@ #include "nm-ip4-config.h" #include "nm-ip6-config.h" #include "c-list/src/c-list.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #define PACRUNNER_DBUS_SERVICE "org.pacrunner" #define PACRUNNER_DBUS_INTERFACE "org.pacrunner.Manager" diff --git a/src/core/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c index f032851e41..7f0b772629 100644 --- a/src/core/nm-rfkill-manager.c +++ b/src/core/nm-rfkill-manager.c @@ -9,7 +9,7 @@ #include -#include "nm-udev-aux/nm-udev-utils.h" +#include "libnm-udev-aux/nm-udev-utils.h" /*****************************************************************************/ diff --git a/src/core/nm-test-utils-core.h b/src/core/nm-test-utils-core.h index a765e1a3c2..e92d380e24 100644 --- a/src/core/nm-test-utils-core.h +++ b/src/core/nm-test-utils-core.h @@ -11,7 +11,7 @@ #define _NMTST_INSIDE_CORE 1 -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ @@ -347,7 +347,7 @@ nmtst_platform_ip6_routes_equal_aptr(const NMPObject *const * a, #ifdef __NETWORKMANAGER_IP4_CONFIG_H__ - #include "nm-glib-aux/nm-dedup-multi.h" + #include "libnm-glib-aux/nm-dedup-multi.h" static inline NMIP4Config * nmtst_ip4_config_new(int ifindex) @@ -361,7 +361,7 @@ nmtst_ip4_config_new(int ifindex) #ifdef __NETWORKMANAGER_IP6_CONFIG_H__ - #include "nm-glib-aux/nm-dedup-multi.h" + #include "libnm-glib-aux/nm-dedup-multi.h" static inline NMIP6Config * nmtst_ip6_config_new(int ifindex) diff --git a/src/core/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c index 81c9f06ca9..2eb3ae66d4 100644 --- a/src/core/platform/nm-fake-platform.c +++ b/src/core/platform/nm-fake-platform.c @@ -16,7 +16,7 @@ #include "nm-utils.h" #include "nm-core-utils.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "nm-platform-private.h" #include "nmp-object.h" diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c index d4f6b0fb90..679faa5bd8 100644 --- a/src/core/platform/nm-linux-platform.c +++ b/src/core/platform/nm-linux-platform.c @@ -32,25 +32,25 @@ #include #include -#include "nm-std-aux/unaligned.h" +#include "libnm-std-aux/unaligned.h" #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-vlan.h" -#include "nm-glib-aux/nm-secret-utils.h" -#include "nm-glib-aux/nm-c-list.h" -#include "nm-platform/nm-netlink.h" +#include "libnm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-c-list.h" +#include "libnm-platform/nm-netlink.h" #include "nm-core-utils.h" #include "nmp-object.h" -#include "nm-platform/nmp-netns.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nmp-netns.h" +#include "libnm-platform/nm-platform-utils.h" #include "nm-platform-private.h" #include "wifi/nm-wifi-utils.h" #include "wifi/nm-wifi-utils-wext.h" #include "wpan/nm-wpan-utils.h" -#include "nm-glib-aux/nm-io-utils.h" -#include "nm-udev-aux/nm-udev-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" +#include "libnm-udev-aux/nm-udev-utils.h" /*****************************************************************************/ diff --git a/src/core/platform/nm-platform.c b/src/core/platform/nm-platform.c index e3ee9b8f49..3a76a1e5a6 100644 --- a/src/core/platform/nm-platform.c +++ b/src/core/platform/nm-platform.c @@ -24,15 +24,15 @@ #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-glib-aux/nm-dedup-multi.h" -#include "nm-udev-aux/nm-udev-utils.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-udev-aux/nm-udev-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "nm-core-utils.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "nm-platform-private.h" #include "nmp-object.h" -#include "nm-platform/nmp-netns.h" +#include "libnm-platform/nmp-netns.h" /*****************************************************************************/ diff --git a/src/core/platform/nm-platform.h b/src/core/platform/nm-platform.h index cf1254c40a..b88969e89e 100644 --- a/src/core/platform/nm-platform.h +++ b/src/core/platform/nm-platform.h @@ -9,8 +9,8 @@ #include "nm-dbus-interface.h" #include "libnm-core-intern/nm-core-types-internal.h" -#include "nm-platform/nmp-base.h" -#include "nm-base/nm-base.h" +#include "libnm-platform/nmp-base.h" +#include "libnm-base/nm-base.h" #include "nm-core-utils.h" #include "nm-setting-vlan.h" diff --git a/src/core/platform/nmp-object.c b/src/core/platform/nmp-object.c index 6a26595e6a..49a8f5987b 100644 --- a/src/core/platform/nmp-object.c +++ b/src/core/platform/nmp-object.c @@ -13,10 +13,10 @@ #include #include "nm-utils.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "nm-core-utils.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "wifi/nm-wifi-utils.h" #include "wpan/nm-wpan-utils.h" diff --git a/src/core/platform/nmp-object.h b/src/core/platform/nmp-object.h index 19f6bcd7ba..14cf1e3f09 100644 --- a/src/core/platform/nmp-object.h +++ b/src/core/platform/nmp-object.h @@ -8,8 +8,8 @@ #include -#include "nm-glib-aux/nm-obj.h" -#include "nm-glib-aux/nm-dedup-multi.h" +#include "libnm-glib-aux/nm-obj.h" +#include "libnm-glib-aux/nm-dedup-multi.h" #include "nm-platform.h" struct udev_device; diff --git a/src/core/platform/nmp-rules-manager.c b/src/core/platform/nmp-rules-manager.c index 0c617b8040..bdaefc8eab 100644 --- a/src/core/platform/nmp-rules-manager.c +++ b/src/core/platform/nmp-rules-manager.c @@ -7,7 +7,7 @@ #include #include -#include "nm-std-aux/c-list-util.h" +#include "libnm-std-aux/c-list-util.h" #include "nmp-object.h" /*****************************************************************************/ diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c index 3aaa3759aa..d1ca405f97 100644 --- a/src/core/platform/tests/test-link.c +++ b/src/core/platform/tests/test-link.c @@ -11,11 +11,11 @@ #include #include -#include "nm-glib-aux/nm-io-utils.h" -#include "nm-base/nm-ethtool-base.h" +#include "libnm-glib-aux/nm-io-utils.h" +#include "libnm-base/nm-ethtool-base.h" #include "platform/nmp-object.h" -#include "nm-platform/nmp-netns.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nmp-netns.h" +#include "libnm-platform/nm-platform-utils.h" #include "test-common.h" #include "nm-test-utils-core.h" diff --git a/src/core/platform/tests/test-nmp-object.c b/src/core/platform/tests/test-nmp-object.c index 310611ee6c..6f8be00d10 100644 --- a/src/core/platform/tests/test-nmp-object.c +++ b/src/core/platform/tests/test-nmp-object.c @@ -9,7 +9,7 @@ #include #include "platform/nmp-object.h" -#include "nm-udev-aux/nm-udev-utils.h" +#include "libnm-udev-aux/nm-udev-utils.h" #include "nm-test-utils-core.h" diff --git a/src/core/platform/tests/test-platform-general.c b/src/core/platform/tests/test-platform-general.c index b426cc658b..796500d510 100644 --- a/src/core/platform/tests/test-platform-general.c +++ b/src/core/platform/tests/test-platform-general.c @@ -7,7 +7,7 @@ #include -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "platform/nm-linux-platform.h" #include "nm-test-utils-core.h" diff --git a/src/core/platform/tests/test-route.c b/src/core/platform/tests/test-route.c index 645bb5b18f..6fdb2f5b24 100644 --- a/src/core/platform/tests/test-route.c +++ b/src/core/platform/tests/test-route.c @@ -9,7 +9,7 @@ #include #include "nm-core-utils.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "platform/nmp-rules-manager.h" #include "test-common.h" diff --git a/src/core/platform/tests/test-tc.c b/src/core/platform/tests/test-tc.c index d15c3d7621..e0c102e6cc 100644 --- a/src/core/platform/tests/test-tc.c +++ b/src/core/platform/tests/test-tc.c @@ -6,8 +6,8 @@ #include "nm-test-utils-core.h" #include "platform/nmp-object.h" -#include "nm-platform/nmp-netns.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nmp-netns.h" +#include "libnm-platform/nm-platform-utils.h" #include "test-common.h" static NMPObject * diff --git a/src/core/platform/wifi/nm-wifi-utils-nl80211.c b/src/core/platform/wifi/nm-wifi-utils-nl80211.c index ad0672488a..175451830f 100644 --- a/src/core/platform/wifi/nm-wifi-utils-nl80211.c +++ b/src/core/platform/wifi/nm-wifi-utils-nl80211.c @@ -15,10 +15,10 @@ #include #include -#include "nm-platform/nm-netlink.h" +#include "libnm-platform/nm-netlink.h" #include "nm-wifi-utils-private.h" #include "platform/nm-platform.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "nm-utils.h" #define _NMLOG_PREFIX_NAME "wifi-nl80211" diff --git a/src/core/platform/wifi/nm-wifi-utils-nl80211.h b/src/core/platform/wifi/nm-wifi-utils-nl80211.h index 37c32ed78e..4a63330739 100644 --- a/src/core/platform/wifi/nm-wifi-utils-nl80211.h +++ b/src/core/platform/wifi/nm-wifi-utils-nl80211.h @@ -8,7 +8,7 @@ #define __WIFI_UTILS_NL80211_H__ #include "nm-wifi-utils.h" -#include "nm-platform/nm-netlink.h" +#include "libnm-platform/nm-netlink.h" #define NM_TYPE_WIFI_UTILS_NL80211 (nm_wifi_utils_nl80211_get_type()) #define NM_WIFI_UTILS_NL80211(obj) \ diff --git a/src/core/platform/wifi/nm-wifi-utils-wext.c b/src/core/platform/wifi/nm-wifi-utils-wext.c index 88529647c5..1e1652fe61 100644 --- a/src/core/platform/wifi/nm-wifi-utils-wext.c +++ b/src/core/platform/wifi/nm-wifi-utils-wext.c @@ -23,7 +23,7 @@ #include "nm-wifi-utils-private.h" #include "nm-utils.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-core-utils.h" diff --git a/src/core/platform/wifi/nm-wifi-utils.c b/src/core/platform/wifi/nm-wifi-utils.c index 49ae1811f6..ff2c9a30fa 100644 --- a/src/core/platform/wifi/nm-wifi-utils.c +++ b/src/core/platform/wifi/nm-wifi-utils.c @@ -19,7 +19,7 @@ #endif #include "nm-core-utils.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" G_DEFINE_ABSTRACT_TYPE(NMWifiUtils, nm_wifi_utils, G_TYPE_OBJECT) diff --git a/src/core/platform/wifi/nm-wifi-utils.h b/src/core/platform/wifi/nm-wifi-utils.h index a252e43e54..7bb1cd8e0f 100644 --- a/src/core/platform/wifi/nm-wifi-utils.h +++ b/src/core/platform/wifi/nm-wifi-utils.h @@ -11,7 +11,7 @@ #include "nm-dbus-interface.h" #include "nm-setting-wireless.h" -#include "nm-platform/nm-netlink.h" +#include "libnm-platform/nm-netlink.h" typedef struct NMWifiUtils NMWifiUtils; diff --git a/src/core/platform/wpan/nm-wpan-utils.c b/src/core/platform/wpan/nm-wpan-utils.c index efb199794d..9fa23793af 100644 --- a/src/core/platform/wpan/nm-wpan-utils.c +++ b/src/core/platform/wpan/nm-wpan-utils.c @@ -9,9 +9,9 @@ #include -#include "nm-platform/nm-netlink.h" +#include "libnm-platform/nm-netlink.h" #include "platform/linux/nl802154.h" -#include "nm-platform/nm-platform-utils.h" +#include "libnm-platform/nm-platform-utils.h" #define _NMLOG_PREFIX_NAME "wpan-nl802154" #define _NMLOG(level, domain, ...) \ diff --git a/src/core/platform/wpan/nm-wpan-utils.h b/src/core/platform/wpan/nm-wpan-utils.h index 940c2c9daa..50ecd6fe84 100644 --- a/src/core/platform/wpan/nm-wpan-utils.h +++ b/src/core/platform/wpan/nm-wpan-utils.h @@ -9,7 +9,7 @@ #include #include "nm-dbus-interface.h" -#include "nm-platform/nm-netlink.h" +#include "libnm-platform/nm-netlink.h" typedef struct NMWpanUtils NMWpanUtils; diff --git a/src/core/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c index c9016dac54..13c4e512df 100644 --- a/src/core/ppp/nm-pppd-plugin.c +++ b/src/core/ppp/nm-pppd-plugin.c @@ -20,7 +20,7 @@ #include #include -#include "nm-glib-aux/nm-default-glib.h" +#include "libnm-glib-aux/nm-default-glib.h" #include "nm-dbus-interface.h" diff --git a/src/core/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c index b0d71886b4..5493984b7b 100644 --- a/src/core/settings/nm-secret-agent.c +++ b/src/core/settings/nm-secret-agent.c @@ -10,8 +10,8 @@ #include #include -#include "nm-glib-aux/nm-c-list.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "nm-dbus-interface.h" #include "libnm-core-intern/nm-core-internal.h" #include "libnm-core-aux-intern/nm-auth-subject.h" diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c index 0f0beef068..6f400f7e85 100644 --- a/src/core/settings/nm-settings-connection.c +++ b/src/core/settings/nm-settings-connection.c @@ -10,7 +10,7 @@ #include "c-list/src/c-list.h" -#include "nm-glib-aux/nm-keyfile-aux.h" +#include "libnm-glib-aux/nm-keyfile-aux.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-config.h" #include "nm-config-data.h" diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c index 858df29883..92733f5dbf 100644 --- a/src/core/settings/nm-settings.c +++ b/src/core/settings/nm-settings.c @@ -21,7 +21,7 @@ #endif #include "libnm-core-aux-intern/nm-common-macros.h" -#include "nm-glib-aux/nm-keyfile-aux.h" +#include "libnm-glib-aux/nm-keyfile-aux.h" #include "libnm-core-intern/nm-keyfile-internal.h" #include "nm-dbus-interface.h" #include "nm-connection.h" @@ -46,8 +46,8 @@ #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-std-aux/c-list-util.h" -#include "nm-glib-aux/nm-c-list.h" +#include "libnm-std-aux/c-list-util.h" +#include "libnm-glib-aux/nm-c-list.h" #include "nm-dbus-object.h" #include "devices/nm-device-ethernet.h" #include "nm-settings-connection.h" diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index 2cc1d373de..5038ac6ad8 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -13,10 +13,10 @@ #include #include -#include "nm-std-aux/c-list-util.h" -#include "nm-glib-aux/nm-c-list.h" -#include "nm-glib-aux/nm-io-utils.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/c-list-util.h" +#include "libnm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-io-utils.h" +#include "libnm-std-aux/nm-dbus-compat.h" #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-config.h" diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 7524e87c57..cbe363de02 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -18,7 +18,7 @@ #include #include -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "nm-connection.h" #include "nm-dbus-interface.h" #include "nm-setting-connection.h" @@ -40,7 +40,7 @@ #include "nm-setting-generic.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-utils.h" -#include "nm-base/nm-ethtool-base.h" +#include "libnm-base/nm-ethtool-base.h" #include "platform/nm-platform.h" #include "NetworkManagerUtils.h" diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h index 36ec922514..f7a209359b 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h @@ -7,7 +7,7 @@ #define _UTILS_H_ #include "nm-connection.h" -#include "nm-base/nm-ethtool-base.h" +#include "libnm-base/nm-ethtool-base.h" #include "shvar.h" diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index a86bf4781d..b513c98388 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -15,8 +15,8 @@ #include #include -#include "nm-glib-aux/nm-enum-utils.h" -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-enum-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" #include "nm-manager.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" @@ -34,7 +34,7 @@ #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" -#include "nm-base/nm-ethtool-base.h" +#include "libnm-base/nm-ethtool-base.h" #include "nms-ifcfg-rh-common.h" #include "nms-ifcfg-rh-reader.h" diff --git a/src/core/settings/plugins/ifcfg-rh/shvar.c b/src/core/settings/plugins/ifcfg-rh/shvar.c index dc26da759c..c6099dd173 100644 --- a/src/core/settings/plugins/ifcfg-rh/shvar.c +++ b/src/core/settings/plugins/ifcfg-rh/shvar.c @@ -16,8 +16,8 @@ #include "libnm-core-intern/nm-core-internal.h" #include "nm-core-utils.h" -#include "nm-glib-aux/nm-enum-utils.h" -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-enum-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" #include "c-list/src/c-list.h" #include "nms-ifcfg-rh-utils.h" diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index bad0052013..ad96d0c4be 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -17,7 +17,7 @@ #include #include -#include "nm-glib-aux/nm-json-aux.h" +#include "libnm-glib-aux/nm-json-aux.h" #include "nm-utils.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" @@ -37,8 +37,8 @@ #include "nm-setting-vlan.h" #include "nm-setting-dcb.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-base/nm-ethtool-base.h" -#include "nm-base/nm-ethtool-utils-base.h" +#include "libnm-base/nm-ethtool-base.h" +#include "libnm-base/nm-ethtool-utils-base.h" #include "NetworkManagerUtils.h" diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c index 6d3e879611..0b48660789 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c @@ -13,9 +13,9 @@ #include #include -#include "nm-std-aux/c-list-util.h" -#include "nm-glib-aux/nm-c-list.h" -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-std-aux/c-list-util.h" +#include "libnm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-io-utils.h" #include "nm-connection.h" #include "nm-setting.h" @@ -25,7 +25,7 @@ #include "libnm-core-intern/nm-core-internal.h" #include "libnm-core-intern/nm-keyfile-internal.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "settings/nm-settings-plugin.h" #include "settings/nm-settings-storage.h" diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c index 4b69dc79aa..c26b8676f1 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c @@ -10,7 +10,7 @@ #include #include -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" #include "libnm-core-intern/nm-keyfile-internal.h" #include "nm-utils.h" #include "nm-setting-wired.h" diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c index 0dae91ae76..661a828058 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c @@ -17,7 +17,7 @@ #include "nms-keyfile-utils.h" #include "nms-keyfile-reader.h" -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" /*****************************************************************************/ diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c index cd0e99c6d7..a4bbb0efc5 100644 --- a/src/core/supplicant/nm-supplicant-config.c +++ b/src/core/supplicant/nm-supplicant-config.c @@ -10,7 +10,7 @@ #include -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-str-buf.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-supplicant-settings-verify.h" #include "nm-setting.h" diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c index 7c1a32783a..020b2c2c6b 100644 --- a/src/core/supplicant/nm-supplicant-interface.c +++ b/src/core/supplicant/nm-supplicant-interface.c @@ -13,12 +13,12 @@ #include "NetworkManagerUtils.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-glib-aux/nm-c-list.h" -#include "nm-glib-aux/nm-ref-string.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-ref-string.h" +#include "libnm-glib-aux/nm-dbus-aux.h" +#include "libnm-std-aux/nm-dbus-compat.h" #include "nm-supplicant-config.h" #include "nm-supplicant-manager.h" -#include "shared/nm-glib-aux/nm-dbus-aux.h" #define DBUS_TIMEOUT_MSEC 20000 diff --git a/src/core/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c index cf36322e30..e9b084f0bd 100644 --- a/src/core/supplicant/nm-supplicant-manager.c +++ b/src/core/supplicant/nm-supplicant-manager.c @@ -10,8 +10,8 @@ #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" -#include "nm-glib-aux/nm-dbus-aux.h" -#include "nm-glib-aux/nm-ref-string.h" +#include "libnm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-ref-string.h" #include "nm-supplicant-interface.h" #include "nm-supplicant-types.h" #include "platform/nm-platform.h" diff --git a/src/core/systemd/meson.build b/src/core/systemd/meson.build index 1e198eec77..ec4b935de7 100644 --- a/src/core/systemd/meson.build +++ b/src/core/systemd/meson.build @@ -38,14 +38,14 @@ libnm_systemd_core = static_library( ), include_directories: [ incs, + top_inc, src_inc, src_core_inc, - shared_inc, ], dependencies: [ - glib_nm_default_dep, libnm_core_impl_dep, libnm_systemd_shared_dep, + glib_dep, ], link_with: libc_siphash, ) @@ -53,7 +53,6 @@ libnm_systemd_core = static_library( libnm_systemd_core_dep = declare_dependency( include_directories: [ incs, - shared_inc, ], dependencies: [ glib_dep, diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h index f627d7d471..ceedfdb06b 100644 --- a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h +++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h @@ -13,7 +13,7 @@ #include #undef NETWORKMANAGER_COMPILATION -#include "systemd/sd-adapt-shared/nm-sd-adapt-shared.h" +#include "libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD diff --git a/src/core/tests/test-systemd.c b/src/core/tests/test-systemd.c index 03576c133c..c6711f0b2b 100644 --- a/src/core/tests/test-systemd.c +++ b/src/core/tests/test-systemd.c @@ -6,7 +6,7 @@ #include "src/core/systemd/nm-default-systemd.h" #include "systemd/nm-sd.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-test-utils-core.h" diff --git a/src/libnm-base/meson.build b/src/libnm-base/meson.build new file mode 100644 index 0000000000..3bcaa781c6 --- /dev/null +++ b/src/libnm-base/meson.build @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_base = static_library( + 'nm-base', + include_directories: [ + src_inc, + top_inc, + ], + sources: files( + 'nm-ethtool-base.c', + ), + dependencies: libnm_glib_aux_dep_link, +) + +libnm_base_dep = declare_dependency( + dependencies: libnm_glib_aux_dep, +) + +libnm_base_dep_link = declare_dependency( + dependencies: libnm_glib_aux_dep_link, + link_with: libnm_base, +) diff --git a/shared/nm-base/nm-base.h b/src/libnm-base/nm-base.h similarity index 100% rename from shared/nm-base/nm-base.h rename to src/libnm-base/nm-base.h diff --git a/shared/nm-base/nm-ethtool-base.c b/src/libnm-base/nm-ethtool-base.c similarity index 99% rename from shared/nm-base/nm-ethtool-base.c rename to src/libnm-base/nm-ethtool-base.c index 52ff28714a..03cbf56007 100644 --- a/shared/nm-base/nm-ethtool-base.c +++ b/src/libnm-base/nm-ethtool-base.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-ethtool-base.h" diff --git a/shared/nm-base/nm-ethtool-base.h b/src/libnm-base/nm-ethtool-base.h similarity index 96% rename from shared/nm-base/nm-ethtool-base.h rename to src/libnm-base/nm-ethtool-base.h index be90ce756e..abedcafe40 100644 --- a/shared/nm-base/nm-ethtool-base.h +++ b/src/libnm-base/nm-ethtool-base.h @@ -6,7 +6,7 @@ #ifndef __NM_ETHTOOL_BASE_H__ #define __NM_ETHTOOL_BASE_H__ -#include "nm-base/nm-base.h" +#include "libnm-base/nm-base.h" /*****************************************************************************/ diff --git a/shared/nm-base/nm-ethtool-utils-base.h b/src/libnm-base/nm-ethtool-utils-base.h similarity index 100% rename from shared/nm-base/nm-ethtool-utils-base.h rename to src/libnm-base/nm-ethtool-utils-base.h diff --git a/libnm/nm-libnm-aux/README.md b/src/libnm-client-aux-extern/README.md similarity index 100% rename from libnm/nm-libnm-aux/README.md rename to src/libnm-client-aux-extern/README.md diff --git a/src/libnm-client-aux-extern/meson.build b/src/libnm-client-aux-extern/meson.build new file mode 100644 index 0000000000..767c6ef595 --- /dev/null +++ b/src/libnm-client-aux-extern/meson.build @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_client_aux_extern = static_library( + 'nm-client-aux-extern', + sources: files( + 'nm-libnm-aux.c', + ), + dependencies: [ + libnm_core_aux_intern_dep, + libnm_dep, + ], +) + +libnm_client_aux_extern_dep = declare_dependency( + link_with: [libnm_client_aux_extern], +) diff --git a/libnm/nm-default-client.h b/src/libnm-client-aux-extern/nm-default-client.h similarity index 91% rename from libnm/nm-default-client.h rename to src/libnm-client-aux-extern/nm-default-client.h index b5d1a6d318..a770ae567d 100644 --- a/libnm/nm-default-client.h +++ b/src/libnm-client-aux-extern/nm-default-client.h @@ -8,7 +8,7 @@ /*****************************************************************************/ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_CLIENT diff --git a/libnm/nm-libnm-aux/nm-libnm-aux.c b/src/libnm-client-aux-extern/nm-libnm-aux.c similarity index 98% rename from libnm/nm-libnm-aux/nm-libnm-aux.c rename to src/libnm-client-aux-extern/nm-libnm-aux.c index 2b8d2c2ef9..2d17241db3 100644 --- a/libnm/nm-libnm-aux/nm-libnm-aux.c +++ b/src/libnm-client-aux-extern/nm-libnm-aux.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-libnm-aux.h" diff --git a/libnm/nm-libnm-aux/nm-libnm-aux.h b/src/libnm-client-aux-extern/nm-libnm-aux.h similarity index 100% rename from libnm/nm-libnm-aux/nm-libnm-aux.h rename to src/libnm-client-aux-extern/nm-libnm-aux.h diff --git a/libnm/libnm.pc.in b/src/libnm-client-impl/libnm.pc.in similarity index 100% rename from libnm/libnm.pc.in rename to src/libnm-client-impl/libnm.pc.in diff --git a/libnm/libnm.ver b/src/libnm-client-impl/libnm.ver similarity index 100% rename from libnm/libnm.ver rename to src/libnm-client-impl/libnm.ver diff --git a/libnm/meson.build b/src/libnm-client-impl/meson.build similarity index 68% rename from libnm/meson.build rename to src/libnm-client-impl/meson.build index 8c07663cbb..000f19db33 100644 --- a/libnm/meson.build +++ b/src/libnm-client-impl/meson.build @@ -1,13 +1,10 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -libnm_inc = include_directories('.') - libnm_nm_default_dep = declare_dependency( include_directories: [ - libnm_inc, + libnm_client_public_inc, libnm_core_public_inc, top_inc, - shared_inc, src_inc, ], dependencies: [ @@ -15,74 +12,7 @@ libnm_nm_default_dep = declare_dependency( ], ) -libnm_headers = files( - 'NetworkManager.h', - 'nm-access-point.h', - 'nm-active-connection.h', - 'nm-autoptr.h', - 'nm-checkpoint.h', - 'nm-client.h', - 'nm-device-6lowpan.h', - 'nm-device-adsl.h', - 'nm-device-bond.h', - 'nm-device-bridge.h', - 'nm-device-bt.h', - 'nm-device-dummy.h', - 'nm-device-ethernet.h', - 'nm-device-generic.h', - 'nm-device-infiniband.h', - 'nm-device-ip-tunnel.h', - 'nm-device-macsec.h', - 'nm-device-macvlan.h', - 'nm-device-modem.h', - 'nm-device-olpc-mesh.h', - 'nm-device-ovs-bridge.h', - 'nm-device-ovs-interface.h', - 'nm-device-ovs-port.h', - 'nm-device-ppp.h', - 'nm-device-team.h', - 'nm-device-tun.h', - 'nm-device-veth.h', - 'nm-device-vlan.h', - 'nm-device-vrf.h', - 'nm-device-vxlan.h', - 'nm-device-wifi-p2p.h', - 'nm-device-wifi.h', - 'nm-device-wimax.h', - 'nm-device-wireguard.h', - 'nm-device-wpan.h', - 'nm-device.h', - 'nm-dhcp-config.h', - 'nm-ethtool-utils.h', - 'nm-ip-config.h', - 'nm-object.h', - 'nm-remote-connection.h', - 'nm-secret-agent-old.h', - 'nm-types.h', - 'nm-vpn-connection.h', - 'nm-vpn-editor.h', - 'nm-vpn-plugin-old.h', - 'nm-vpn-service-plugin.h', - 'nm-wifi-p2p-peer.h', - 'nm-wimax-nsp.h', -) - -install_headers( - libnm_core_headers + libnm_headers + [nm_version_macro_header], - subdir: libnm_name, -) - -libnm_enum_sources = gnome.mkenums( - 'nm-enum-types', - sources: libnm_headers + [nm_version_macro_header], - identifier_prefix: nm_id_prefix, - c_template: 'nm-enum-types.c.template', - h_template: 'nm-enum-types.h.template', - install_header: true, - install_dir: libnm_pkgincludedir, -) - -libnm_sources = files( +libnm_client_impl_sources = files( 'nm-access-point.c', 'nm-active-connection.c', 'nm-checkpoint.c', @@ -137,9 +67,9 @@ libnm_sources = files( 'nm-wimax-nsp.c', ) -libnm_static = static_library( - 'nm-static', - sources: libnm_sources + libnm_enum_sources, +libnm_client_impl = static_library( + 'nm-client-impl', + sources: libnm_client_impl_sources + libnm_client_public_enum_sources, dependencies: [ libnmdbus_dep, libnm_core_aux_intern_dep, @@ -147,7 +77,7 @@ libnm_static = static_library( libnm_udev_aux_dep, libudev_dep, ], - link_with: libnm_systemd_logging_stub, + link_with: libnm_log_null, ) linker_script = join_paths(meson.current_source_dir(), 'libnm.ver') @@ -157,10 +87,10 @@ libnm = shared_library( version: libnm_version, dependencies: libnm_nm_default_dep, link_whole: [ - libnm_static, + libnm_client_impl, libnm_core_impl, libnmdbus, - libnm_systemd_logging_stub, + libnm_log_null, libnm_glib_aux, libnm_base, ], @@ -170,8 +100,8 @@ libnm = shared_library( ) libnm_dep = declare_dependency( - sources: libnm_enum_sources[1], - include_directories: libnm_inc, + sources: libnm_client_public_enum_sources[1], + include_directories: libnm_client_public_inc, link_with: libnm, ) @@ -189,17 +119,19 @@ pkg.generate( ], ) -test( - 'check-local-exports-' + libnm_name, - check_exports, - args: [libnm.full_path(), linker_script], -) +if enable_tests + test( + 'check-local-exports-' + libnm_name, + check_exports, + args: [libnm.full_path(), linker_script], + ) +endif if enable_introspection libnm_gir = gnome.generate_gir( libnm, - sources: libnm_core_settings_sources + libnm_core_impl_sources + libnm_core_public_enum_sources + libnm_core_headers + libnm_sources + libnm_headers + libnm_enum_sources + [nm_version_macro_header], + sources: libnm_core_settings_sources + libnm_core_impl_sources + libnm_core_public_enum_sources + libnm_core_headers + libnm_client_impl_sources + libnm_client_headers + libnm_client_public_enum_sources + [nm_version_macro_header], includes: 'Gio-2.0', include_directories: [ libnm_core_public_inc, @@ -297,23 +229,3 @@ if enable_introspection ) endif - -libnm_libnm_aux = static_library( - 'nm-libnm-aux', - sources: files( - 'nm-libnm-aux/nm-libnm-aux.c', - ), - dependencies: [ - libnm_core_aux_intern_dep, - libnm_dep, - ], -) - -libnm_libnm_aux_dep = declare_dependency( - include_directories: [shared_inc], - link_with: [libnm_libnm_aux], -) - -if enable_tests - subdir('tests') -endif diff --git a/libnm/nm-access-point.c b/src/libnm-client-impl/nm-access-point.c similarity index 99% rename from libnm/nm-access-point.c rename to src/libnm-client-impl/nm-access-point.c index abe1a5538a..3d12aa4588 100644 --- a/libnm/nm-access-point.c +++ b/src/libnm-client-impl/nm-access-point.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-access-point.h" diff --git a/libnm/nm-active-connection.c b/src/libnm-client-impl/nm-active-connection.c similarity index 99% rename from libnm/nm-active-connection.c rename to src/libnm-client-impl/nm-active-connection.c index 60c68f3478..aa96219c04 100644 --- a/libnm/nm-active-connection.c +++ b/src/libnm-client-impl/nm-active-connection.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-active-connection.h" diff --git a/libnm/nm-checkpoint.c b/src/libnm-client-impl/nm-checkpoint.c similarity index 99% rename from libnm/nm-checkpoint.c rename to src/libnm-client-impl/nm-checkpoint.c index 951e66229f..c1f6b09227 100644 --- a/libnm/nm-checkpoint.c +++ b/src/libnm-client-impl/nm-checkpoint.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-checkpoint.h" diff --git a/libnm/nm-client.c b/src/libnm-client-impl/nm-client.c similarity index 99% rename from libnm/nm-client.c rename to src/libnm-client-impl/nm-client.c index a2d953cee0..211bc21a84 100644 --- a/libnm/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -4,15 +4,15 @@ * Copyright (C) 2007 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-client.h" #include -#include "nm-std-aux/c-list-util.h" -#include "nm-glib-aux/nm-c-list.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-std-aux/c-list-util.h" +#include "libnm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-access-point.h" diff --git a/libnm/nm-dbus-helpers.c b/src/libnm-client-impl/nm-dbus-helpers.c similarity index 98% rename from libnm/nm-dbus-helpers.c rename to src/libnm-client-impl/nm-dbus-helpers.c index b146185575..3b5f9ff88a 100644 --- a/libnm/nm-dbus-helpers.c +++ b/src/libnm-client-impl/nm-dbus-helpers.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dbus-helpers.h" diff --git a/libnm/nm-dbus-helpers.h b/src/libnm-client-impl/nm-dbus-helpers.h similarity index 93% rename from libnm/nm-dbus-helpers.h rename to src/libnm-client-impl/nm-dbus-helpers.h index a22f8e3d7c..e519f7330b 100644 --- a/libnm/nm-dbus-helpers.h +++ b/src/libnm-client-impl/nm-dbus-helpers.h @@ -10,7 +10,7 @@ #error Cannot use this header. #endif -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" #define NM_DBUS_DEFAULT_TIMEOUT_MSEC 25000 diff --git a/libnm/nm-default-libnm.h b/src/libnm-client-impl/nm-default-libnm.h similarity index 91% rename from libnm/nm-default-libnm.h rename to src/libnm-client-impl/nm-default-libnm.h index 799547bc84..5b3a8e5179 100644 --- a/libnm/nm-default-libnm.h +++ b/src/libnm-client-impl/nm-default-libnm.h @@ -8,7 +8,7 @@ /*****************************************************************************/ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_LIBNM diff --git a/libnm/nm-device-6lowpan.c b/src/libnm-client-impl/nm-device-6lowpan.c similarity index 98% rename from libnm/nm-device-6lowpan.c rename to src/libnm-client-impl/nm-device-6lowpan.c index ccb8ae0103..e03b4a0037 100644 --- a/libnm/nm-device-6lowpan.c +++ b/src/libnm-client-impl/nm-device-6lowpan.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-6lowpan.h" diff --git a/libnm/nm-device-adsl.c b/src/libnm-client-impl/nm-device-adsl.c similarity index 98% rename from libnm/nm-device-adsl.c rename to src/libnm-client-impl/nm-device-adsl.c index ff64cd3a54..65f875454f 100644 --- a/libnm/nm-device-adsl.c +++ b/src/libnm-client-impl/nm-device-adsl.c @@ -4,7 +4,7 @@ * Copyright (C) 2009 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-adsl.h" diff --git a/libnm/nm-device-bond.c b/src/libnm-client-impl/nm-device-bond.c similarity index 99% rename from libnm/nm-device-bond.c rename to src/libnm-client-impl/nm-device-bond.c index caf9cdcaef..48dfd9b2b2 100644 --- a/libnm/nm-device-bond.c +++ b/src/libnm-client-impl/nm-device-bond.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-setting-bond.h" diff --git a/libnm/nm-device-bridge.c b/src/libnm-client-impl/nm-device-bridge.c similarity index 99% rename from libnm/nm-device-bridge.c rename to src/libnm-client-impl/nm-device-bridge.c index 2a7226e92b..9bc41ac896 100644 --- a/libnm/nm-device-bridge.c +++ b/src/libnm-client-impl/nm-device-bridge.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-setting-bridge.h" diff --git a/libnm/nm-device-bt.c b/src/libnm-client-impl/nm-device-bt.c similarity index 99% rename from libnm/nm-device-bt.c rename to src/libnm-client-impl/nm-device-bt.c index 55f0a942a2..074ada6622 100644 --- a/libnm/nm-device-bt.c +++ b/src/libnm-client-impl/nm-device-bt.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-bt.h" diff --git a/libnm/nm-device-dummy.c b/src/libnm-client-impl/nm-device-dummy.c similarity index 98% rename from libnm/nm-device-dummy.c rename to src/libnm-client-impl/nm-device-dummy.c index 6b92810230..d56f6cda85 100644 --- a/libnm/nm-device-dummy.c +++ b/src/libnm-client-impl/nm-device-dummy.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-dummy.h" diff --git a/libnm/nm-device-ethernet.c b/src/libnm-client-impl/nm-device-ethernet.c similarity index 99% rename from libnm/nm-device-ethernet.c rename to src/libnm-client-impl/nm-device-ethernet.c index b7173c806b..b32decde14 100644 --- a/libnm/nm-device-ethernet.c +++ b/src/libnm-client-impl/nm-device-ethernet.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ethernet.h" diff --git a/libnm/nm-device-generic.c b/src/libnm-client-impl/nm-device-generic.c similarity index 99% rename from libnm/nm-device-generic.c rename to src/libnm-client-impl/nm-device-generic.c index ebc73a7e9c..9dcc8c911d 100644 --- a/libnm/nm-device-generic.c +++ b/src/libnm-client-impl/nm-device-generic.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-generic.h" diff --git a/libnm/nm-device-infiniband.c b/src/libnm-client-impl/nm-device-infiniband.c similarity index 99% rename from libnm/nm-device-infiniband.c rename to src/libnm-client-impl/nm-device-infiniband.c index 820a4ab438..7e4cc054c0 100644 --- a/libnm/nm-device-infiniband.c +++ b/src/libnm-client-impl/nm-device-infiniband.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-infiniband.h" diff --git a/libnm/nm-device-ip-tunnel.c b/src/libnm-client-impl/nm-device-ip-tunnel.c similarity index 99% rename from libnm/nm-device-ip-tunnel.c rename to src/libnm-client-impl/nm-device-ip-tunnel.c index c370f79e20..14c7228209 100644 --- a/libnm/nm-device-ip-tunnel.c +++ b/src/libnm-client-impl/nm-device-ip-tunnel.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ip-tunnel.h" diff --git a/libnm/nm-device-macsec.c b/src/libnm-client-impl/nm-device-macsec.c similarity index 99% rename from libnm/nm-device-macsec.c rename to src/libnm-client-impl/nm-device-macsec.c index 3d6e1d388d..faa5be7e74 100644 --- a/libnm/nm-device-macsec.c +++ b/src/libnm-client-impl/nm-device-macsec.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-macsec.h" diff --git a/libnm/nm-device-macvlan.c b/src/libnm-client-impl/nm-device-macvlan.c similarity index 99% rename from libnm/nm-device-macvlan.c rename to src/libnm-client-impl/nm-device-macvlan.c index 773de99009..ddb36bab2b 100644 --- a/libnm/nm-device-macvlan.c +++ b/src/libnm-client-impl/nm-device-macvlan.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-setting-macvlan.h" diff --git a/libnm/nm-device-modem.c b/src/libnm-client-impl/nm-device-modem.c similarity index 99% rename from libnm/nm-device-modem.c rename to src/libnm-client-impl/nm-device-modem.c index 51b49feabe..57e09bc65d 100644 --- a/libnm/nm-device-modem.c +++ b/src/libnm-client-impl/nm-device-modem.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-modem.h" diff --git a/libnm/nm-device-olpc-mesh.c b/src/libnm-client-impl/nm-device-olpc-mesh.c similarity index 99% rename from libnm/nm-device-olpc-mesh.c rename to src/libnm-client-impl/nm-device-olpc-mesh.c index 697b3381e0..779990aad8 100644 --- a/libnm/nm-device-olpc-mesh.c +++ b/src/libnm-client-impl/nm-device-olpc-mesh.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-olpc-mesh.h" diff --git a/libnm/nm-device-ovs-bridge.c b/src/libnm-client-impl/nm-device-ovs-bridge.c similarity index 99% rename from libnm/nm-device-ovs-bridge.c rename to src/libnm-client-impl/nm-device-ovs-bridge.c index c95355161e..898a41fab5 100644 --- a/libnm/nm-device-ovs-bridge.c +++ b/src/libnm-client-impl/nm-device-ovs-bridge.c @@ -3,7 +3,7 @@ * Copyright (C) 2017, 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ovs-bridge.h" diff --git a/libnm/nm-device-ovs-interface.c b/src/libnm-client-impl/nm-device-ovs-interface.c similarity index 98% rename from libnm/nm-device-ovs-interface.c rename to src/libnm-client-impl/nm-device-ovs-interface.c index 1c757a5b49..8632057a91 100644 --- a/libnm/nm-device-ovs-interface.c +++ b/src/libnm-client-impl/nm-device-ovs-interface.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ovs-interface.h" diff --git a/libnm/nm-device-ovs-port.c b/src/libnm-client-impl/nm-device-ovs-port.c similarity index 99% rename from libnm/nm-device-ovs-port.c rename to src/libnm-client-impl/nm-device-ovs-port.c index b52fdf9b21..db30e1c7c8 100644 --- a/libnm/nm-device-ovs-port.c +++ b/src/libnm-client-impl/nm-device-ovs-port.c @@ -3,7 +3,7 @@ * Copyright (C) 2017, 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ovs-port.h" diff --git a/libnm/nm-device-ppp.c b/src/libnm-client-impl/nm-device-ppp.c similarity index 94% rename from libnm/nm-device-ppp.c rename to src/libnm-client-impl/nm-device-ppp.c index a1c1f74184..1dd275cf79 100644 --- a/libnm/nm-device-ppp.c +++ b/src/libnm-client-impl/nm-device-ppp.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ppp.h" diff --git a/libnm/nm-device-private.h b/src/libnm-client-impl/nm-device-private.h similarity index 100% rename from libnm/nm-device-private.h rename to src/libnm-client-impl/nm-device-private.h diff --git a/libnm/nm-device-team.c b/src/libnm-client-impl/nm-device-team.c similarity index 99% rename from libnm/nm-device-team.c rename to src/libnm-client-impl/nm-device-team.c index 4af9f8e60a..ca29c9f7b9 100644 --- a/libnm/nm-device-team.c +++ b/src/libnm-client-impl/nm-device-team.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 Jiri Pirko */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-team.h" diff --git a/libnm/nm-device-tun.c b/src/libnm-client-impl/nm-device-tun.c similarity index 99% rename from libnm/nm-device-tun.c rename to src/libnm-client-impl/nm-device-tun.c index 0445da9aa4..8b8ca0fe29 100644 --- a/libnm/nm-device-tun.c +++ b/src/libnm-client-impl/nm-device-tun.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-tun.h" diff --git a/libnm/nm-device-veth.c b/src/libnm-client-impl/nm-device-veth.c similarity index 98% rename from libnm/nm-device-veth.c rename to src/libnm-client-impl/nm-device-veth.c index 9a9f768011..f35f09b198 100644 --- a/libnm/nm-device-veth.c +++ b/src/libnm-client-impl/nm-device-veth.c @@ -3,7 +3,7 @@ * Copyright (C) 2020 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-veth.h" diff --git a/libnm/nm-device-vlan.c b/src/libnm-client-impl/nm-device-vlan.c similarity index 99% rename from libnm/nm-device-vlan.c rename to src/libnm-client-impl/nm-device-vlan.c index e7419b23ee..4c2a435bd5 100644 --- a/libnm/nm-device-vlan.c +++ b/src/libnm-client-impl/nm-device-vlan.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-vlan.h" diff --git a/libnm/nm-device-vrf.c b/src/libnm-client-impl/nm-device-vrf.c similarity index 98% rename from libnm/nm-device-vrf.c rename to src/libnm-client-impl/nm-device-vrf.c index 73f2770723..bbf37810c5 100644 --- a/libnm/nm-device-vrf.c +++ b/src/libnm-client-impl/nm-device-vrf.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-vrf.h" diff --git a/libnm/nm-device-vxlan.c b/src/libnm-client-impl/nm-device-vxlan.c similarity index 99% rename from libnm/nm-device-vxlan.c rename to src/libnm-client-impl/nm-device-vxlan.c index 36d95f91f3..6fac3b715e 100644 --- a/libnm/nm-device-vxlan.c +++ b/src/libnm-client-impl/nm-device-vxlan.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-vxlan.h" diff --git a/libnm/nm-device-wifi-p2p.c b/src/libnm-client-impl/nm-device-wifi-p2p.c similarity index 99% rename from libnm/nm-device-wifi-p2p.c rename to src/libnm-client-impl/nm-device-wifi-p2p.c index d946977383..05c430f7d3 100644 --- a/libnm/nm-device-wifi-p2p.c +++ b/src/libnm-client-impl/nm-device-wifi-p2p.c @@ -3,11 +3,11 @@ * Copyright (C) 2018 - 2019 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wifi-p2p.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "nm-setting-connection.h" #include "nm-setting-wifi-p2p.h" #include "nm-utils.h" diff --git a/libnm/nm-device-wifi.c b/src/libnm-client-impl/nm-device-wifi.c similarity index 99% rename from libnm/nm-device-wifi.c rename to src/libnm-client-impl/nm-device-wifi.c index 76a6e824ab..84c3a069dc 100644 --- a/libnm/nm-device-wifi.c +++ b/src/libnm-client-impl/nm-device-wifi.c @@ -4,13 +4,13 @@ * Copyright (C) 2007 - 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wifi.h" #include -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "nm-setting-connection.h" #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" diff --git a/libnm/nm-device-wimax.c b/src/libnm-client-impl/nm-device-wimax.c similarity index 99% rename from libnm/nm-device-wimax.c rename to src/libnm-client-impl/nm-device-wimax.c index 9b42354c7a..b9db20bb67 100644 --- a/libnm/nm-device-wimax.c +++ b/src/libnm-client-impl/nm-device-wimax.c @@ -4,7 +4,7 @@ * Copyright (C) 2009 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wimax.h" diff --git a/libnm/nm-device-wireguard.c b/src/libnm-client-impl/nm-device-wireguard.c similarity index 99% rename from libnm/nm-device-wireguard.c rename to src/libnm-client-impl/nm-device-wireguard.c index a4baec4f17..cbbd904bbc 100644 --- a/libnm/nm-device-wireguard.c +++ b/src/libnm-client-impl/nm-device-wireguard.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Javier Arteaga */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wireguard.h" diff --git a/libnm/nm-device-wpan.c b/src/libnm-client-impl/nm-device-wpan.c similarity index 98% rename from libnm/nm-device-wpan.c rename to src/libnm-client-impl/nm-device-wpan.c index 7218a8c604..30c1ea16ea 100644 --- a/libnm/nm-device-wpan.c +++ b/src/libnm-client-impl/nm-device-wpan.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Lubomir Rintel */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wpan.h" diff --git a/libnm/nm-device.c b/src/libnm-client-impl/nm-device.c similarity index 99% rename from libnm/nm-device.c rename to src/libnm-client-impl/nm-device.c index b1ace53bed..8632b0c316 100644 --- a/libnm/nm-device.c +++ b/src/libnm-client-impl/nm-device.c @@ -4,13 +4,13 @@ * Copyright (C) 2007 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device.h" #include -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "nm-dbus-interface.h" #include "nm-active-connection.h" #include "nm-device-bt.h" @@ -25,7 +25,7 @@ #include "nm-dbus-helpers.h" #include "nm-device-tun.h" #include "nm-setting-connection.h" -#include "nm-udev-aux/nm-udev-utils.h" +#include "libnm-udev-aux/nm-udev-utils.h" /*****************************************************************************/ diff --git a/libnm/nm-dhcp-config.c b/src/libnm-client-impl/nm-dhcp-config.c similarity index 99% rename from libnm/nm-dhcp-config.c rename to src/libnm-client-impl/nm-dhcp-config.c index ec7da6ded0..c7f9a87a07 100644 --- a/libnm/nm-dhcp-config.c +++ b/src/libnm-client-impl/nm-dhcp-config.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dhcp-config.h" diff --git a/libnm/nm-dhcp4-config.c b/src/libnm-client-impl/nm-dhcp4-config.c similarity index 92% rename from libnm/nm-dhcp4-config.c rename to src/libnm-client-impl/nm-dhcp4-config.c index 25219d45f3..8ce8415f71 100644 --- a/libnm/nm-dhcp4-config.c +++ b/src/libnm-client-impl/nm-dhcp4-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dhcp4-config.h" diff --git a/libnm/nm-dhcp4-config.h b/src/libnm-client-impl/nm-dhcp4-config.h similarity index 100% rename from libnm/nm-dhcp4-config.h rename to src/libnm-client-impl/nm-dhcp4-config.h diff --git a/libnm/nm-dhcp6-config.c b/src/libnm-client-impl/nm-dhcp6-config.c similarity index 92% rename from libnm/nm-dhcp6-config.c rename to src/libnm-client-impl/nm-dhcp6-config.c index 2574b36cfd..7db0264075 100644 --- a/libnm/nm-dhcp6-config.c +++ b/src/libnm-client-impl/nm-dhcp6-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dhcp6-config.h" diff --git a/libnm/nm-dhcp6-config.h b/src/libnm-client-impl/nm-dhcp6-config.h similarity index 100% rename from libnm/nm-dhcp6-config.h rename to src/libnm-client-impl/nm-dhcp6-config.h diff --git a/libnm/nm-dns-manager.c b/src/libnm-client-impl/nm-dns-manager.c similarity index 99% rename from libnm/nm-dns-manager.c rename to src/libnm-client-impl/nm-dns-manager.c index 9c5f0cf0f7..f7c564ffeb 100644 --- a/libnm/nm-dns-manager.c +++ b/src/libnm-client-impl/nm-dns-manager.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dns-manager.h" diff --git a/libnm/nm-dns-manager.h b/src/libnm-client-impl/nm-dns-manager.h similarity index 100% rename from libnm/nm-dns-manager.h rename to src/libnm-client-impl/nm-dns-manager.h diff --git a/libnm/nm-ip-config.c b/src/libnm-client-impl/nm-ip-config.c similarity index 99% rename from libnm/nm-ip-config.c rename to src/libnm-client-impl/nm-ip-config.c index 4c336213c9..099dd088fa 100644 --- a/libnm/nm-ip-config.c +++ b/src/libnm-client-impl/nm-ip-config.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 - 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-ip-config.h" diff --git a/libnm/nm-ip4-config.c b/src/libnm-client-impl/nm-ip4-config.c similarity index 92% rename from libnm/nm-ip4-config.c rename to src/libnm-client-impl/nm-ip4-config.c index 6c4a4ab3ad..0f2fdb0494 100644 --- a/libnm/nm-ip4-config.c +++ b/src/libnm-client-impl/nm-ip4-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-ip4-config.h" diff --git a/libnm/nm-ip4-config.h b/src/libnm-client-impl/nm-ip4-config.h similarity index 100% rename from libnm/nm-ip4-config.h rename to src/libnm-client-impl/nm-ip4-config.h diff --git a/libnm/nm-ip6-config.c b/src/libnm-client-impl/nm-ip6-config.c similarity index 92% rename from libnm/nm-ip6-config.c rename to src/libnm-client-impl/nm-ip6-config.c index 19c869c6f6..78e0b7dcb2 100644 --- a/libnm/nm-ip6-config.c +++ b/src/libnm-client-impl/nm-ip6-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-ip6-config.h" diff --git a/libnm/nm-ip6-config.h b/src/libnm-client-impl/nm-ip6-config.h similarity index 100% rename from libnm/nm-ip6-config.h rename to src/libnm-client-impl/nm-ip6-config.h diff --git a/libnm/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c similarity index 99% rename from libnm/nm-libnm-utils.c rename to src/libnm-client-impl/nm-libnm-utils.c index 02abd560c6..fe1b911b68 100644 --- a/libnm/nm-libnm-utils.c +++ b/src/libnm-client-impl/nm-libnm-utils.c @@ -4,11 +4,11 @@ * Copyright (C) 2007 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-libnm-utils.h" -#include "nm-glib-aux/nm-time-utils.h" +#include "libnm-glib-aux/nm-time-utils.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-object.h" diff --git a/libnm/nm-libnm-utils.h b/src/libnm-client-impl/nm-libnm-utils.h similarity index 99% rename from libnm/nm-libnm-utils.h rename to src/libnm-client-impl/nm-libnm-utils.h index 7b9f0e6b83..3fd3b679e8 100644 --- a/libnm/nm-libnm-utils.h +++ b/src/libnm-client-impl/nm-libnm-utils.h @@ -8,8 +8,8 @@ #include "c-list/src/c-list.h" #include "nm-device.h" -#include "nm-glib-aux/nm-ref-string.h" -#include "nm-glib-aux/nm-logging-fwd.h" +#include "libnm-glib-aux/nm-ref-string.h" +#include "libnm-glib-aux/nm-logging-fwd.h" #include "nm-types.h" #include "nm-object.h" #include "nm-client.h" diff --git a/libnm/nm-object-private.h b/src/libnm-client-impl/nm-object-private.h similarity index 100% rename from libnm/nm-object-private.h rename to src/libnm-client-impl/nm-object-private.h diff --git a/libnm/nm-object.c b/src/libnm-client-impl/nm-object.c similarity index 99% rename from libnm/nm-object.c rename to src/libnm-client-impl/nm-object.c index eaf178e7db..2e7de8c266 100644 --- a/libnm/nm-object.c +++ b/src/libnm-client-impl/nm-object.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-object.h" diff --git a/libnm/nm-remote-connection-private.h b/src/libnm-client-impl/nm-remote-connection-private.h similarity index 100% rename from libnm/nm-remote-connection-private.h rename to src/libnm-client-impl/nm-remote-connection-private.h diff --git a/libnm/nm-remote-connection.c b/src/libnm-client-impl/nm-remote-connection.c similarity index 99% rename from libnm/nm-remote-connection.c rename to src/libnm-client-impl/nm-remote-connection.c index 8ad1e51c72..007da3aa87 100644 --- a/libnm/nm-remote-connection.c +++ b/src/libnm-client-impl/nm-remote-connection.c @@ -4,11 +4,11 @@ * Copyright (C) 2007 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-remote-connection.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "nm-dbus-interface.h" #include "nm-utils.h" #include "nm-setting-connection.h" diff --git a/libnm/nm-secret-agent-old.c b/src/libnm-client-impl/nm-secret-agent-old.c similarity index 99% rename from libnm/nm-secret-agent-old.c rename to src/libnm-client-impl/nm-secret-agent-old.c index 771706610d..881dfd54ce 100644 --- a/libnm/nm-secret-agent-old.c +++ b/src/libnm-client-impl/nm-secret-agent-old.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-secret-agent-old.h" @@ -12,9 +12,9 @@ #include "nm-dbus-helpers.h" #include "nm-dbus-interface.h" #include "nm-enum-types.h" -#include "nm-glib-aux/nm-c-list.h" -#include "nm-glib-aux/nm-dbus-aux.h" -#include "nm-glib-aux/nm-time-utils.h" +#include "libnm-glib-aux/nm-c-list.h" +#include "libnm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-time-utils.h" #include "nm-simple-connection.h" #define REGISTER_RETRY_TIMEOUT_MSEC 3000 diff --git a/libnm/nm-vpn-connection.c b/src/libnm-client-impl/nm-vpn-connection.c similarity index 99% rename from libnm/nm-vpn-connection.c rename to src/libnm-client-impl/nm-vpn-connection.c index cdbaefc032..fb0615328a 100644 --- a/libnm/nm-vpn-connection.c +++ b/src/libnm-client-impl/nm-vpn-connection.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-vpn-connection.h" diff --git a/libnm/nm-vpn-editor.c b/src/libnm-client-impl/nm-vpn-editor.c similarity index 96% rename from libnm/nm-vpn-editor.c rename to src/libnm-client-impl/nm-vpn-editor.c index e326958881..57aa8b02ba 100644 --- a/libnm/nm-vpn-editor.c +++ b/src/libnm-client-impl/nm-vpn-editor.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-vpn-editor.h" diff --git a/libnm/nm-vpn-plugin-old.c b/src/libnm-client-impl/nm-vpn-plugin-old.c similarity index 99% rename from libnm/nm-vpn-plugin-old.c rename to src/libnm-client-impl/nm-vpn-plugin-old.c index 2ff83efa3c..be4e1cf292 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/src/libnm-client-impl/nm-vpn-plugin-old.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-vpn-plugin-old.h" diff --git a/libnm/nm-vpn-service-plugin.c b/src/libnm-client-impl/nm-vpn-service-plugin.c similarity index 99% rename from libnm/nm-vpn-service-plugin.c rename to src/libnm-client-impl/nm-vpn-service-plugin.c index f89ea4ce7f..74e9e24f4f 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/src/libnm-client-impl/nm-vpn-service-plugin.c @@ -4,15 +4,15 @@ * Copyright (C) 2007 - 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-vpn-service-plugin.h" #include #include -#include "nm-glib-aux/nm-secret-utils.h" -#include "nm-glib-aux/nm-dbus-aux.h" +#include "libnm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-dbus-aux.h" #include "nm-enum-types.h" #include "nm-utils.h" #include "nm-connection.h" @@ -1333,10 +1333,3 @@ nm_vpn_service_plugin_initable_iface_init(GInitableIface *iface) { iface->init = init_sync; } - -/*****************************************************************************/ - -/* this header is intended to be copied to users of nm_vpn_editor_plugin_call(), - * to simplify invocation of generic functions. Include it here, to compile - * the code. */ -#include "nm-utils/nm-vpn-editor-plugin-call.h" diff --git a/libnm/nm-wifi-p2p-peer.c b/src/libnm-client-impl/nm-wifi-p2p-peer.c similarity index 99% rename from libnm/nm-wifi-p2p-peer.c rename to src/libnm-client-impl/nm-wifi-p2p-peer.c index cab4648ecf..1d6b7c9541 100644 --- a/libnm/nm-wifi-p2p-peer.c +++ b/src/libnm-client-impl/nm-wifi-p2p-peer.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 - 2019 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-wifi-p2p-peer.h" diff --git a/libnm/nm-wimax-nsp.c b/src/libnm-client-impl/nm-wimax-nsp.c similarity index 99% rename from libnm/nm-wimax-nsp.c rename to src/libnm-client-impl/nm-wimax-nsp.c index 421fe9e7ab..62181d6bc6 100644 --- a/libnm/nm-wimax-nsp.c +++ b/src/libnm-client-impl/nm-wimax-nsp.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-wimax-nsp.h" diff --git a/libnm/tests/meson.build b/src/libnm-client-impl/tests/meson.build similarity index 55% rename from libnm/tests/meson.build rename to src/libnm-client-impl/tests/meson.build index d2e5fe7ef6..3f7bf3a067 100644 --- a/libnm/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -10,17 +10,17 @@ test_units = [ foreach test_unit: test_units exe = executable( test_unit, - [ - test_unit + '.c', - nm_test_utils_impl_source, - libnm_enum_sources[1], + [ test_unit + '.c' ] + (test_unit == 'test-libnm' ? src_contrib_nm_compat_source : []), + include_directories: [ + libnm_client_public_inc, ], dependencies: [ libnm_core_impl_dep_link, libnm_nm_default_dep, ], link_with: [ - libnm_static, + libnm_client_impl, + libnm_client_test, libnm_base, ], ) @@ -32,11 +32,3 @@ foreach test_unit: test_units args: test_args + [exe.full_path()], ) endforeach - -# just test, that we can build "nm-vpn-plugin-utils.c" -libnm_vpn_plugin_utils_test = static_library( - 'nm-vpn-plugin-utils-test', - sources: nm_vpn_plugin_utils_source + [libnm_enum_sources[1]], - include_directories: libnm_inc, - dependencies: libnm_nm_default_dep, -) diff --git a/libnm/tests/test-libnm.c b/src/libnm-client-impl/tests/test-libnm.c similarity index 99% rename from libnm/tests/test-libnm.c rename to src/libnm-client-impl/tests/test-libnm.c index f97cd62c20..fab36cb416 100644 --- a/libnm/tests/test-libnm.c +++ b/src/libnm-client-impl/tests/test-libnm.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #if defined(HAVE_DECL_MEMFD_CREATE) && HAVE_DECL_MEMFD_CREATE #include @@ -14,17 +14,17 @@ #include "NetworkManager.h" #include "nm-access-point.h" #include "nm-checkpoint.h" -#include "nm-dhcp4-config.h" -#include "nm-dhcp6-config.h" -#include "nm-dns-manager.h" -#include "nm-ip4-config.h" -#include "nm-ip6-config.h" -#include "nm-libnm-utils.h" +#include "libnm-client-impl/nm-dhcp4-config.h" +#include "libnm-client-impl/nm-dhcp6-config.h" +#include "libnm-client-impl/nm-dns-manager.h" +#include "libnm-client-impl/nm-ip4-config.h" +#include "libnm-client-impl/nm-ip6-config.h" +#include "libnm-client-impl/nm-libnm-utils.h" #include "nm-object.h" #include "nm-vpn-service-plugin.h" #include "libnm-core-aux-intern/nm-libnm-core-utils.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ diff --git a/libnm/tests/test-nm-client.c b/src/libnm-client-impl/tests/test-nm-client.c similarity index 99% rename from libnm/tests/test-nm-client.c rename to src/libnm-client-impl/tests/test-nm-client.c index 5452c623b2..55b886a08c 100644 --- a/libnm/tests/test-nm-client.c +++ b/src/libnm-client-impl/tests/test-nm-client.c @@ -3,12 +3,12 @@ * Copyright (C) 2010 - 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include #include -#include "nm-test-libnm-utils.h" +#include "libnm-client-test/nm-test-libnm-utils.h" static struct { GMainLoop *loop; @@ -1291,3 +1291,10 @@ main(int argc, char **argv) return g_test_run(); } + +/*****************************************************************************/ + +/* this header is intended to be copied to users of nm_vpn_editor_plugin_call(), + * to simplify invocation of generic functions. Include it here, to compile + * the code. */ +#include "contrib/nm-vpn-editor-plugin-call.h" diff --git a/libnm/tests/test-remote-settings-client.c b/src/libnm-client-impl/tests/test-remote-settings-client.c similarity index 99% rename from libnm/tests/test-remote-settings-client.c rename to src/libnm-client-impl/tests/test-remote-settings-client.c index 0e7b744d52..e5415f54c0 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/src/libnm-client-impl/tests/test-remote-settings-client.c @@ -3,14 +3,14 @@ * Copyright (C) 2010 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include #include -#include "nm-glib-aux/nm-time-utils.h" +#include "libnm-glib-aux/nm-time-utils.h" -#include "nm-test-libnm-utils.h" +#include "libnm-client-test/nm-test-libnm-utils.h" static struct { NMTstcServiceInfo * sinfo; diff --git a/libnm/tests/test-secret-agent.c b/src/libnm-client-impl/tests/test-secret-agent.c similarity index 99% rename from libnm/tests/test-secret-agent.c rename to src/libnm-client-impl/tests/test-secret-agent.c index 08c77f8c87..8f758f3dd8 100644 --- a/libnm/tests/test-secret-agent.c +++ b/src/libnm-client-impl/tests/test-secret-agent.c @@ -3,14 +3,14 @@ * Copyright (C) 2010 - 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include #include #include "nm-secret-agent-old.h" -#include "nm-test-libnm-utils.h" +#include "libnm-client-test/nm-test-libnm-utils.h" /*****************************************************************************/ diff --git a/libnm/NetworkManager.h b/src/libnm-client-public/NetworkManager.h similarity index 100% rename from libnm/NetworkManager.h rename to src/libnm-client-public/NetworkManager.h diff --git a/src/libnm-client-public/meson.build b/src/libnm-client-public/meson.build new file mode 100644 index 0000000000..1a1e612255 --- /dev/null +++ b/src/libnm-client-public/meson.build @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_client_public_inc = include_directories('.') + +libnm_client_headers = files( + 'NetworkManager.h', + 'nm-access-point.h', + 'nm-active-connection.h', + 'nm-autoptr.h', + 'nm-checkpoint.h', + 'nm-client.h', + 'nm-device-6lowpan.h', + 'nm-device-adsl.h', + 'nm-device-bond.h', + 'nm-device-bridge.h', + 'nm-device-bt.h', + 'nm-device-dummy.h', + 'nm-device-ethernet.h', + 'nm-device-generic.h', + 'nm-device-infiniband.h', + 'nm-device-ip-tunnel.h', + 'nm-device-macsec.h', + 'nm-device-macvlan.h', + 'nm-device-modem.h', + 'nm-device-olpc-mesh.h', + 'nm-device-ovs-bridge.h', + 'nm-device-ovs-interface.h', + 'nm-device-ovs-port.h', + 'nm-device-ppp.h', + 'nm-device-team.h', + 'nm-device-tun.h', + 'nm-device-veth.h', + 'nm-device-vlan.h', + 'nm-device-vrf.h', + 'nm-device-vxlan.h', + 'nm-device-wifi-p2p.h', + 'nm-device-wifi.h', + 'nm-device-wimax.h', + 'nm-device-wireguard.h', + 'nm-device-wpan.h', + 'nm-device.h', + 'nm-dhcp-config.h', + 'nm-ethtool-utils.h', + 'nm-ip-config.h', + 'nm-object.h', + 'nm-remote-connection.h', + 'nm-secret-agent-old.h', + 'nm-types.h', + 'nm-vpn-connection.h', + 'nm-vpn-editor.h', + 'nm-vpn-plugin-old.h', + 'nm-vpn-service-plugin.h', + 'nm-wifi-p2p-peer.h', + 'nm-wimax-nsp.h', +) + +libnm_client_public_enum_sources = gnome.mkenums( + 'nm-enum-types', + sources: libnm_client_headers + [nm_version_macro_header], + identifier_prefix: nm_id_prefix, + c_template: 'nm-enum-types.c.template', + h_template: 'nm-enum-types.h.template', + install_header: true, + install_dir: libnm_pkgincludedir, +) + +install_headers( + libnm_core_headers + libnm_client_headers + [nm_version_macro_header], + subdir: libnm_name, +) + +libnm_client_public_dep = declare_dependency( + sources: libnm_client_public_enum_sources[1], + include_directories: [ + libnm_client_public_inc, + src_inc, + top_inc, + ], + dependencies: [ + libnm_core_public_dep, + glib_dep, + ], +) diff --git a/libnm/nm-access-point.h b/src/libnm-client-public/nm-access-point.h similarity index 100% rename from libnm/nm-access-point.h rename to src/libnm-client-public/nm-access-point.h diff --git a/libnm/nm-active-connection.h b/src/libnm-client-public/nm-active-connection.h similarity index 100% rename from libnm/nm-active-connection.h rename to src/libnm-client-public/nm-active-connection.h diff --git a/libnm/nm-autoptr.h b/src/libnm-client-public/nm-autoptr.h similarity index 100% rename from libnm/nm-autoptr.h rename to src/libnm-client-public/nm-autoptr.h diff --git a/libnm/nm-checkpoint.h b/src/libnm-client-public/nm-checkpoint.h similarity index 100% rename from libnm/nm-checkpoint.h rename to src/libnm-client-public/nm-checkpoint.h diff --git a/libnm/nm-client.h b/src/libnm-client-public/nm-client.h similarity index 100% rename from libnm/nm-client.h rename to src/libnm-client-public/nm-client.h diff --git a/libnm/nm-device-6lowpan.h b/src/libnm-client-public/nm-device-6lowpan.h similarity index 100% rename from libnm/nm-device-6lowpan.h rename to src/libnm-client-public/nm-device-6lowpan.h diff --git a/libnm/nm-device-adsl.h b/src/libnm-client-public/nm-device-adsl.h similarity index 100% rename from libnm/nm-device-adsl.h rename to src/libnm-client-public/nm-device-adsl.h diff --git a/libnm/nm-device-bond.h b/src/libnm-client-public/nm-device-bond.h similarity index 100% rename from libnm/nm-device-bond.h rename to src/libnm-client-public/nm-device-bond.h diff --git a/libnm/nm-device-bridge.h b/src/libnm-client-public/nm-device-bridge.h similarity index 100% rename from libnm/nm-device-bridge.h rename to src/libnm-client-public/nm-device-bridge.h diff --git a/libnm/nm-device-bt.h b/src/libnm-client-public/nm-device-bt.h similarity index 100% rename from libnm/nm-device-bt.h rename to src/libnm-client-public/nm-device-bt.h diff --git a/libnm/nm-device-dummy.h b/src/libnm-client-public/nm-device-dummy.h similarity index 100% rename from libnm/nm-device-dummy.h rename to src/libnm-client-public/nm-device-dummy.h diff --git a/libnm/nm-device-ethernet.h b/src/libnm-client-public/nm-device-ethernet.h similarity index 100% rename from libnm/nm-device-ethernet.h rename to src/libnm-client-public/nm-device-ethernet.h diff --git a/libnm/nm-device-generic.h b/src/libnm-client-public/nm-device-generic.h similarity index 100% rename from libnm/nm-device-generic.h rename to src/libnm-client-public/nm-device-generic.h diff --git a/libnm/nm-device-infiniband.h b/src/libnm-client-public/nm-device-infiniband.h similarity index 100% rename from libnm/nm-device-infiniband.h rename to src/libnm-client-public/nm-device-infiniband.h diff --git a/libnm/nm-device-ip-tunnel.h b/src/libnm-client-public/nm-device-ip-tunnel.h similarity index 100% rename from libnm/nm-device-ip-tunnel.h rename to src/libnm-client-public/nm-device-ip-tunnel.h diff --git a/libnm/nm-device-macsec.h b/src/libnm-client-public/nm-device-macsec.h similarity index 100% rename from libnm/nm-device-macsec.h rename to src/libnm-client-public/nm-device-macsec.h diff --git a/libnm/nm-device-macvlan.h b/src/libnm-client-public/nm-device-macvlan.h similarity index 100% rename from libnm/nm-device-macvlan.h rename to src/libnm-client-public/nm-device-macvlan.h diff --git a/libnm/nm-device-modem.h b/src/libnm-client-public/nm-device-modem.h similarity index 100% rename from libnm/nm-device-modem.h rename to src/libnm-client-public/nm-device-modem.h diff --git a/libnm/nm-device-olpc-mesh.h b/src/libnm-client-public/nm-device-olpc-mesh.h similarity index 100% rename from libnm/nm-device-olpc-mesh.h rename to src/libnm-client-public/nm-device-olpc-mesh.h diff --git a/libnm/nm-device-ovs-bridge.h b/src/libnm-client-public/nm-device-ovs-bridge.h similarity index 100% rename from libnm/nm-device-ovs-bridge.h rename to src/libnm-client-public/nm-device-ovs-bridge.h diff --git a/libnm/nm-device-ovs-interface.h b/src/libnm-client-public/nm-device-ovs-interface.h similarity index 100% rename from libnm/nm-device-ovs-interface.h rename to src/libnm-client-public/nm-device-ovs-interface.h diff --git a/libnm/nm-device-ovs-port.h b/src/libnm-client-public/nm-device-ovs-port.h similarity index 100% rename from libnm/nm-device-ovs-port.h rename to src/libnm-client-public/nm-device-ovs-port.h diff --git a/libnm/nm-device-ppp.h b/src/libnm-client-public/nm-device-ppp.h similarity index 100% rename from libnm/nm-device-ppp.h rename to src/libnm-client-public/nm-device-ppp.h diff --git a/libnm/nm-device-team.h b/src/libnm-client-public/nm-device-team.h similarity index 100% rename from libnm/nm-device-team.h rename to src/libnm-client-public/nm-device-team.h diff --git a/libnm/nm-device-tun.h b/src/libnm-client-public/nm-device-tun.h similarity index 100% rename from libnm/nm-device-tun.h rename to src/libnm-client-public/nm-device-tun.h diff --git a/libnm/nm-device-veth.h b/src/libnm-client-public/nm-device-veth.h similarity index 100% rename from libnm/nm-device-veth.h rename to src/libnm-client-public/nm-device-veth.h diff --git a/libnm/nm-device-vlan.h b/src/libnm-client-public/nm-device-vlan.h similarity index 100% rename from libnm/nm-device-vlan.h rename to src/libnm-client-public/nm-device-vlan.h diff --git a/libnm/nm-device-vrf.h b/src/libnm-client-public/nm-device-vrf.h similarity index 100% rename from libnm/nm-device-vrf.h rename to src/libnm-client-public/nm-device-vrf.h diff --git a/libnm/nm-device-vxlan.h b/src/libnm-client-public/nm-device-vxlan.h similarity index 100% rename from libnm/nm-device-vxlan.h rename to src/libnm-client-public/nm-device-vxlan.h diff --git a/libnm/nm-device-wifi-p2p.h b/src/libnm-client-public/nm-device-wifi-p2p.h similarity index 100% rename from libnm/nm-device-wifi-p2p.h rename to src/libnm-client-public/nm-device-wifi-p2p.h diff --git a/libnm/nm-device-wifi.h b/src/libnm-client-public/nm-device-wifi.h similarity index 100% rename from libnm/nm-device-wifi.h rename to src/libnm-client-public/nm-device-wifi.h diff --git a/libnm/nm-device-wimax.h b/src/libnm-client-public/nm-device-wimax.h similarity index 100% rename from libnm/nm-device-wimax.h rename to src/libnm-client-public/nm-device-wimax.h diff --git a/libnm/nm-device-wireguard.h b/src/libnm-client-public/nm-device-wireguard.h similarity index 100% rename from libnm/nm-device-wireguard.h rename to src/libnm-client-public/nm-device-wireguard.h diff --git a/libnm/nm-device-wpan.h b/src/libnm-client-public/nm-device-wpan.h similarity index 100% rename from libnm/nm-device-wpan.h rename to src/libnm-client-public/nm-device-wpan.h diff --git a/libnm/nm-device.h b/src/libnm-client-public/nm-device.h similarity index 100% rename from libnm/nm-device.h rename to src/libnm-client-public/nm-device.h diff --git a/libnm/nm-dhcp-config.h b/src/libnm-client-public/nm-dhcp-config.h similarity index 100% rename from libnm/nm-dhcp-config.h rename to src/libnm-client-public/nm-dhcp-config.h diff --git a/libnm/nm-enum-types.c.template b/src/libnm-client-public/nm-enum-types.c.template similarity index 97% rename from libnm/nm-enum-types.c.template rename to src/libnm-client-public/nm-enum-types.c.template index 396f61526c..c2627f447d 100644 --- a/libnm/nm-enum-types.c.template +++ b/src/libnm-client-public/nm-enum-types.c.template @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-enum-types.h" diff --git a/libnm/nm-enum-types.h.template b/src/libnm-client-public/nm-enum-types.h.template similarity index 100% rename from libnm/nm-enum-types.h.template rename to src/libnm-client-public/nm-enum-types.h.template diff --git a/libnm/nm-ethtool-utils.h b/src/libnm-client-public/nm-ethtool-utils.h similarity index 100% rename from libnm/nm-ethtool-utils.h rename to src/libnm-client-public/nm-ethtool-utils.h diff --git a/libnm/nm-ip-config.h b/src/libnm-client-public/nm-ip-config.h similarity index 100% rename from libnm/nm-ip-config.h rename to src/libnm-client-public/nm-ip-config.h diff --git a/libnm/nm-object.h b/src/libnm-client-public/nm-object.h similarity index 100% rename from libnm/nm-object.h rename to src/libnm-client-public/nm-object.h diff --git a/libnm/nm-remote-connection.h b/src/libnm-client-public/nm-remote-connection.h similarity index 100% rename from libnm/nm-remote-connection.h rename to src/libnm-client-public/nm-remote-connection.h diff --git a/libnm/nm-secret-agent-old.h b/src/libnm-client-public/nm-secret-agent-old.h similarity index 100% rename from libnm/nm-secret-agent-old.h rename to src/libnm-client-public/nm-secret-agent-old.h diff --git a/libnm/nm-types.h b/src/libnm-client-public/nm-types.h similarity index 100% rename from libnm/nm-types.h rename to src/libnm-client-public/nm-types.h diff --git a/libnm/nm-vpn-connection.h b/src/libnm-client-public/nm-vpn-connection.h similarity index 100% rename from libnm/nm-vpn-connection.h rename to src/libnm-client-public/nm-vpn-connection.h diff --git a/libnm/nm-vpn-editor.h b/src/libnm-client-public/nm-vpn-editor.h similarity index 100% rename from libnm/nm-vpn-editor.h rename to src/libnm-client-public/nm-vpn-editor.h diff --git a/libnm/nm-vpn-plugin-old.h b/src/libnm-client-public/nm-vpn-plugin-old.h similarity index 100% rename from libnm/nm-vpn-plugin-old.h rename to src/libnm-client-public/nm-vpn-plugin-old.h diff --git a/libnm/nm-vpn-service-plugin.h b/src/libnm-client-public/nm-vpn-service-plugin.h similarity index 100% rename from libnm/nm-vpn-service-plugin.h rename to src/libnm-client-public/nm-vpn-service-plugin.h diff --git a/libnm/nm-wifi-p2p-peer.h b/src/libnm-client-public/nm-wifi-p2p-peer.h similarity index 100% rename from libnm/nm-wifi-p2p-peer.h rename to src/libnm-client-public/nm-wifi-p2p-peer.h diff --git a/libnm/nm-wimax-nsp.h b/src/libnm-client-public/nm-wimax-nsp.h similarity index 100% rename from libnm/nm-wimax-nsp.h rename to src/libnm-client-public/nm-wimax-nsp.h diff --git a/src/libnm-client-test/meson.build b/src/libnm-client-test/meson.build new file mode 100644 index 0000000000..acf7c39e9e --- /dev/null +++ b/src/libnm-client-test/meson.build @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_client_test = static_library( + 'nm-client-test', + sources: files( + 'nm-test-utils-impl.c', + ), + include_directories: [ + libnm_core_public_inc, + libnm_client_public_inc, + src_inc, + top_inc, + ], + dependencies: [ + libnm_core_aux_intern_dep, + libnm_core_public_dep, + libnm_glib_aux_dep, + glib_dep, + ], +) diff --git a/shared/nm-test-libnm-utils.h b/src/libnm-client-test/nm-test-libnm-utils.h similarity index 98% rename from shared/nm-test-libnm-utils.h rename to src/libnm-client-test/nm-test-libnm-utils.h index cac54076c5..58909304d0 100644 --- a/shared/nm-test-libnm-utils.h +++ b/src/libnm-client-test/nm-test-libnm-utils.h @@ -8,7 +8,7 @@ #include "NetworkManager.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" typedef struct { GDBusConnection *bus; diff --git a/shared/nm-test-utils-impl.c b/src/libnm-client-test/nm-test-utils-impl.c similarity index 99% rename from shared/nm-test-utils-impl.c rename to src/libnm-client-test/nm-test-utils-impl.c index f8f98d8170..610232b000 100644 --- a/shared/nm-test-utils-impl.c +++ b/src/libnm-client-test/nm-test-utils-impl.c @@ -3,14 +3,14 @@ * Copyright (C) 2010 - 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include #include "NetworkManager.h" -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" -#include "nm-test-libnm-utils.h" +#include "libnm-client-test/nm-test-libnm-utils.h" #define NMTSTC_NM_SERVICE NM_BUILD_SRCDIR "/tools/test-networkmanager-service.py" diff --git a/src/libnm-core-aux-extern/nm-libnm-core-aux.c b/src/libnm-core-aux-extern/nm-libnm-core-aux.c index 8f3bbef0b9..6c45ecf728 100644 --- a/src/libnm-core-aux-extern/nm-libnm-core-aux.c +++ b/src/libnm-core-aux-extern/nm-libnm-core-aux.c @@ -3,7 +3,7 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-libnm-core-aux.h" diff --git a/src/libnm-core-aux-intern/meson.build b/src/libnm-core-aux-intern/meson.build index c1a1d69c0a..37baa61ef9 100644 --- a/src/libnm-core-aux-intern/meson.build +++ b/src/libnm-core-aux-intern/meson.build @@ -15,7 +15,6 @@ libnm_core_aux_intern = static_library( libnm_core_aux_intern_dep = declare_dependency( include_directories: [ - shared_inc, src_inc, top_inc, ], diff --git a/src/libnm-core-aux-intern/nm-auth-subject.c b/src/libnm-core-aux-intern/nm-auth-subject.c index 2862356052..536b4e474d 100644 --- a/src/libnm-core-aux-intern/nm-auth-subject.c +++ b/src/libnm-core-aux-intern/nm-auth-subject.c @@ -11,7 +11,7 @@ * makes requests, like process identifier and user UID. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-auth-subject.h" diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c index e3d7b7b183..87dc1e9ebd 100644 --- a/src/libnm-core-aux-intern/nm-libnm-core-utils.c +++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-libnm-core-utils.h" diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build index f11dc6df59..df283dd607 100644 --- a/src/libnm-core-impl/meson.build +++ b/src/libnm-core-impl/meson.build @@ -136,7 +136,3 @@ libnm_core_impl_dep_link = declare_dependency( ], link_with: libnm_core_impl, ) - -if enable_tests - subdir('tests') -endif diff --git a/src/libnm-core-impl/nm-crypto-gnutls.c b/src/libnm-core-impl/nm-crypto-gnutls.c index 0f6da6175e..db4be8a721 100644 --- a/src/libnm-core-impl/nm-crypto-gnutls.c +++ b/src/libnm-core-impl/nm-crypto-gnutls.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2015 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-crypto-impl.h" @@ -13,7 +13,7 @@ #include #include -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "nm-errors.h" /*****************************************************************************/ diff --git a/src/libnm-core-impl/nm-crypto-nss.c b/src/libnm-core-impl/nm-crypto-nss.c index 24a53f5dfe..6f4322813a 100644 --- a/src/libnm-core-impl/nm-crypto-nss.c +++ b/src/libnm-core-impl/nm-crypto-nss.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2009 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-crypto-impl.h" @@ -20,7 +20,7 @@ NM_PRAGMA_WARNING_DISABLE("-Wstrict-prototypes") #include NM_PRAGMA_WARNING_REENABLE -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "nm-errors.h" /*****************************************************************************/ diff --git a/src/libnm-core-impl/nm-crypto.c b/src/libnm-core-impl/nm-crypto.c index 46888d45b8..d84a2b100d 100644 --- a/src/libnm-core-impl/nm-crypto.c +++ b/src/libnm-core-impl/nm-crypto.c @@ -12,8 +12,8 @@ #include #include -#include "nm-glib-aux/nm-secret-utils.h" -#include "nm-glib-aux/nm-io-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-io-utils.h" #include "nm-crypto-impl.h" #include "nm-utils.h" diff --git a/src/libnm-core-impl/nm-default-libnm-core.h b/src/libnm-core-impl/nm-default-libnm-core.h index 6eb84b947a..0f27f82d52 100644 --- a/src/libnm-core-impl/nm-default-libnm-core.h +++ b/src/libnm-core-impl/nm-default-libnm-core.h @@ -8,7 +8,7 @@ /*****************************************************************************/ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE diff --git a/src/libnm-core-impl/nm-keyfile-utils.c b/src/libnm-core-impl/nm-keyfile-utils.c index 6e1a255314..9c4a981ae5 100644 --- a/src/libnm-core-impl/nm-keyfile-utils.c +++ b/src/libnm-core-impl/nm-keyfile-utils.c @@ -9,7 +9,7 @@ #include -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-str-buf.h" #include "nm-keyfile.h" #include "nm-setting-wired.h" diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c index 4e12f13c7e..1de18180a3 100644 --- a/src/libnm-core-impl/nm-keyfile.c +++ b/src/libnm-core-impl/nm-keyfile.c @@ -18,9 +18,9 @@ #include #include -#include "nm-glib-aux/nm-str-buf.h" -#include "nm-glib-aux/nm-secret-utils.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-secret-utils.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "libnm-core-intern/nm-core-internal.h" diff --git a/src/libnm-core-impl/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c index 523c0d5db3..da85e5683b 100644 --- a/src/libnm-core-impl/nm-meta-setting-base-impl.c +++ b/src/libnm-core-impl/nm-meta-setting-base-impl.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 - 2018 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-meta-setting-base.h" diff --git a/src/libnm-core-impl/nm-setting-8021x.c b/src/libnm-core-impl/nm-setting-8021x.c index 96935b5f08..39afa3aaeb 100644 --- a/src/libnm-core-impl/nm-setting-8021x.c +++ b/src/libnm-core-impl/nm-setting-8021x.c @@ -8,7 +8,7 @@ #include "nm-setting-8021x.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" #include "nm-crypto.h" #include "nm-utils-private.h" diff --git a/src/libnm-core-impl/nm-setting-bridge.c b/src/libnm-core-impl/nm-setting-bridge.c index 95ae5bfbcc..202a8791ed 100644 --- a/src/libnm-core-impl/nm-setting-bridge.c +++ b/src/libnm-core-impl/nm-setting-bridge.c @@ -11,7 +11,7 @@ #include #include -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-str-buf.h" #include "nm-connection-private.h" #include "nm-utils.h" #include "nm-utils-private.h" diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index 38ba6663fb..241a871e05 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -17,7 +17,7 @@ #include "nm-setting-bridge.h" #include "nm-setting-team.h" #include "nm-setting-vlan.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" /** * SECTION:nm-setting-connection diff --git a/src/libnm-core-impl/nm-setting-ethtool.c b/src/libnm-core-impl/nm-setting-ethtool.c index db459697db..b32372e0bd 100644 --- a/src/libnm-core-impl/nm-setting-ethtool.c +++ b/src/libnm-core-impl/nm-setting-ethtool.c @@ -8,7 +8,7 @@ #include "nm-setting-ethtool.h" #include "nm-setting-private.h" -#include "nm-base/nm-ethtool-base.h" +#include "libnm-base/nm-ethtool-base.h" /*****************************************************************************/ diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index d55ebbf78f..0c3d75d0bc 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -11,7 +11,7 @@ #include #include -#include "nm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-str-buf.h" #include "nm-setting-ip4-config.h" #include "nm-setting-ip6-config.h" #include "nm-utils.h" diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c index e2a87ffc18..f9a3a7818c 100644 --- a/src/libnm-core-impl/nm-setting-macsec.c +++ b/src/libnm-core-impl/nm-setting-macsec.c @@ -9,7 +9,7 @@ #include -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" #include "libnm-core-intern/nm-core-types-internal.h" diff --git a/src/libnm-core-impl/nm-setting-vpn.c b/src/libnm-core-impl/nm-setting-vpn.c index 19aafd4f19..ce6e73f5b4 100644 --- a/src/libnm-core-impl/nm-setting-vpn.c +++ b/src/libnm-core-impl/nm-setting-vpn.c @@ -10,7 +10,7 @@ #include -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/src/libnm-core-impl/nm-setting-wireguard.c b/src/libnm-core-impl/nm-setting-wireguard.c index ea723a5b2e..644b36d698 100644 --- a/src/libnm-core-impl/nm-setting-wireguard.c +++ b/src/libnm-core-impl/nm-setting-wireguard.c @@ -10,7 +10,7 @@ #include "nm-setting-private.h" #include "nm-utils-private.h" #include "nm-connection-private.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" /*****************************************************************************/ diff --git a/src/libnm-core-impl/nm-setting-wireless-security.c b/src/libnm-core-impl/nm-setting-wireless-security.c index f5bbe185f3..6104aea575 100644 --- a/src/libnm-core-impl/nm-setting-wireless-security.c +++ b/src/libnm-core-impl/nm-setting-wireless-security.c @@ -13,7 +13,7 @@ #include "nm-utils-private.h" #include "nm-setting-private.h" #include "nm-setting-wireless.h" -#include "nm-glib-aux/nm-secret-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" /** * SECTION:nm-setting-wireless-security diff --git a/src/libnm-core-impl/nm-team-utils.c b/src/libnm-core-impl/nm-team-utils.c index 9546ababfd..88983d0b64 100644 --- a/src/libnm-core-impl/nm-team-utils.c +++ b/src/libnm-core-impl/nm-team-utils.c @@ -11,7 +11,7 @@ #include "nm-errors.h" #include "nm-utils-private.h" -#include "nm-glib-aux/nm-json-aux.h" +#include "libnm-glib-aux/nm-json-aux.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-team.h" #include "nm-setting-team-port.h" diff --git a/src/libnm-core-impl/nm-team-utils.h b/src/libnm-core-impl/nm-team-utils.h index 1488eb9da5..2039c16ec7 100644 --- a/src/libnm-core-impl/nm-team-utils.h +++ b/src/libnm-core-impl/nm-team-utils.h @@ -10,7 +10,7 @@ #error Cannot use this header. #endif -#include "nm-glib-aux/nm-value-type.h" +#include "libnm-glib-aux/nm-value-type.h" #include "libnm-core-intern/nm-core-internal.h" struct _NMSetting; diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index d4ab51df5f..b493b06f50 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -18,12 +18,12 @@ #include #include -#include "nm-glib-aux/nm-json-aux.h" -#include "nm-glib-aux/nm-str-buf.h" -#include "nm-glib-aux/nm-enum-utils.h" -#include "nm-glib-aux/nm-time-utils.h" -#include "nm-glib-aux/nm-secret-utils.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-glib-aux/nm-json-aux.h" +#include "libnm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-enum-utils.h" +#include "libnm-glib-aux/nm-time-utils.h" +#include "libnm-glib-aux/nm-secret-utils.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build index eafea9c040..406baa42ca 100644 --- a/src/libnm-core-impl/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -30,7 +30,7 @@ foreach test_unit: test_units libnm_core_impl_dep_link, libnm_base_dep_link, ], - link_with: libnm_systemd_logging_stub, + link_with: libnm_log_null, ) test( diff --git a/src/libnm-core-impl/tests/test-compare.c b/src/libnm-core-impl/tests/test-compare.c index fb82c55910..3716399a9a 100644 --- a/src/libnm-core-impl/tests/test-compare.c +++ b/src/libnm-core-impl/tests/test-compare.c @@ -11,7 +11,7 @@ #include "nm-property-compare.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" static void compare_ints(void) diff --git a/src/libnm-core-impl/tests/test-crypto.c b/src/libnm-core-impl/tests/test-crypto.c index 16082795cb..bdbcd0f3bd 100644 --- a/src/libnm-core-impl/tests/test-crypto.c +++ b/src/libnm-core-impl/tests/test-crypto.c @@ -15,7 +15,7 @@ #include "nm-errors.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" #define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs" diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index 80ec0e0c77..c1465c9a12 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -13,12 +13,12 @@ #include #include -#include "nm-std-aux/c-list-util.h" -#include "nm-glib-aux/nm-enum-utils.h" -#include "nm-glib-aux/nm-str-buf.h" -#include "nm-glib-aux/nm-json-aux.h" -#include "nm-base/nm-base.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-std-aux/c-list-util.h" +#include "libnm-glib-aux/nm-enum-utils.h" +#include "libnm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-json-aux.h" +#include "libnm-base/nm-base.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-utils.h" #include "nm-setting-private.h" @@ -58,13 +58,13 @@ #include "nm-setting-wpan.h" #include "nm-simple-connection.h" #include "libnm-core-intern/nm-keyfile-internal.h" -#include "nm-glib-aux/nm-dedup-multi.h" -#include "nm-base/nm-ethtool-base.h" -#include "nm-base/nm-ethtool-utils-base.h" +#include "libnm-glib-aux/nm-dedup-multi.h" +#include "libnm-base/nm-ethtool-base.h" +#include "libnm-base/nm-ethtool-utils-base.h" #include "test-general-enums.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /* When passing a "bool" typed argument to a variadic function that * expects a gboolean, the compiler will promote the integer type diff --git a/src/libnm-core-impl/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c index 755a40ae29..2e5483e6aa 100644 --- a/src/libnm-core-impl/tests/test-keyfile.c +++ b/src/libnm-core-impl/tests/test-keyfile.c @@ -5,7 +5,7 @@ #include "libnm-core-impl/nm-default-libnm-core.h" -#include "nm-glib-aux/nm-json-aux.h" +#include "libnm-glib-aux/nm-json-aux.h" #include "libnm-core-intern/nm-keyfile-utils.h" #include "libnm-core-intern/nm-keyfile-internal.h" #include "nm-simple-connection.h" @@ -16,7 +16,7 @@ #include "nm-setting-user.h" #include "nm-setting-proxy.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" #define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs" #define TEST_WIRED_TLS_CA_CERT TEST_CERT_DIR "/test-ca-cert.pem" diff --git a/src/libnm-core-impl/tests/test-secrets.c b/src/libnm-core-impl/tests/test-secrets.c index e2a58ded3f..e371795c74 100644 --- a/src/libnm-core-impl/tests/test-secrets.c +++ b/src/libnm-core-impl/tests/test-secrets.c @@ -20,7 +20,7 @@ #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" #define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs" #define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem" diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c index 1b08413f9c..ea68a02683 100644 --- a/src/libnm-core-impl/tests/test-setting.c +++ b/src/libnm-core-impl/tests/test-setting.c @@ -8,8 +8,8 @@ #include #include -#include "nm-glib-aux/nm-json-aux.h" -#include "nm-base/nm-ethtool-utils-base.h" +#include "libnm-glib-aux/nm-json-aux.h" +#include "libnm-base/nm-ethtool-utils-base.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-utils.h" #include "nm-utils-private.h" @@ -28,7 +28,7 @@ #include "nm-errors.h" #include "libnm-core-intern/nm-keyfile-internal.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" #define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs" diff --git a/src/libnm-core-impl/tests/test-settings-defaults.c b/src/libnm-core-impl/tests/test-settings-defaults.c index e04a55ec7a..b9db71074a 100644 --- a/src/libnm-core-impl/tests/test-settings-defaults.c +++ b/src/libnm-core-impl/tests/test-settings-defaults.c @@ -20,7 +20,7 @@ #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" static void test_defaults(GType type, const char *name) diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index 795adf432b..237247a92f 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -20,7 +20,7 @@ #error Cannot use this header. #endif -#include "nm-base/nm-base.h" +#include "libnm-base/nm-base.h" #include "nm-connection.h" #include "nm-core-enum-types.h" #include "nm-core-types-internal.h" diff --git a/src/libnm-core-intern/nm-keyfile-utils.h b/src/libnm-core-intern/nm-keyfile-utils.h index 1555c11244..450cc81cd9 100644 --- a/src/libnm-core-intern/nm-keyfile-utils.h +++ b/src/libnm-core-intern/nm-keyfile-utils.h @@ -12,7 +12,7 @@ /*****************************************************************************/ -#include "nm-glib-aux/nm-shared-utils.h" +#include "libnm-glib-aux/nm-shared-utils.h" /*****************************************************************************/ diff --git a/src/libnm-glib-aux/meson.build b/src/libnm-glib-aux/meson.build new file mode 100644 index 0000000000..e9c8544c38 --- /dev/null +++ b/src/libnm-glib-aux/meson.build @@ -0,0 +1,45 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_glib_aux = static_library( + 'nm-glib-aux', + sources: files( + 'nm-dbus-aux.c', + 'nm-dedup-multi.c', + 'nm-enum-utils.c', + 'nm-errno.c', + 'nm-hash-utils.c', + 'nm-io-utils.c', + 'nm-json-aux.c', + 'nm-keyfile-aux.c', + 'nm-logging-base.c', + 'nm-random-utils.c', + 'nm-ref-string.c', + 'nm-secret-utils.c', + 'nm-shared-utils.c', + 'nm-time-utils.c', + ), + include_directories: [ + src_inc, + top_inc, + ], + dependencies: glib_dep, + link_with: [ + libc_siphash, + libnm_std_aux, + ], +) + +libnm_glib_aux_dep = declare_dependency( + include_directories: [ + src_inc, + top_inc, + ], + dependencies: [ + glib_dep, + ], +) + +libnm_glib_aux_dep_link = declare_dependency( + dependencies: libnm_glib_aux_dep, + link_with: libnm_glib_aux, +) diff --git a/shared/nm-glib-aux/nm-c-list.h b/src/libnm-glib-aux/nm-c-list.h similarity index 100% rename from shared/nm-glib-aux/nm-c-list.h rename to src/libnm-glib-aux/nm-c-list.h diff --git a/shared/nm-glib-aux/nm-dbus-aux.c b/src/libnm-glib-aux/nm-dbus-aux.c similarity index 99% rename from shared/nm-glib-aux/nm-dbus-aux.c rename to src/libnm-glib-aux/nm-dbus-aux.c index ec409ff1fa..48864a0c41 100644 --- a/shared/nm-glib-aux/nm-dbus-aux.c +++ b/src/libnm-glib-aux/nm-dbus-aux.c @@ -3,7 +3,7 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-dbus-aux.h" diff --git a/shared/nm-glib-aux/nm-dbus-aux.h b/src/libnm-glib-aux/nm-dbus-aux.h similarity index 99% rename from shared/nm-glib-aux/nm-dbus-aux.h rename to src/libnm-glib-aux/nm-dbus-aux.h index 4e3ae22d82..744d3b7d17 100644 --- a/shared/nm-glib-aux/nm-dbus-aux.h +++ b/src/libnm-glib-aux/nm-dbus-aux.h @@ -6,7 +6,7 @@ #ifndef __NM_DBUS_AUX_H__ #define __NM_DBUS_AUX_H__ -#include "nm-std-aux/nm-dbus-compat.h" +#include "libnm-std-aux/nm-dbus-compat.h" /*****************************************************************************/ diff --git a/shared/nm-glib-aux/nm-dedup-multi.c b/src/libnm-glib-aux/nm-dedup-multi.c similarity index 99% rename from shared/nm-glib-aux/nm-dedup-multi.c rename to src/libnm-glib-aux/nm-dedup-multi.c index 99da3b3502..f77bb3cd7f 100644 --- a/shared/nm-glib-aux/nm-dedup-multi.c +++ b/src/libnm-glib-aux/nm-dedup-multi.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-dedup-multi.h" diff --git a/shared/nm-glib-aux/nm-dedup-multi.h b/src/libnm-glib-aux/nm-dedup-multi.h similarity index 99% rename from shared/nm-glib-aux/nm-dedup-multi.h rename to src/libnm-glib-aux/nm-dedup-multi.h index 1c0761bf1e..9a995ec5d4 100644 --- a/shared/nm-glib-aux/nm-dedup-multi.h +++ b/src/libnm-glib-aux/nm-dedup-multi.h @@ -7,7 +7,7 @@ #define __NM_DEDUP_MULTI_H__ #include "nm-obj.h" -#include "nm-std-aux/c-list-util.h" +#include "libnm-std-aux/c-list-util.h" /*****************************************************************************/ diff --git a/shared/nm-glib-aux/nm-default-glib-i18n-lib.h b/src/libnm-glib-aux/nm-default-glib-i18n-lib.h similarity index 93% rename from shared/nm-glib-aux/nm-default-glib-i18n-lib.h rename to src/libnm-glib-aux/nm-default-glib-i18n-lib.h index 9393d1921e..4b04da9e46 100644 --- a/shared/nm-glib-aux/nm-default-glib-i18n-lib.h +++ b/src/libnm-glib-aux/nm-default-glib-i18n-lib.h @@ -10,7 +10,7 @@ #define _NETWORKMANAGER_COMPILATION_GLIB_I18N_LIB -#include "nm-glib-aux/nm-default-glib.h" +#include "libnm-glib-aux/nm-default-glib.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION \ diff --git a/shared/nm-glib-aux/nm-default-glib-i18n-prog.h b/src/libnm-glib-aux/nm-default-glib-i18n-prog.h similarity index 93% rename from shared/nm-glib-aux/nm-default-glib-i18n-prog.h rename to src/libnm-glib-aux/nm-default-glib-i18n-prog.h index 0abe807b9d..ebd31f966e 100644 --- a/shared/nm-glib-aux/nm-default-glib-i18n-prog.h +++ b/src/libnm-glib-aux/nm-default-glib-i18n-prog.h @@ -10,7 +10,7 @@ #define _NETWORKMANAGER_COMPILATION_GLIB_I18N_PROG -#include "nm-glib-aux/nm-default-glib.h" +#include "libnm-glib-aux/nm-default-glib.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION \ diff --git a/shared/nm-glib-aux/nm-default-glib.h b/src/libnm-glib-aux/nm-default-glib.h similarity index 89% rename from shared/nm-glib-aux/nm-default-glib.h rename to src/libnm-glib-aux/nm-default-glib.h index 34b23f7761..e5ccd47fd3 100644 --- a/shared/nm-glib-aux/nm-default-glib.h +++ b/src/libnm-glib-aux/nm-default-glib.h @@ -8,7 +8,7 @@ /*****************************************************************************/ -#include "nm-std-aux/nm-default-std.h" +#include "libnm-std-aux/nm-default-std.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_WITH_GLIB @@ -63,12 +63,12 @@ #include "nm-gassert-patch.h" -#include "nm-std-aux/nm-std-aux.h" -#include "nm-std-aux/nm-std-utils.h" -#include "nm-glib-aux/nm-macros-internal.h" -#include "nm-glib-aux/nm-shared-utils.h" -#include "nm-glib-aux/nm-errno.h" -#include "nm-glib-aux/nm-hash-utils.h" +#include "libnm-std-aux/nm-std-aux.h" +#include "libnm-std-aux/nm-std-utils.h" +#include "libnm-glib-aux/nm-macros-internal.h" +#include "libnm-glib-aux/nm-shared-utils.h" +#include "libnm-glib-aux/nm-errno.h" +#include "libnm-glib-aux/nm-hash-utils.h" /*****************************************************************************/ diff --git a/shared/nm-glib-aux/nm-enum-utils.c b/src/libnm-glib-aux/nm-enum-utils.c similarity index 99% rename from shared/nm-glib-aux/nm-enum-utils.c rename to src/libnm-glib-aux/nm-enum-utils.c index b06f2bb2fb..f97cdfcbb5 100644 --- a/shared/nm-glib-aux/nm-enum-utils.c +++ b/src/libnm-glib-aux/nm-enum-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-enum-utils.h" #include "nm-str-buf.h" diff --git a/shared/nm-glib-aux/nm-enum-utils.h b/src/libnm-glib-aux/nm-enum-utils.h similarity index 100% rename from shared/nm-glib-aux/nm-enum-utils.h rename to src/libnm-glib-aux/nm-enum-utils.h diff --git a/shared/nm-glib-aux/nm-errno.c b/src/libnm-glib-aux/nm-errno.c similarity index 99% rename from shared/nm-glib-aux/nm-errno.c rename to src/libnm-glib-aux/nm-errno.c index 668606cacd..283173e328 100644 --- a/shared/nm-glib-aux/nm-errno.c +++ b/src/libnm-glib-aux/nm-errno.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-errno.h" diff --git a/shared/nm-glib-aux/nm-errno.h b/src/libnm-glib-aux/nm-errno.h similarity index 100% rename from shared/nm-glib-aux/nm-errno.h rename to src/libnm-glib-aux/nm-errno.h diff --git a/shared/nm-glib-aux/nm-gassert-patch.h b/src/libnm-glib-aux/nm-gassert-patch.h similarity index 100% rename from shared/nm-glib-aux/nm-gassert-patch.h rename to src/libnm-glib-aux/nm-gassert-patch.h diff --git a/shared/nm-glib-aux/nm-glib.h b/src/libnm-glib-aux/nm-glib.h similarity index 100% rename from shared/nm-glib-aux/nm-glib.h rename to src/libnm-glib-aux/nm-glib.h diff --git a/shared/nm-glib-aux/nm-hash-utils.c b/src/libnm-glib-aux/nm-hash-utils.c similarity index 99% rename from shared/nm-glib-aux/nm-hash-utils.c rename to src/libnm-glib-aux/nm-hash-utils.c index 29349b1d0d..9e168dccc7 100644 --- a/shared/nm-glib-aux/nm-hash-utils.c +++ b/src/libnm-glib-aux/nm-hash-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-hash-utils.h" diff --git a/shared/nm-glib-aux/nm-hash-utils.h b/src/libnm-glib-aux/nm-hash-utils.h similarity index 100% rename from shared/nm-glib-aux/nm-hash-utils.h rename to src/libnm-glib-aux/nm-hash-utils.h diff --git a/shared/nm-glib-aux/nm-io-utils.c b/src/libnm-glib-aux/nm-io-utils.c similarity index 99% rename from shared/nm-glib-aux/nm-io-utils.c rename to src/libnm-glib-aux/nm-io-utils.c index 429591ad22..e02049af1a 100644 --- a/shared/nm-glib-aux/nm-io-utils.c +++ b/src/libnm-glib-aux/nm-io-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-io-utils.h" diff --git a/shared/nm-glib-aux/nm-io-utils.h b/src/libnm-glib-aux/nm-io-utils.h similarity index 100% rename from shared/nm-glib-aux/nm-io-utils.h rename to src/libnm-glib-aux/nm-io-utils.h diff --git a/shared/nm-glib-aux/nm-jansson.h b/src/libnm-glib-aux/nm-jansson.h similarity index 100% rename from shared/nm-glib-aux/nm-jansson.h rename to src/libnm-glib-aux/nm-jansson.h diff --git a/shared/nm-glib-aux/nm-json-aux.c b/src/libnm-glib-aux/nm-json-aux.c similarity index 99% rename from shared/nm-glib-aux/nm-json-aux.c rename to src/libnm-glib-aux/nm-json-aux.c index 97ee606fe0..dc67d6d593 100644 --- a/shared/nm-glib-aux/nm-json-aux.c +++ b/src/libnm-glib-aux/nm-json-aux.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 - 2019 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-json-aux.h" diff --git a/shared/nm-glib-aux/nm-json-aux.h b/src/libnm-glib-aux/nm-json-aux.h similarity index 100% rename from shared/nm-glib-aux/nm-json-aux.h rename to src/libnm-glib-aux/nm-json-aux.h diff --git a/shared/nm-glib-aux/nm-keyfile-aux.c b/src/libnm-glib-aux/nm-keyfile-aux.c similarity index 99% rename from shared/nm-glib-aux/nm-keyfile-aux.c rename to src/libnm-glib-aux/nm-keyfile-aux.c index b59627128f..75abe53848 100644 --- a/shared/nm-glib-aux/nm-keyfile-aux.c +++ b/src/libnm-glib-aux/nm-keyfile-aux.c @@ -3,7 +3,7 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-keyfile-aux.h" diff --git a/shared/nm-glib-aux/nm-keyfile-aux.h b/src/libnm-glib-aux/nm-keyfile-aux.h similarity index 100% rename from shared/nm-glib-aux/nm-keyfile-aux.h rename to src/libnm-glib-aux/nm-keyfile-aux.h diff --git a/shared/nm-glib-aux/nm-logging-base.c b/src/libnm-glib-aux/nm-logging-base.c similarity index 96% rename from shared/nm-glib-aux/nm-logging-base.c rename to src/libnm-glib-aux/nm-logging-base.c index 66b591b21e..24d97adc8d 100644 --- a/shared/nm-glib-aux/nm-logging-base.c +++ b/src/libnm-glib-aux/nm-logging-base.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-logging-base.h" diff --git a/shared/nm-glib-aux/nm-logging-base.h b/src/libnm-glib-aux/nm-logging-base.h similarity index 100% rename from shared/nm-glib-aux/nm-logging-base.h rename to src/libnm-glib-aux/nm-logging-base.h diff --git a/shared/nm-glib-aux/nm-logging-fwd.h b/src/libnm-glib-aux/nm-logging-fwd.h similarity index 100% rename from shared/nm-glib-aux/nm-logging-fwd.h rename to src/libnm-glib-aux/nm-logging-fwd.h diff --git a/shared/nm-utils/nm-vpn-plugin-macros.h b/src/libnm-glib-aux/nm-logging-syslog.h similarity index 74% rename from shared/nm-utils/nm-vpn-plugin-macros.h rename to src/libnm-glib-aux/nm-logging-syslog.h index 4ca2242732..1d23086a95 100644 --- a/shared/nm-utils/nm-vpn-plugin-macros.h +++ b/src/libnm-glib-aux/nm-logging-syslog.h @@ -3,8 +3,8 @@ * Copyright (C) 2016 Red Hat, Inc. */ -#ifndef __NM_VPN_PLUGIN_MACROS_H__ -#define __NM_VPN_PLUGIN_MACROS_H__ +#ifndef __NM_LOGGING_SYSLOG_H__ +#define __NM_LOGGING_SYSLOG_H__ #include @@ -57,20 +57,4 @@ nm_utils_syslog_to_str(int syslog_level) /*****************************************************************************/ -/* possibly missing defines from newer libnm API. */ - -#ifndef NM_VPN_PLUGIN_CONFIG_PROXY_PAC - #define NM_VPN_PLUGIN_CONFIG_PROXY_PAC "pac" -#endif - -#ifndef NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES - #define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes" -#endif - -#ifndef NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES - #define NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES "preserve-routes" -#endif - -/*****************************************************************************/ - -#endif /* __NM_VPN_PLUGIN_MACROS_H__ */ +#endif /* __NM_LOGGING_SYSLOG_H__ */ diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/src/libnm-glib-aux/nm-macros-internal.h similarity index 100% rename from shared/nm-glib-aux/nm-macros-internal.h rename to src/libnm-glib-aux/nm-macros-internal.h diff --git a/shared/nm-glib-aux/nm-obj.h b/src/libnm-glib-aux/nm-obj.h similarity index 100% rename from shared/nm-glib-aux/nm-obj.h rename to src/libnm-glib-aux/nm-obj.h diff --git a/shared/nm-glib-aux/nm-random-utils.c b/src/libnm-glib-aux/nm-random-utils.c similarity index 98% rename from shared/nm-glib-aux/nm-random-utils.c rename to src/libnm-glib-aux/nm-random-utils.c index c95d368dd3..56b99d5e3c 100644 --- a/shared/nm-glib-aux/nm-random-utils.c +++ b/src/libnm-glib-aux/nm-random-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-random-utils.h" diff --git a/shared/nm-glib-aux/nm-random-utils.h b/src/libnm-glib-aux/nm-random-utils.h similarity index 100% rename from shared/nm-glib-aux/nm-random-utils.h rename to src/libnm-glib-aux/nm-random-utils.h diff --git a/shared/nm-glib-aux/nm-ref-string.c b/src/libnm-glib-aux/nm-ref-string.c similarity index 99% rename from shared/nm-glib-aux/nm-ref-string.c rename to src/libnm-glib-aux/nm-ref-string.c index 1084c47f8a..0804a05782 100644 --- a/shared/nm-glib-aux/nm-ref-string.c +++ b/src/libnm-glib-aux/nm-ref-string.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-ref-string.h" diff --git a/shared/nm-glib-aux/nm-ref-string.h b/src/libnm-glib-aux/nm-ref-string.h similarity index 100% rename from shared/nm-glib-aux/nm-ref-string.h rename to src/libnm-glib-aux/nm-ref-string.h diff --git a/shared/nm-glib-aux/nm-secret-utils.c b/src/libnm-glib-aux/nm-secret-utils.c similarity index 98% rename from shared/nm-glib-aux/nm-secret-utils.c rename to src/libnm-glib-aux/nm-secret-utils.c index 8188b503a3..c764b6e575 100644 --- a/shared/nm-glib-aux/nm-secret-utils.c +++ b/src/libnm-glib-aux/nm-secret-utils.c @@ -4,7 +4,7 @@ * Copyright (C) 2015 - 2019 Jason A. Donenfeld . All Rights Reserved. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-secret-utils.h" diff --git a/shared/nm-glib-aux/nm-secret-utils.h b/src/libnm-glib-aux/nm-secret-utils.h similarity index 100% rename from shared/nm-glib-aux/nm-secret-utils.h rename to src/libnm-glib-aux/nm-secret-utils.h diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c similarity index 99% rename from shared/nm-glib-aux/nm-shared-utils.c rename to src/libnm-glib-aux/nm-shared-utils.c index 3215a33b5b..9477cc3e74 100644 --- a/shared/nm-glib-aux/nm-shared-utils.c +++ b/src/libnm-glib-aux/nm-shared-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-shared-utils.h" diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h similarity index 100% rename from shared/nm-glib-aux/nm-shared-utils.h rename to src/libnm-glib-aux/nm-shared-utils.h diff --git a/shared/nm-glib-aux/nm-str-buf.h b/src/libnm-glib-aux/nm-str-buf.h similarity index 100% rename from shared/nm-glib-aux/nm-str-buf.h rename to src/libnm-glib-aux/nm-str-buf.h diff --git a/shared/nm-utils/nm-test-utils.h b/src/libnm-glib-aux/nm-test-utils.h similarity index 100% rename from shared/nm-utils/nm-test-utils.h rename to src/libnm-glib-aux/nm-test-utils.h diff --git a/shared/nm-glib-aux/nm-time-utils.c b/src/libnm-glib-aux/nm-time-utils.c similarity index 99% rename from shared/nm-glib-aux/nm-time-utils.c rename to src/libnm-glib-aux/nm-time-utils.c index df98176a12..f30e6a1994 100644 --- a/shared/nm-glib-aux/nm-time-utils.c +++ b/src/libnm-glib-aux/nm-time-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-time-utils.h" diff --git a/shared/nm-glib-aux/nm-time-utils.h b/src/libnm-glib-aux/nm-time-utils.h similarity index 100% rename from shared/nm-glib-aux/nm-time-utils.h rename to src/libnm-glib-aux/nm-time-utils.h diff --git a/shared/nm-glib-aux/nm-value-type.h b/src/libnm-glib-aux/nm-value-type.h similarity index 100% rename from shared/nm-glib-aux/nm-value-type.h rename to src/libnm-glib-aux/nm-value-type.h diff --git a/shared/nm-glib-aux/tests/meson.build b/src/libnm-glib-aux/tests/meson.build similarity index 88% rename from shared/nm-glib-aux/tests/meson.build rename to src/libnm-glib-aux/tests/meson.build index 1ee3380e31..38dfff0c6c 100644 --- a/shared/nm-glib-aux/tests/meson.build +++ b/src/libnm-glib-aux/tests/meson.build @@ -4,7 +4,7 @@ exe = executable( 'test-shared-general', 'test-shared-general.c', dependencies: libnm_glib_aux_dep_link, - link_with: libnm_systemd_logging_stub, + link_with: libnm_log_null, ) test( @@ -23,7 +23,7 @@ if jansson_dep.found() jansson_dep, dl_dep, ], - link_with: libnm_systemd_logging_stub, + link_with: libnm_log_null, ) test( diff --git a/shared/nm-glib-aux/tests/test-json-aux.c b/src/libnm-glib-aux/tests/test-json-aux.c similarity index 98% rename from shared/nm-glib-aux/tests/test-json-aux.c rename to src/libnm-glib-aux/tests/test-json-aux.c index b07d673fa6..5f33f4fe39 100644 --- a/shared/nm-glib-aux/tests/test-json-aux.c +++ b/src/libnm-glib-aux/tests/test-json-aux.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "nm-glib-aux/nm-default-glib-i18n-prog.h" +#include "libnm-glib-aux/nm-default-glib-i18n-prog.h" #include -#include "nm-glib-aux/nm-json-aux.h" +#include "libnm-glib-aux/nm-json-aux.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ diff --git a/shared/nm-glib-aux/tests/test-shared-general.c b/src/libnm-glib-aux/tests/test-shared-general.c similarity index 99% rename from shared/nm-glib-aux/tests/test-shared-general.c rename to src/libnm-glib-aux/tests/test-shared-general.c index f42c6fb108..efb0937b54 100644 --- a/shared/nm-glib-aux/tests/test-shared-general.c +++ b/src/libnm-glib-aux/tests/test-shared-general.c @@ -3,15 +3,15 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-prog.h" +#include "libnm-glib-aux/nm-default-glib-i18n-prog.h" -#include "nm-std-aux/unaligned.h" -#include "nm-glib-aux/nm-random-utils.h" -#include "nm-glib-aux/nm-str-buf.h" -#include "nm-glib-aux/nm-time-utils.h" -#include "nm-glib-aux/nm-ref-string.h" +#include "libnm-std-aux/unaligned.h" +#include "libnm-glib-aux/nm-random-utils.h" +#include "libnm-glib-aux/nm-str-buf.h" +#include "libnm-glib-aux/nm-time-utils.h" +#include "libnm-glib-aux/nm-ref-string.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ diff --git a/src/libnm-log-core/meson.build b/src/libnm-log-core/meson.build new file mode 100644 index 0000000000..3eb9145703 --- /dev/null +++ b/src/libnm-log-core/meson.build @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_log_core = static_library( + 'nm-log-core', + sources: 'nm-logging.c', + include_directories: [ + src_inc, + top_inc, + ], + dependencies: [ + libsystemd_dep, + glib_dep, + ], +) + +libnm_log_core_dep = declare_dependency( + dependencies: [ + libnm_glib_aux_dep_link, + ], + link_with: libnm_log_core, +) diff --git a/shared/nm-log-core/nm-logging.c b/src/libnm-log-core/nm-logging.c similarity index 99% rename from shared/nm-log-core/nm-logging.c rename to src/libnm-log-core/nm-logging.c index cf3c3a8657..7a23344b94 100644 --- a/shared/nm-log-core/nm-logging.c +++ b/src/libnm-log-core/nm-logging.c @@ -4,7 +4,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-logging.h" @@ -22,8 +22,8 @@ #include #endif -#include "nm-glib-aux/nm-logging-base.h" -#include "nm-glib-aux/nm-time-utils.h" +#include "libnm-glib-aux/nm-logging-base.h" +#include "libnm-glib-aux/nm-time-utils.h" /*****************************************************************************/ diff --git a/shared/nm-log-core/nm-logging.h b/src/libnm-log-core/nm-logging.h similarity index 99% rename from shared/nm-log-core/nm-logging.h rename to src/libnm-log-core/nm-logging.h index d3143d3973..574c225c2e 100644 --- a/shared/nm-log-core/nm-logging.h +++ b/src/libnm-log-core/nm-logging.h @@ -11,7 +11,7 @@ #error nm-test-utils.h must be included as last header #endif -#include "nm-glib-aux/nm-logging-fwd.h" +#include "libnm-glib-aux/nm-logging-fwd.h" #define NM_LOG_CONFIG_BACKEND_DEBUG "debug" #define NM_LOG_CONFIG_BACKEND_SYSLOG "syslog" diff --git a/src/libnm-log-null/meson.build b/src/libnm-log-null/meson.build new file mode 100644 index 0000000000..cd35304873 --- /dev/null +++ b/src/libnm-log-null/meson.build @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_log_null = static_library( + 'nm-log-null', + sources: 'nm-logging-null.c', + include_directories: [ + src_inc, + top_inc, + ], + dependencies: glib_dep, +) diff --git a/shared/systemd/nm-logging-stub.c b/src/libnm-log-null/nm-logging-null.c similarity index 90% rename from shared/systemd/nm-logging-stub.c rename to src/libnm-log-null/nm-logging-null.c index 8db90cd9eb..a454c5bc6a 100644 --- a/shared/systemd/nm-logging-stub.c +++ b/src/libnm-log-null/nm-logging-null.c @@ -3,9 +3,9 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "shared/systemd/nm-default-systemd-shared.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" -#include "nm-glib-aux/nm-logging-fwd.h" +#include "libnm-glib-aux/nm-logging-fwd.h" /*****************************************************************************/ diff --git a/src/libnm-platform/meson.build b/src/libnm-platform/meson.build new file mode 100644 index 0000000000..3300e8f674 --- /dev/null +++ b/src/libnm-platform/meson.build @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_platform = static_library( + 'nm-platform', + include_directories: [ + src_inc, + top_inc, + ], + sources: [ + 'nm-netlink.c', + 'nm-platform-utils.c', + 'nmp-netns.c', + ], + dependencies: [ + glib_dep, + ], +) + +libnm_platform_dep = declare_dependency( + include_directories: [ + src_inc, + ], + dependencies: [ + libnm_glib_aux_dep_link, + ], + link_with: libnm_platform, +) diff --git a/shared/nm-platform/nm-netlink.c b/src/libnm-platform/nm-netlink.c similarity index 99% rename from shared/nm-platform/nm-netlink.c rename to src/libnm-platform/nm-netlink.c index 7a6d7e045b..95010c0257 100644 --- a/shared/nm-platform/nm-netlink.c +++ b/src/libnm-platform/nm-netlink.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-netlink.h" diff --git a/shared/nm-platform/nm-netlink.h b/src/libnm-platform/nm-netlink.h similarity index 99% rename from shared/nm-platform/nm-netlink.h rename to src/libnm-platform/nm-netlink.h index 8de42531d3..ab355f7495 100644 --- a/shared/nm-platform/nm-netlink.h +++ b/src/libnm-platform/nm-netlink.h @@ -10,7 +10,7 @@ #include #include -#include "nm-std-aux/unaligned.h" +#include "libnm-std-aux/unaligned.h" /*****************************************************************************/ diff --git a/shared/nm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c similarity index 99% rename from shared/nm-platform/nm-platform-utils.c rename to src/libnm-platform/nm-platform-utils.c index c1c5b1a356..7c101213d9 100644 --- a/shared/nm-platform/nm-platform-utils.c +++ b/src/libnm-platform/nm-platform-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-platform-utils.h" @@ -18,8 +18,8 @@ #include #include -#include "nm-base/nm-ethtool-base.h" -#include "nm-log-core/nm-logging.h" +#include "libnm-base/nm-ethtool-base.h" +#include "libnm-log-core/nm-logging.h" /*****************************************************************************/ diff --git a/shared/nm-platform/nm-platform-utils.h b/src/libnm-platform/nm-platform-utils.h similarity index 97% rename from shared/nm-platform/nm-platform-utils.h rename to src/libnm-platform/nm-platform-utils.h index d74723eb9f..8d9eaa38e0 100644 --- a/shared/nm-platform/nm-platform-utils.h +++ b/src/libnm-platform/nm-platform-utils.h @@ -6,8 +6,8 @@ #ifndef __NM_PLATFORM_UTILS_H__ #define __NM_PLATFORM_UTILS_H__ -#include "nm-base/nm-base.h" -#include "nm-platform/nmp-base.h" +#include "libnm-base/nm-base.h" +#include "libnm-platform/nmp-base.h" /*****************************************************************************/ diff --git a/shared/nm-platform/nmp-base.h b/src/libnm-platform/nmp-base.h similarity index 98% rename from shared/nm-platform/nmp-base.h rename to src/libnm-platform/nmp-base.h index 210c26d6bb..e5f134185c 100644 --- a/shared/nm-platform/nmp-base.h +++ b/src/libnm-platform/nmp-base.h @@ -3,7 +3,7 @@ #ifndef __NMP_FWD_H__ #define __NMP_FWD_H__ -#include "nm-base/nm-base.h" +#include "libnm-base/nm-base.h" /*****************************************************************************/ diff --git a/shared/nm-platform/nmp-netns.c b/src/libnm-platform/nmp-netns.c similarity index 99% rename from shared/nm-platform/nmp-netns.c rename to src/libnm-platform/nmp-netns.c index f97339a756..aea5b3b6dc 100644 --- a/shared/nm-platform/nmp-netns.c +++ b/src/libnm-platform/nmp-netns.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nmp-netns.h" @@ -13,7 +13,7 @@ #include #include -#include "nm-log-core/nm-logging.h" +#include "libnm-log-core/nm-logging.h" /*****************************************************************************/ diff --git a/shared/nm-platform/nmp-netns.h b/src/libnm-platform/nmp-netns.h similarity index 100% rename from shared/nm-platform/nmp-netns.h rename to src/libnm-platform/nmp-netns.h diff --git a/shared/nm-platform/tests/meson.build b/src/libnm-platform/tests/meson.build similarity index 100% rename from shared/nm-platform/tests/meson.build rename to src/libnm-platform/tests/meson.build diff --git a/shared/nm-platform/tests/test-nm-platform.c b/src/libnm-platform/tests/test-nm-platform.c similarity index 94% rename from shared/nm-platform/tests/test-nm-platform.c rename to src/libnm-platform/tests/test-nm-platform.c index a3e9ff13ba..5b1b8e87a1 100644 --- a/shared/nm-platform/tests/test-nm-platform.c +++ b/src/libnm-platform/tests/test-nm-platform.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "nm-glib-aux/nm-default-glib-i18n-prog.h" +#include "libnm-glib-aux/nm-default-glib-i18n-prog.h" -#include "nm-log-core/nm-logging.h" -#include "nm-platform/nm-netlink.h" -#include "nm-platform/nmp-netns.h" +#include "libnm-log-core/nm-logging.h" +#include "libnm-platform/nm-netlink.h" +#include "libnm-platform/nmp-netns.h" -#include "nm-utils/nm-test-utils.h" +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ diff --git a/shared/nm-std-aux/c-list-util.c b/src/libnm-std-aux/c-list-util.c similarity index 100% rename from shared/nm-std-aux/c-list-util.c rename to src/libnm-std-aux/c-list-util.c diff --git a/shared/nm-std-aux/c-list-util.h b/src/libnm-std-aux/c-list-util.h similarity index 100% rename from shared/nm-std-aux/c-list-util.h rename to src/libnm-std-aux/c-list-util.h diff --git a/src/libnm-std-aux/meson.build b/src/libnm-std-aux/meson.build new file mode 100644 index 0000000000..d7b24528c5 --- /dev/null +++ b/src/libnm-std-aux/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_std_aux = static_library( + 'nm-std-aux', + sources: [ + 'c-list-util.c', + 'nm-std-utils.c', + ], + include_directories: [ + src_inc, + top_inc, + ], +) diff --git a/shared/nm-std-aux/nm-dbus-compat.h b/src/libnm-std-aux/nm-dbus-compat.h similarity index 100% rename from shared/nm-std-aux/nm-dbus-compat.h rename to src/libnm-std-aux/nm-dbus-compat.h diff --git a/shared/nm-std-aux/nm-default-std.h b/src/libnm-std-aux/nm-default-std.h similarity index 100% rename from shared/nm-std-aux/nm-default-std.h rename to src/libnm-std-aux/nm-default-std.h diff --git a/shared/nm-std-aux/nm-networkmanager-compilation.h b/src/libnm-std-aux/nm-networkmanager-compilation.h similarity index 100% rename from shared/nm-std-aux/nm-networkmanager-compilation.h rename to src/libnm-std-aux/nm-networkmanager-compilation.h diff --git a/shared/nm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h similarity index 100% rename from shared/nm-std-aux/nm-std-aux.h rename to src/libnm-std-aux/nm-std-aux.h diff --git a/shared/nm-std-aux/nm-std-utils.c b/src/libnm-std-aux/nm-std-utils.c similarity index 100% rename from shared/nm-std-aux/nm-std-utils.c rename to src/libnm-std-aux/nm-std-utils.c diff --git a/shared/nm-std-aux/nm-std-utils.h b/src/libnm-std-aux/nm-std-utils.h similarity index 100% rename from shared/nm-std-aux/nm-std-utils.h rename to src/libnm-std-aux/nm-std-utils.h diff --git a/shared/nm-std-aux/unaligned.h b/src/libnm-std-aux/unaligned.h similarity index 100% rename from shared/nm-std-aux/unaligned.h rename to src/libnm-std-aux/unaligned.h diff --git a/src/libnm-systemd-shared/meson.build b/src/libnm-systemd-shared/meson.build new file mode 100644 index 0000000000..68512c62c1 --- /dev/null +++ b/src/libnm-systemd-shared/meson.build @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_systemd_shared = static_library( + 'nm-systemd-shared', + sources: files( + 'nm-sd-utils-shared.c', + 'src/basic/alloc-util.c', + 'src/basic/env-file.c', + 'src/basic/env-util.c', + 'src/basic/escape.c', + 'src/basic/ether-addr-util.c', + 'src/basic/extract-word.c', + 'src/basic/fd-util.c', + 'src/basic/fileio.c', + 'src/basic/format-util.c', + 'src/basic/fs-util.c', + 'src/basic/hash-funcs.c', + 'src/basic/hashmap.c', + 'src/basic/hexdecoct.c', + 'src/basic/hostname-util.c', + 'src/basic/in-addr-util.c', + 'src/basic/io-util.c', + 'src/basic/memory-util.c', + 'src/basic/mempool.c', + 'src/basic/parse-util.c', + 'src/basic/path-util.c', + 'src/basic/prioq.c', + 'src/basic/process-util.c', + 'src/basic/random-util.c', + 'src/basic/ratelimit.c', + 'src/basic/signal-util.c', + 'src/basic/socket-util.c', + 'src/basic/stat-util.c', + 'src/basic/string-table.c', + 'src/basic/string-util.c', + 'src/basic/strv.c', + 'src/basic/strxcpyx.c', + 'src/basic/time-util.c', + 'src/basic/tmpfile-util.c', + 'src/basic/utf8.c', + 'src/basic/util.c', + 'src/shared/dns-domain.c', + 'src/shared/web-util.c', + ), + include_directories: [ + include_directories( + 'sd-adapt-shared', + 'src/basic', + 'src/shared', + ), + top_inc, + src_inc, + ], + dependencies: glib_dep, +) + +libnm_systemd_shared_dep = declare_dependency( + include_directories: include_directories( + 'sd-adapt-shared', + 'src/basic', + 'src/shared', + ), + dependencies: glib_dep, + link_with: libnm_systemd_shared, +) diff --git a/shared/systemd/nm-default-systemd-shared.h b/src/libnm-systemd-shared/nm-default-systemd-shared.h similarity index 91% rename from shared/systemd/nm-default-systemd-shared.h rename to src/libnm-systemd-shared/nm-default-systemd-shared.h index bc0e6c4ca0..8b312f9aa7 100644 --- a/shared/systemd/nm-default-systemd-shared.h +++ b/src/libnm-systemd-shared/nm-default-systemd-shared.h @@ -8,7 +8,7 @@ /*****************************************************************************/ -#include "nm-glib-aux/nm-default-glib.h" +#include "libnm-glib-aux/nm-default-glib.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED diff --git a/shared/systemd/nm-sd-utils-shared.c b/src/libnm-systemd-shared/nm-sd-utils-shared.c similarity index 98% rename from shared/systemd/nm-sd-utils-shared.c rename to src/libnm-systemd-shared/nm-sd-utils-shared.c index f0504aa937..8c8934b1a4 100644 --- a/shared/systemd/nm-sd-utils-shared.c +++ b/src/libnm-systemd-shared/nm-sd-utils-shared.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "shared/systemd/nm-default-systemd-shared.h" +#include "libnm-systemd-shared/nm-default-systemd-shared.h" #include "nm-sd-utils-shared.h" diff --git a/shared/systemd/nm-sd-utils-shared.h b/src/libnm-systemd-shared/nm-sd-utils-shared.h similarity index 100% rename from shared/systemd/nm-sd-utils-shared.h rename to src/libnm-systemd-shared/nm-sd-utils-shared.h diff --git a/shared/systemd/sd-adapt-shared/architecture.h b/src/libnm-systemd-shared/sd-adapt-shared/architecture.h similarity index 100% rename from shared/systemd/sd-adapt-shared/architecture.h rename to src/libnm-systemd-shared/sd-adapt-shared/architecture.h diff --git a/shared/systemd/sd-adapt-shared/arphrd-list.h b/src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h similarity index 100% rename from shared/systemd/sd-adapt-shared/arphrd-list.h rename to src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h diff --git a/shared/systemd/sd-adapt-shared/blockdev-util.h b/src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/blockdev-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h diff --git a/shared/systemd/sd-adapt-shared/build.h b/src/libnm-systemd-shared/sd-adapt-shared/build.h similarity index 100% rename from shared/systemd/sd-adapt-shared/build.h rename to src/libnm-systemd-shared/sd-adapt-shared/build.h diff --git a/shared/systemd/sd-adapt-shared/copy.h b/src/libnm-systemd-shared/sd-adapt-shared/copy.h similarity index 100% rename from shared/systemd/sd-adapt-shared/copy.h rename to src/libnm-systemd-shared/sd-adapt-shared/copy.h diff --git a/shared/systemd/sd-adapt-shared/def.h b/src/libnm-systemd-shared/sd-adapt-shared/def.h similarity index 100% rename from shared/systemd/sd-adapt-shared/def.h rename to src/libnm-systemd-shared/sd-adapt-shared/def.h diff --git a/shared/systemd/sd-adapt-shared/dhcp-server-internal.h b/src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h similarity index 100% rename from shared/systemd/sd-adapt-shared/dhcp-server-internal.h rename to src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h diff --git a/shared/systemd/sd-adapt-shared/dirent-util.h b/src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/dirent-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h diff --git a/shared/systemd/sd-adapt-shared/errno-list.h b/src/libnm-systemd-shared/sd-adapt-shared/errno-list.h similarity index 100% rename from shared/systemd/sd-adapt-shared/errno-list.h rename to src/libnm-systemd-shared/sd-adapt-shared/errno-list.h diff --git a/shared/systemd/sd-adapt-shared/glob-util.h b/src/libnm-systemd-shared/sd-adapt-shared/glob-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/glob-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/glob-util.h diff --git a/shared/systemd/sd-adapt-shared/gunicode.h b/src/libnm-systemd-shared/sd-adapt-shared/gunicode.h similarity index 100% rename from shared/systemd/sd-adapt-shared/gunicode.h rename to src/libnm-systemd-shared/sd-adapt-shared/gunicode.h diff --git a/shared/systemd/sd-adapt-shared/idn-util.h b/src/libnm-systemd-shared/sd-adapt-shared/idn-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/idn-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/idn-util.h diff --git a/shared/systemd/sd-adapt-shared/ioprio.h b/src/libnm-systemd-shared/sd-adapt-shared/ioprio.h similarity index 100% rename from shared/systemd/sd-adapt-shared/ioprio.h rename to src/libnm-systemd-shared/sd-adapt-shared/ioprio.h diff --git a/shared/systemd/sd-adapt-shared/locale-util.h b/src/libnm-systemd-shared/sd-adapt-shared/locale-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/locale-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/locale-util.h diff --git a/shared/systemd/sd-adapt-shared/memfd-util.h b/src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/memfd-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h diff --git a/shared/systemd/sd-adapt-shared/missing_fs.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_fs.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h diff --git a/shared/systemd/sd-adapt-shared/missing_keyctl.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_keyctl.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h diff --git a/shared/systemd/sd-adapt-shared/missing_magic.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_magic.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h diff --git a/shared/systemd/sd-adapt-shared/missing_network.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_network.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_network.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_network.h diff --git a/shared/systemd/sd-adapt-shared/missing_sched.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_sched.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h diff --git a/shared/systemd/sd-adapt-shared/missing_timerfd.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_timerfd.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h diff --git a/shared/systemd/sd-adapt-shared/mkdir.h b/src/libnm-systemd-shared/sd-adapt-shared/mkdir.h similarity index 100% rename from shared/systemd/sd-adapt-shared/mkdir.h rename to src/libnm-systemd-shared/sd-adapt-shared/mkdir.h diff --git a/shared/systemd/sd-adapt-shared/namespace-util.h b/src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/namespace-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h similarity index 98% rename from shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h rename to src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h index b094ce40b6..2fc8b83176 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h @@ -6,9 +6,9 @@ #ifndef __NM_SD_ADAPT_SHARED_H__ #define __NM_SD_ADAPT_SHARED_H__ -#include "shared/systemd/nm-default-systemd-shared.h" +#include "libnm-systemd-shared/nm-default-systemd-shared.h" -#include "nm-glib-aux/nm-logging-fwd.h" +#include "libnm-glib-aux/nm-logging-fwd.h" /*****************************************************************************/ diff --git a/shared/systemd/sd-adapt-shared/nulstr-util.h b/src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/nulstr-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h diff --git a/shared/systemd/sd-adapt-shared/raw-clone.h b/src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h similarity index 100% rename from shared/systemd/sd-adapt-shared/raw-clone.h rename to src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h diff --git a/shared/systemd/sd-adapt-shared/rlimit-util.h b/src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/rlimit-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h diff --git a/shared/systemd/sd-adapt-shared/terminal-util.h b/src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/terminal-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h diff --git a/src/libnm-systemd-shared/sd-adapt-shared/unaligned.h b/src/libnm-systemd-shared/sd-adapt-shared/unaligned.h new file mode 100644 index 0000000000..583a3688bd --- /dev/null +++ b/src/libnm-systemd-shared/sd-adapt-shared/unaligned.h @@ -0,0 +1,3 @@ +#pragma once + +#include "libnm-std-aux/unaligned.h" diff --git a/shared/systemd/sd-adapt-shared/user-util.h b/src/libnm-systemd-shared/sd-adapt-shared/user-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/user-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/user-util.h diff --git a/shared/systemd/sd-adapt-shared/virt.h b/src/libnm-systemd-shared/sd-adapt-shared/virt.h similarity index 100% rename from shared/systemd/sd-adapt-shared/virt.h rename to src/libnm-systemd-shared/sd-adapt-shared/virt.h diff --git a/shared/systemd/src/basic/alloc-util.c b/src/libnm-systemd-shared/src/basic/alloc-util.c similarity index 100% rename from shared/systemd/src/basic/alloc-util.c rename to src/libnm-systemd-shared/src/basic/alloc-util.c diff --git a/shared/systemd/src/basic/alloc-util.h b/src/libnm-systemd-shared/src/basic/alloc-util.h similarity index 100% rename from shared/systemd/src/basic/alloc-util.h rename to src/libnm-systemd-shared/src/basic/alloc-util.h diff --git a/shared/systemd/src/basic/async.h b/src/libnm-systemd-shared/src/basic/async.h similarity index 100% rename from shared/systemd/src/basic/async.h rename to src/libnm-systemd-shared/src/basic/async.h diff --git a/shared/systemd/src/basic/cgroup-util.h b/src/libnm-systemd-shared/src/basic/cgroup-util.h similarity index 100% rename from shared/systemd/src/basic/cgroup-util.h rename to src/libnm-systemd-shared/src/basic/cgroup-util.h diff --git a/shared/systemd/src/basic/env-file.c b/src/libnm-systemd-shared/src/basic/env-file.c similarity index 100% rename from shared/systemd/src/basic/env-file.c rename to src/libnm-systemd-shared/src/basic/env-file.c diff --git a/shared/systemd/src/basic/env-file.h b/src/libnm-systemd-shared/src/basic/env-file.h similarity index 100% rename from shared/systemd/src/basic/env-file.h rename to src/libnm-systemd-shared/src/basic/env-file.h diff --git a/shared/systemd/src/basic/env-util.c b/src/libnm-systemd-shared/src/basic/env-util.c similarity index 100% rename from shared/systemd/src/basic/env-util.c rename to src/libnm-systemd-shared/src/basic/env-util.c diff --git a/shared/systemd/src/basic/env-util.h b/src/libnm-systemd-shared/src/basic/env-util.h similarity index 100% rename from shared/systemd/src/basic/env-util.h rename to src/libnm-systemd-shared/src/basic/env-util.h diff --git a/shared/systemd/src/basic/errno-util.h b/src/libnm-systemd-shared/src/basic/errno-util.h similarity index 100% rename from shared/systemd/src/basic/errno-util.h rename to src/libnm-systemd-shared/src/basic/errno-util.h diff --git a/shared/systemd/src/basic/escape.c b/src/libnm-systemd-shared/src/basic/escape.c similarity index 100% rename from shared/systemd/src/basic/escape.c rename to src/libnm-systemd-shared/src/basic/escape.c diff --git a/shared/systemd/src/basic/escape.h b/src/libnm-systemd-shared/src/basic/escape.h similarity index 100% rename from shared/systemd/src/basic/escape.h rename to src/libnm-systemd-shared/src/basic/escape.h diff --git a/shared/systemd/src/basic/ether-addr-util.c b/src/libnm-systemd-shared/src/basic/ether-addr-util.c similarity index 100% rename from shared/systemd/src/basic/ether-addr-util.c rename to src/libnm-systemd-shared/src/basic/ether-addr-util.c diff --git a/shared/systemd/src/basic/ether-addr-util.h b/src/libnm-systemd-shared/src/basic/ether-addr-util.h similarity index 100% rename from shared/systemd/src/basic/ether-addr-util.h rename to src/libnm-systemd-shared/src/basic/ether-addr-util.h diff --git a/shared/systemd/src/basic/extract-word.c b/src/libnm-systemd-shared/src/basic/extract-word.c similarity index 100% rename from shared/systemd/src/basic/extract-word.c rename to src/libnm-systemd-shared/src/basic/extract-word.c diff --git a/shared/systemd/src/basic/extract-word.h b/src/libnm-systemd-shared/src/basic/extract-word.h similarity index 100% rename from shared/systemd/src/basic/extract-word.h rename to src/libnm-systemd-shared/src/basic/extract-word.h diff --git a/shared/systemd/src/basic/fd-util.c b/src/libnm-systemd-shared/src/basic/fd-util.c similarity index 100% rename from shared/systemd/src/basic/fd-util.c rename to src/libnm-systemd-shared/src/basic/fd-util.c diff --git a/shared/systemd/src/basic/fd-util.h b/src/libnm-systemd-shared/src/basic/fd-util.h similarity index 100% rename from shared/systemd/src/basic/fd-util.h rename to src/libnm-systemd-shared/src/basic/fd-util.h diff --git a/shared/systemd/src/basic/fileio.c b/src/libnm-systemd-shared/src/basic/fileio.c similarity index 100% rename from shared/systemd/src/basic/fileio.c rename to src/libnm-systemd-shared/src/basic/fileio.c diff --git a/shared/systemd/src/basic/fileio.h b/src/libnm-systemd-shared/src/basic/fileio.h similarity index 100% rename from shared/systemd/src/basic/fileio.h rename to src/libnm-systemd-shared/src/basic/fileio.h diff --git a/shared/systemd/src/basic/format-util.c b/src/libnm-systemd-shared/src/basic/format-util.c similarity index 100% rename from shared/systemd/src/basic/format-util.c rename to src/libnm-systemd-shared/src/basic/format-util.c diff --git a/shared/systemd/src/basic/format-util.h b/src/libnm-systemd-shared/src/basic/format-util.h similarity index 100% rename from shared/systemd/src/basic/format-util.h rename to src/libnm-systemd-shared/src/basic/format-util.h diff --git a/shared/systemd/src/basic/fs-util.c b/src/libnm-systemd-shared/src/basic/fs-util.c similarity index 100% rename from shared/systemd/src/basic/fs-util.c rename to src/libnm-systemd-shared/src/basic/fs-util.c diff --git a/shared/systemd/src/basic/fs-util.h b/src/libnm-systemd-shared/src/basic/fs-util.h similarity index 100% rename from shared/systemd/src/basic/fs-util.h rename to src/libnm-systemd-shared/src/basic/fs-util.h diff --git a/shared/systemd/src/basic/hash-funcs.c b/src/libnm-systemd-shared/src/basic/hash-funcs.c similarity index 100% rename from shared/systemd/src/basic/hash-funcs.c rename to src/libnm-systemd-shared/src/basic/hash-funcs.c diff --git a/shared/systemd/src/basic/hash-funcs.h b/src/libnm-systemd-shared/src/basic/hash-funcs.h similarity index 100% rename from shared/systemd/src/basic/hash-funcs.h rename to src/libnm-systemd-shared/src/basic/hash-funcs.h diff --git a/shared/systemd/src/basic/hashmap.c b/src/libnm-systemd-shared/src/basic/hashmap.c similarity index 100% rename from shared/systemd/src/basic/hashmap.c rename to src/libnm-systemd-shared/src/basic/hashmap.c diff --git a/shared/systemd/src/basic/hashmap.h b/src/libnm-systemd-shared/src/basic/hashmap.h similarity index 100% rename from shared/systemd/src/basic/hashmap.h rename to src/libnm-systemd-shared/src/basic/hashmap.h diff --git a/shared/systemd/src/basic/hexdecoct.c b/src/libnm-systemd-shared/src/basic/hexdecoct.c similarity index 100% rename from shared/systemd/src/basic/hexdecoct.c rename to src/libnm-systemd-shared/src/basic/hexdecoct.c diff --git a/shared/systemd/src/basic/hexdecoct.h b/src/libnm-systemd-shared/src/basic/hexdecoct.h similarity index 100% rename from shared/systemd/src/basic/hexdecoct.h rename to src/libnm-systemd-shared/src/basic/hexdecoct.h diff --git a/shared/systemd/src/basic/hostname-util.c b/src/libnm-systemd-shared/src/basic/hostname-util.c similarity index 100% rename from shared/systemd/src/basic/hostname-util.c rename to src/libnm-systemd-shared/src/basic/hostname-util.c diff --git a/shared/systemd/src/basic/hostname-util.h b/src/libnm-systemd-shared/src/basic/hostname-util.h similarity index 100% rename from shared/systemd/src/basic/hostname-util.h rename to src/libnm-systemd-shared/src/basic/hostname-util.h diff --git a/shared/systemd/src/basic/in-addr-util.c b/src/libnm-systemd-shared/src/basic/in-addr-util.c similarity index 100% rename from shared/systemd/src/basic/in-addr-util.c rename to src/libnm-systemd-shared/src/basic/in-addr-util.c diff --git a/shared/systemd/src/basic/in-addr-util.h b/src/libnm-systemd-shared/src/basic/in-addr-util.h similarity index 100% rename from shared/systemd/src/basic/in-addr-util.h rename to src/libnm-systemd-shared/src/basic/in-addr-util.h diff --git a/shared/systemd/src/basic/io-util.c b/src/libnm-systemd-shared/src/basic/io-util.c similarity index 100% rename from shared/systemd/src/basic/io-util.c rename to src/libnm-systemd-shared/src/basic/io-util.c diff --git a/shared/systemd/src/basic/io-util.h b/src/libnm-systemd-shared/src/basic/io-util.h similarity index 100% rename from shared/systemd/src/basic/io-util.h rename to src/libnm-systemd-shared/src/basic/io-util.h diff --git a/shared/systemd/src/basic/list.h b/src/libnm-systemd-shared/src/basic/list.h similarity index 100% rename from shared/systemd/src/basic/list.h rename to src/libnm-systemd-shared/src/basic/list.h diff --git a/shared/systemd/src/basic/log.h b/src/libnm-systemd-shared/src/basic/log.h similarity index 100% rename from shared/systemd/src/basic/log.h rename to src/libnm-systemd-shared/src/basic/log.h diff --git a/shared/systemd/src/basic/macro.h b/src/libnm-systemd-shared/src/basic/macro.h similarity index 100% rename from shared/systemd/src/basic/macro.h rename to src/libnm-systemd-shared/src/basic/macro.h diff --git a/shared/systemd/src/basic/memory-util.c b/src/libnm-systemd-shared/src/basic/memory-util.c similarity index 100% rename from shared/systemd/src/basic/memory-util.c rename to src/libnm-systemd-shared/src/basic/memory-util.c diff --git a/shared/systemd/src/basic/memory-util.h b/src/libnm-systemd-shared/src/basic/memory-util.h similarity index 100% rename from shared/systemd/src/basic/memory-util.h rename to src/libnm-systemd-shared/src/basic/memory-util.h diff --git a/shared/systemd/src/basic/mempool.c b/src/libnm-systemd-shared/src/basic/mempool.c similarity index 100% rename from shared/systemd/src/basic/mempool.c rename to src/libnm-systemd-shared/src/basic/mempool.c diff --git a/shared/systemd/src/basic/mempool.h b/src/libnm-systemd-shared/src/basic/mempool.h similarity index 100% rename from shared/systemd/src/basic/mempool.h rename to src/libnm-systemd-shared/src/basic/mempool.h diff --git a/shared/systemd/src/basic/missing_fcntl.h b/src/libnm-systemd-shared/src/basic/missing_fcntl.h similarity index 100% rename from shared/systemd/src/basic/missing_fcntl.h rename to src/libnm-systemd-shared/src/basic/missing_fcntl.h diff --git a/shared/systemd/src/basic/missing_random.h b/src/libnm-systemd-shared/src/basic/missing_random.h similarity index 100% rename from shared/systemd/src/basic/missing_random.h rename to src/libnm-systemd-shared/src/basic/missing_random.h diff --git a/shared/systemd/src/basic/missing_socket.h b/src/libnm-systemd-shared/src/basic/missing_socket.h similarity index 100% rename from shared/systemd/src/basic/missing_socket.h rename to src/libnm-systemd-shared/src/basic/missing_socket.h diff --git a/shared/systemd/src/basic/missing_stat.h b/src/libnm-systemd-shared/src/basic/missing_stat.h similarity index 100% rename from shared/systemd/src/basic/missing_stat.h rename to src/libnm-systemd-shared/src/basic/missing_stat.h diff --git a/shared/systemd/src/basic/missing_syscall.h b/src/libnm-systemd-shared/src/basic/missing_syscall.h similarity index 100% rename from shared/systemd/src/basic/missing_syscall.h rename to src/libnm-systemd-shared/src/basic/missing_syscall.h diff --git a/shared/systemd/src/basic/missing_type.h b/src/libnm-systemd-shared/src/basic/missing_type.h similarity index 100% rename from shared/systemd/src/basic/missing_type.h rename to src/libnm-systemd-shared/src/basic/missing_type.h diff --git a/shared/systemd/src/basic/parse-util.c b/src/libnm-systemd-shared/src/basic/parse-util.c similarity index 100% rename from shared/systemd/src/basic/parse-util.c rename to src/libnm-systemd-shared/src/basic/parse-util.c diff --git a/shared/systemd/src/basic/parse-util.h b/src/libnm-systemd-shared/src/basic/parse-util.h similarity index 100% rename from shared/systemd/src/basic/parse-util.h rename to src/libnm-systemd-shared/src/basic/parse-util.h diff --git a/shared/systemd/src/basic/path-util.c b/src/libnm-systemd-shared/src/basic/path-util.c similarity index 100% rename from shared/systemd/src/basic/path-util.c rename to src/libnm-systemd-shared/src/basic/path-util.c diff --git a/shared/systemd/src/basic/path-util.h b/src/libnm-systemd-shared/src/basic/path-util.h similarity index 100% rename from shared/systemd/src/basic/path-util.h rename to src/libnm-systemd-shared/src/basic/path-util.h diff --git a/shared/systemd/src/basic/prioq.c b/src/libnm-systemd-shared/src/basic/prioq.c similarity index 100% rename from shared/systemd/src/basic/prioq.c rename to src/libnm-systemd-shared/src/basic/prioq.c diff --git a/shared/systemd/src/basic/prioq.h b/src/libnm-systemd-shared/src/basic/prioq.h similarity index 100% rename from shared/systemd/src/basic/prioq.h rename to src/libnm-systemd-shared/src/basic/prioq.h diff --git a/shared/systemd/src/basic/process-util.c b/src/libnm-systemd-shared/src/basic/process-util.c similarity index 100% rename from shared/systemd/src/basic/process-util.c rename to src/libnm-systemd-shared/src/basic/process-util.c diff --git a/shared/systemd/src/basic/process-util.h b/src/libnm-systemd-shared/src/basic/process-util.h similarity index 100% rename from shared/systemd/src/basic/process-util.h rename to src/libnm-systemd-shared/src/basic/process-util.h diff --git a/shared/systemd/src/basic/random-util.c b/src/libnm-systemd-shared/src/basic/random-util.c similarity index 100% rename from shared/systemd/src/basic/random-util.c rename to src/libnm-systemd-shared/src/basic/random-util.c diff --git a/shared/systemd/src/basic/random-util.h b/src/libnm-systemd-shared/src/basic/random-util.h similarity index 100% rename from shared/systemd/src/basic/random-util.h rename to src/libnm-systemd-shared/src/basic/random-util.h diff --git a/shared/systemd/src/basic/ratelimit.c b/src/libnm-systemd-shared/src/basic/ratelimit.c similarity index 100% rename from shared/systemd/src/basic/ratelimit.c rename to src/libnm-systemd-shared/src/basic/ratelimit.c diff --git a/shared/systemd/src/basic/ratelimit.h b/src/libnm-systemd-shared/src/basic/ratelimit.h similarity index 100% rename from shared/systemd/src/basic/ratelimit.h rename to src/libnm-systemd-shared/src/basic/ratelimit.h diff --git a/shared/systemd/src/basic/set.h b/src/libnm-systemd-shared/src/basic/set.h similarity index 100% rename from shared/systemd/src/basic/set.h rename to src/libnm-systemd-shared/src/basic/set.h diff --git a/shared/systemd/src/basic/signal-util.c b/src/libnm-systemd-shared/src/basic/signal-util.c similarity index 100% rename from shared/systemd/src/basic/signal-util.c rename to src/libnm-systemd-shared/src/basic/signal-util.c diff --git a/shared/systemd/src/basic/signal-util.h b/src/libnm-systemd-shared/src/basic/signal-util.h similarity index 100% rename from shared/systemd/src/basic/signal-util.h rename to src/libnm-systemd-shared/src/basic/signal-util.h diff --git a/shared/systemd/src/basic/siphash24.h b/src/libnm-systemd-shared/src/basic/siphash24.h similarity index 100% rename from shared/systemd/src/basic/siphash24.h rename to src/libnm-systemd-shared/src/basic/siphash24.h diff --git a/shared/systemd/src/basic/socket-util.c b/src/libnm-systemd-shared/src/basic/socket-util.c similarity index 100% rename from shared/systemd/src/basic/socket-util.c rename to src/libnm-systemd-shared/src/basic/socket-util.c diff --git a/shared/systemd/src/basic/socket-util.h b/src/libnm-systemd-shared/src/basic/socket-util.h similarity index 100% rename from shared/systemd/src/basic/socket-util.h rename to src/libnm-systemd-shared/src/basic/socket-util.h diff --git a/shared/systemd/src/basic/sort-util.h b/src/libnm-systemd-shared/src/basic/sort-util.h similarity index 100% rename from shared/systemd/src/basic/sort-util.h rename to src/libnm-systemd-shared/src/basic/sort-util.h diff --git a/shared/systemd/src/basic/sparse-endian.h b/src/libnm-systemd-shared/src/basic/sparse-endian.h similarity index 100% rename from shared/systemd/src/basic/sparse-endian.h rename to src/libnm-systemd-shared/src/basic/sparse-endian.h diff --git a/shared/systemd/src/basic/stat-util.c b/src/libnm-systemd-shared/src/basic/stat-util.c similarity index 100% rename from shared/systemd/src/basic/stat-util.c rename to src/libnm-systemd-shared/src/basic/stat-util.c diff --git a/shared/systemd/src/basic/stat-util.h b/src/libnm-systemd-shared/src/basic/stat-util.h similarity index 100% rename from shared/systemd/src/basic/stat-util.h rename to src/libnm-systemd-shared/src/basic/stat-util.h diff --git a/shared/systemd/src/basic/stdio-util.h b/src/libnm-systemd-shared/src/basic/stdio-util.h similarity index 100% rename from shared/systemd/src/basic/stdio-util.h rename to src/libnm-systemd-shared/src/basic/stdio-util.h diff --git a/shared/systemd/src/basic/string-table.c b/src/libnm-systemd-shared/src/basic/string-table.c similarity index 100% rename from shared/systemd/src/basic/string-table.c rename to src/libnm-systemd-shared/src/basic/string-table.c diff --git a/shared/systemd/src/basic/string-table.h b/src/libnm-systemd-shared/src/basic/string-table.h similarity index 100% rename from shared/systemd/src/basic/string-table.h rename to src/libnm-systemd-shared/src/basic/string-table.h diff --git a/shared/systemd/src/basic/string-util.c b/src/libnm-systemd-shared/src/basic/string-util.c similarity index 100% rename from shared/systemd/src/basic/string-util.c rename to src/libnm-systemd-shared/src/basic/string-util.c diff --git a/shared/systemd/src/basic/string-util.h b/src/libnm-systemd-shared/src/basic/string-util.h similarity index 100% rename from shared/systemd/src/basic/string-util.h rename to src/libnm-systemd-shared/src/basic/string-util.h diff --git a/shared/systemd/src/basic/strv.c b/src/libnm-systemd-shared/src/basic/strv.c similarity index 100% rename from shared/systemd/src/basic/strv.c rename to src/libnm-systemd-shared/src/basic/strv.c diff --git a/shared/systemd/src/basic/strv.h b/src/libnm-systemd-shared/src/basic/strv.h similarity index 100% rename from shared/systemd/src/basic/strv.h rename to src/libnm-systemd-shared/src/basic/strv.h diff --git a/shared/systemd/src/basic/strxcpyx.c b/src/libnm-systemd-shared/src/basic/strxcpyx.c similarity index 100% rename from shared/systemd/src/basic/strxcpyx.c rename to src/libnm-systemd-shared/src/basic/strxcpyx.c diff --git a/shared/systemd/src/basic/strxcpyx.h b/src/libnm-systemd-shared/src/basic/strxcpyx.h similarity index 100% rename from shared/systemd/src/basic/strxcpyx.h rename to src/libnm-systemd-shared/src/basic/strxcpyx.h diff --git a/shared/systemd/src/basic/time-util.c b/src/libnm-systemd-shared/src/basic/time-util.c similarity index 100% rename from shared/systemd/src/basic/time-util.c rename to src/libnm-systemd-shared/src/basic/time-util.c diff --git a/shared/systemd/src/basic/time-util.h b/src/libnm-systemd-shared/src/basic/time-util.h similarity index 100% rename from shared/systemd/src/basic/time-util.h rename to src/libnm-systemd-shared/src/basic/time-util.h diff --git a/shared/systemd/src/basic/tmpfile-util.c b/src/libnm-systemd-shared/src/basic/tmpfile-util.c similarity index 100% rename from shared/systemd/src/basic/tmpfile-util.c rename to src/libnm-systemd-shared/src/basic/tmpfile-util.c diff --git a/shared/systemd/src/basic/tmpfile-util.h b/src/libnm-systemd-shared/src/basic/tmpfile-util.h similarity index 100% rename from shared/systemd/src/basic/tmpfile-util.h rename to src/libnm-systemd-shared/src/basic/tmpfile-util.h diff --git a/shared/systemd/src/basic/umask-util.h b/src/libnm-systemd-shared/src/basic/umask-util.h similarity index 100% rename from shared/systemd/src/basic/umask-util.h rename to src/libnm-systemd-shared/src/basic/umask-util.h diff --git a/shared/systemd/src/basic/user-util.h b/src/libnm-systemd-shared/src/basic/user-util.h similarity index 100% rename from shared/systemd/src/basic/user-util.h rename to src/libnm-systemd-shared/src/basic/user-util.h diff --git a/shared/systemd/src/basic/utf8.c b/src/libnm-systemd-shared/src/basic/utf8.c similarity index 100% rename from shared/systemd/src/basic/utf8.c rename to src/libnm-systemd-shared/src/basic/utf8.c diff --git a/shared/systemd/src/basic/utf8.h b/src/libnm-systemd-shared/src/basic/utf8.h similarity index 100% rename from shared/systemd/src/basic/utf8.h rename to src/libnm-systemd-shared/src/basic/utf8.h diff --git a/shared/systemd/src/basic/util.c b/src/libnm-systemd-shared/src/basic/util.c similarity index 100% rename from shared/systemd/src/basic/util.c rename to src/libnm-systemd-shared/src/basic/util.c diff --git a/shared/systemd/src/basic/util.h b/src/libnm-systemd-shared/src/basic/util.h similarity index 100% rename from shared/systemd/src/basic/util.h rename to src/libnm-systemd-shared/src/basic/util.h diff --git a/shared/systemd/src/shared/dns-domain.c b/src/libnm-systemd-shared/src/shared/dns-domain.c similarity index 100% rename from shared/systemd/src/shared/dns-domain.c rename to src/libnm-systemd-shared/src/shared/dns-domain.c diff --git a/shared/systemd/src/shared/dns-domain.h b/src/libnm-systemd-shared/src/shared/dns-domain.h similarity index 100% rename from shared/systemd/src/shared/dns-domain.h rename to src/libnm-systemd-shared/src/shared/dns-domain.h diff --git a/shared/systemd/src/shared/log-link.h b/src/libnm-systemd-shared/src/shared/log-link.h similarity index 100% rename from shared/systemd/src/shared/log-link.h rename to src/libnm-systemd-shared/src/shared/log-link.h diff --git a/shared/systemd/src/shared/web-util.c b/src/libnm-systemd-shared/src/shared/web-util.c similarity index 100% rename from shared/systemd/src/shared/web-util.c rename to src/libnm-systemd-shared/src/shared/web-util.c diff --git a/shared/systemd/src/shared/web-util.h b/src/libnm-systemd-shared/src/shared/web-util.h similarity index 100% rename from shared/systemd/src/shared/web-util.h rename to src/libnm-systemd-shared/src/shared/web-util.h diff --git a/src/libnm-udev-aux/meson.build b/src/libnm-udev-aux/meson.build new file mode 100644 index 0000000000..f0e7a7fa45 --- /dev/null +++ b/src/libnm-udev-aux/meson.build @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_udev_aux = static_library( + 'nm-udev-aux', + sources: 'nm-udev-utils.c', + include_directories: [ + src_inc, + top_inc, + ], + dependencies: [ + glib_dep, + libudev_dep, + ], +) + +libnm_udev_aux_dep = declare_dependency( + link_with: libnm_udev_aux, +) diff --git a/shared/nm-udev-aux/nm-udev-utils.c b/src/libnm-udev-aux/nm-udev-utils.c similarity index 99% rename from shared/nm-udev-aux/nm-udev-utils.c rename to src/libnm-udev-aux/nm-udev-utils.c index 0b941dff53..ef1cf26b2d 100644 --- a/shared/nm-udev-aux/nm-udev-utils.c +++ b/src/libnm-udev-aux/nm-udev-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "nm-glib-aux/nm-default-glib-i18n-lib.h" +#include "libnm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-udev-utils.h" diff --git a/shared/nm-udev-aux/nm-udev-utils.h b/src/libnm-udev-aux/nm-udev-utils.h similarity index 100% rename from shared/nm-udev-aux/nm-udev-utils.h rename to src/libnm-udev-aux/nm-udev-utils.h diff --git a/src/meson.build b/src/meson.build index c4bcd14d63..e560053e41 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,9 +2,116 @@ src_inc = include_directories('.') +############################################################################### + +libc_siphash = static_library( + 'c-siphash', + sources: 'c-siphash/src/c-siphash.c', + include_directories: include_directories('c-stdaux/src'), + c_args: '-std=c11', +) + +libc_rbtree = static_library( + 'c-rbtree', + sources: 'c-rbtree/src/c-rbtree.c', + include_directories: include_directories('c-stdaux/src'), + c_args: '-std=c11', +) + +if enable_ebpf + n_acd_bpf_source = 'n-acd/src/n-acd-bpf.c' +else + n_acd_bpf_source = 'n-acd/src/n-acd-bpf-fallback.c' +endif + +libn_acd = static_library( + 'n-acd', + sources: files( + 'n-acd/src/n-acd.c', + 'n-acd/src/n-acd-probe.c', + 'n-acd/src/util/timer.c', + n_acd_bpf_source, + ), + include_directories: include_directories( + 'c-list/src', + 'c-rbtree/src', + 'c-siphash/src', + 'c-stdaux/src', + ), + c_args: [ + '-std=c11', + '-D_GNU_SOURCE', + '-DSO_ATTACH_BPF=50', + '-Wno-pointer-arith', + '-Wno-vla', + ], + link_with: [ + libc_rbtree, + libc_siphash, + ], +) + +libn_acd_dep = declare_dependency( + link_with: libn_acd, +) + +libn_dhcp4 = static_library( + 'n-dhcp4', + sources: files( + 'n-dhcp4/src/n-dhcp4-c-connection.c', + 'n-dhcp4/src/n-dhcp4-c-lease.c', + 'n-dhcp4/src/n-dhcp4-client.c', + 'n-dhcp4/src/n-dhcp4-c-probe.c', + 'n-dhcp4/src/n-dhcp4-incoming.c', + 'n-dhcp4/src/n-dhcp4-outgoing.c', + 'n-dhcp4/src/n-dhcp4-socket.c', + 'n-dhcp4/src/util/packet.c', + 'n-dhcp4/src/util/socket.c', + ), + c_args: [ + '-std=c11', + '-D_GNU_SOURCE', + '-Wno-declaration-after-statement', + '-Wno-pointer-arith', + ], + include_directories: include_directories( + 'c-list/src', + 'c-siphash/src', + 'c-stdaux/src', + ), + link_with: libc_siphash, +) + +libn_dhcp4_dep = declare_dependency( + link_with: libn_dhcp4, +) + +############################################################################### + +subdir('libnm-std-aux') +subdir('libnm-glib-aux') +subdir('libnm-log-null') +subdir('libnm-log-core') +subdir('libnm-systemd-shared') +subdir('libnm-udev-aux') +subdir('libnm-base') +subdir('libnm-platform') subdir('libnm-core-public') subdir('libnm-core-intern') subdir('libnm-core-aux-intern') subdir('libnm-core-impl') subdir('libnm-core-aux-extern') +subdir('libnm-client-public') +subdir('libnm-client-impl') +subdir('libnm-client-aux-extern') subdir('core') +subdir('contrib') + +if enable_tests + subdir('libnm-client-test') + subdir('libnm-glib-aux/tests') + subdir('libnm-platform/tests') + subdir('libnm-core-impl/tests') + subdir('libnm-client-impl/tests') + subdir('contrib/tests') +endif diff --git a/shared/n-acd/.editorconfig b/src/n-acd/.editorconfig similarity index 100% rename from shared/n-acd/.editorconfig rename to src/n-acd/.editorconfig diff --git a/shared/n-acd/.github/workflows/ci.yml b/src/n-acd/.github/workflows/ci.yml similarity index 100% rename from shared/n-acd/.github/workflows/ci.yml rename to src/n-acd/.github/workflows/ci.yml diff --git a/shared/n-acd/.gitmodules b/src/n-acd/.gitmodules similarity index 100% rename from shared/n-acd/.gitmodules rename to src/n-acd/.gitmodules diff --git a/shared/n-acd/AUTHORS b/src/n-acd/AUTHORS similarity index 100% rename from shared/n-acd/AUTHORS rename to src/n-acd/AUTHORS diff --git a/shared/n-acd/NEWS.md b/src/n-acd/NEWS.md similarity index 100% rename from shared/n-acd/NEWS.md rename to src/n-acd/NEWS.md diff --git a/shared/n-acd/README.md b/src/n-acd/README.md similarity index 100% rename from shared/n-acd/README.md rename to src/n-acd/README.md diff --git a/shared/n-acd/meson.build b/src/n-acd/meson.build similarity index 100% rename from shared/n-acd/meson.build rename to src/n-acd/meson.build diff --git a/shared/n-acd/meson_options.txt b/src/n-acd/meson_options.txt similarity index 100% rename from shared/n-acd/meson_options.txt rename to src/n-acd/meson_options.txt diff --git a/shared/n-acd/src/libnacd.sym b/src/n-acd/src/libnacd.sym similarity index 100% rename from shared/n-acd/src/libnacd.sym rename to src/n-acd/src/libnacd.sym diff --git a/shared/n-acd/src/meson.build b/src/n-acd/src/meson.build similarity index 100% rename from shared/n-acd/src/meson.build rename to src/n-acd/src/meson.build diff --git a/shared/n-acd/src/n-acd-bpf-fallback.c b/src/n-acd/src/n-acd-bpf-fallback.c similarity index 100% rename from shared/n-acd/src/n-acd-bpf-fallback.c rename to src/n-acd/src/n-acd-bpf-fallback.c diff --git a/shared/n-acd/src/n-acd-bpf.c b/src/n-acd/src/n-acd-bpf.c similarity index 100% rename from shared/n-acd/src/n-acd-bpf.c rename to src/n-acd/src/n-acd-bpf.c diff --git a/shared/n-acd/src/n-acd-private.h b/src/n-acd/src/n-acd-private.h similarity index 100% rename from shared/n-acd/src/n-acd-private.h rename to src/n-acd/src/n-acd-private.h diff --git a/shared/n-acd/src/n-acd-probe.c b/src/n-acd/src/n-acd-probe.c similarity index 100% rename from shared/n-acd/src/n-acd-probe.c rename to src/n-acd/src/n-acd-probe.c diff --git a/shared/n-acd/src/n-acd.c b/src/n-acd/src/n-acd.c similarity index 100% rename from shared/n-acd/src/n-acd.c rename to src/n-acd/src/n-acd.c diff --git a/shared/n-acd/src/n-acd.h b/src/n-acd/src/n-acd.h similarity index 100% rename from shared/n-acd/src/n-acd.h rename to src/n-acd/src/n-acd.h diff --git a/shared/n-acd/src/test-api.c b/src/n-acd/src/test-api.c similarity index 100% rename from shared/n-acd/src/test-api.c rename to src/n-acd/src/test-api.c diff --git a/shared/n-acd/src/test-bpf.c b/src/n-acd/src/test-bpf.c similarity index 100% rename from shared/n-acd/src/test-bpf.c rename to src/n-acd/src/test-bpf.c diff --git a/shared/n-acd/src/test-loopback.c b/src/n-acd/src/test-loopback.c similarity index 100% rename from shared/n-acd/src/test-loopback.c rename to src/n-acd/src/test-loopback.c diff --git a/shared/n-acd/src/test-twice.c b/src/n-acd/src/test-twice.c similarity index 100% rename from shared/n-acd/src/test-twice.c rename to src/n-acd/src/test-twice.c diff --git a/shared/n-acd/src/test-unplug.c b/src/n-acd/src/test-unplug.c similarity index 100% rename from shared/n-acd/src/test-unplug.c rename to src/n-acd/src/test-unplug.c diff --git a/shared/n-acd/src/test-unused.c b/src/n-acd/src/test-unused.c similarity index 100% rename from shared/n-acd/src/test-unused.c rename to src/n-acd/src/test-unused.c diff --git a/shared/n-acd/src/test-veth.c b/src/n-acd/src/test-veth.c similarity index 100% rename from shared/n-acd/src/test-veth.c rename to src/n-acd/src/test-veth.c diff --git a/shared/n-acd/src/test.h b/src/n-acd/src/test.h similarity index 100% rename from shared/n-acd/src/test.h rename to src/n-acd/src/test.h diff --git a/shared/n-acd/src/util/test-timer.c b/src/n-acd/src/util/test-timer.c similarity index 100% rename from shared/n-acd/src/util/test-timer.c rename to src/n-acd/src/util/test-timer.c diff --git a/shared/n-acd/src/util/timer.c b/src/n-acd/src/util/timer.c similarity index 100% rename from shared/n-acd/src/util/timer.c rename to src/n-acd/src/util/timer.c diff --git a/shared/n-acd/src/util/timer.h b/src/n-acd/src/util/timer.h similarity index 100% rename from shared/n-acd/src/util/timer.h rename to src/n-acd/src/util/timer.h diff --git a/shared/n-acd/subprojects/c-list b/src/n-acd/subprojects/c-list similarity index 100% rename from shared/n-acd/subprojects/c-list rename to src/n-acd/subprojects/c-list diff --git a/shared/n-acd/subprojects/c-rbtree b/src/n-acd/subprojects/c-rbtree similarity index 100% rename from shared/n-acd/subprojects/c-rbtree rename to src/n-acd/subprojects/c-rbtree diff --git a/shared/n-acd/subprojects/c-siphash b/src/n-acd/subprojects/c-siphash similarity index 100% rename from shared/n-acd/subprojects/c-siphash rename to src/n-acd/subprojects/c-siphash diff --git a/shared/n-acd/subprojects/c-stdaux b/src/n-acd/subprojects/c-stdaux similarity index 100% rename from shared/n-acd/subprojects/c-stdaux rename to src/n-acd/subprojects/c-stdaux diff --git a/shared/n-dhcp4/.editorconfig b/src/n-dhcp4/.editorconfig similarity index 100% rename from shared/n-dhcp4/.editorconfig rename to src/n-dhcp4/.editorconfig diff --git a/shared/n-dhcp4/.github/workflows/ci.yml b/src/n-dhcp4/.github/workflows/ci.yml similarity index 100% rename from shared/n-dhcp4/.github/workflows/ci.yml rename to src/n-dhcp4/.github/workflows/ci.yml diff --git a/shared/n-dhcp4/.gitmodules b/src/n-dhcp4/.gitmodules similarity index 100% rename from shared/n-dhcp4/.gitmodules rename to src/n-dhcp4/.gitmodules diff --git a/shared/n-dhcp4/AUTHORS b/src/n-dhcp4/AUTHORS similarity index 100% rename from shared/n-dhcp4/AUTHORS rename to src/n-dhcp4/AUTHORS diff --git a/shared/n-dhcp4/NEWS.md b/src/n-dhcp4/NEWS.md similarity index 100% rename from shared/n-dhcp4/NEWS.md rename to src/n-dhcp4/NEWS.md diff --git a/shared/n-dhcp4/README.md b/src/n-dhcp4/README.md similarity index 100% rename from shared/n-dhcp4/README.md rename to src/n-dhcp4/README.md diff --git a/shared/n-dhcp4/meson.build b/src/n-dhcp4/meson.build similarity index 100% rename from shared/n-dhcp4/meson.build rename to src/n-dhcp4/meson.build diff --git a/shared/n-dhcp4/src/libndhcp4.sym b/src/n-dhcp4/src/libndhcp4.sym similarity index 100% rename from shared/n-dhcp4/src/libndhcp4.sym rename to src/n-dhcp4/src/libndhcp4.sym diff --git a/shared/n-dhcp4/src/meson.build b/src/n-dhcp4/src/meson.build similarity index 100% rename from shared/n-dhcp4/src/meson.build rename to src/n-dhcp4/src/meson.build diff --git a/shared/n-dhcp4/src/n-dhcp4-c-connection.c b/src/n-dhcp4/src/n-dhcp4-c-connection.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-c-connection.c rename to src/n-dhcp4/src/n-dhcp4-c-connection.c diff --git a/shared/n-dhcp4/src/n-dhcp4-c-lease.c b/src/n-dhcp4/src/n-dhcp4-c-lease.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-c-lease.c rename to src/n-dhcp4/src/n-dhcp4-c-lease.c diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/src/n-dhcp4/src/n-dhcp4-c-probe.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-c-probe.c rename to src/n-dhcp4/src/n-dhcp4-c-probe.c diff --git a/shared/n-dhcp4/src/n-dhcp4-client.c b/src/n-dhcp4/src/n-dhcp4-client.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-client.c rename to src/n-dhcp4/src/n-dhcp4-client.c diff --git a/shared/n-dhcp4/src/n-dhcp4-incoming.c b/src/n-dhcp4/src/n-dhcp4-incoming.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-incoming.c rename to src/n-dhcp4/src/n-dhcp4-incoming.c diff --git a/shared/n-dhcp4/src/n-dhcp4-outgoing.c b/src/n-dhcp4/src/n-dhcp4-outgoing.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-outgoing.c rename to src/n-dhcp4/src/n-dhcp4-outgoing.c diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/src/n-dhcp4/src/n-dhcp4-private.h similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-private.h rename to src/n-dhcp4/src/n-dhcp4-private.h diff --git a/shared/n-dhcp4/src/n-dhcp4-s-connection.c b/src/n-dhcp4/src/n-dhcp4-s-connection.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-s-connection.c rename to src/n-dhcp4/src/n-dhcp4-s-connection.c diff --git a/shared/n-dhcp4/src/n-dhcp4-s-lease.c b/src/n-dhcp4/src/n-dhcp4-s-lease.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-s-lease.c rename to src/n-dhcp4/src/n-dhcp4-s-lease.c diff --git a/shared/n-dhcp4/src/n-dhcp4-server.c b/src/n-dhcp4/src/n-dhcp4-server.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-server.c rename to src/n-dhcp4/src/n-dhcp4-server.c diff --git a/shared/n-dhcp4/src/n-dhcp4-socket.c b/src/n-dhcp4/src/n-dhcp4-socket.c similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4-socket.c rename to src/n-dhcp4/src/n-dhcp4-socket.c diff --git a/shared/n-dhcp4/src/n-dhcp4.h b/src/n-dhcp4/src/n-dhcp4.h similarity index 100% rename from shared/n-dhcp4/src/n-dhcp4.h rename to src/n-dhcp4/src/n-dhcp4.h diff --git a/shared/n-dhcp4/src/test-api.c b/src/n-dhcp4/src/test-api.c similarity index 100% rename from shared/n-dhcp4/src/test-api.c rename to src/n-dhcp4/src/test-api.c diff --git a/shared/n-dhcp4/src/test-connection.c b/src/n-dhcp4/src/test-connection.c similarity index 100% rename from shared/n-dhcp4/src/test-connection.c rename to src/n-dhcp4/src/test-connection.c diff --git a/shared/n-dhcp4/src/test-message.c b/src/n-dhcp4/src/test-message.c similarity index 100% rename from shared/n-dhcp4/src/test-message.c rename to src/n-dhcp4/src/test-message.c diff --git a/shared/n-dhcp4/src/test-run-client.c b/src/n-dhcp4/src/test-run-client.c similarity index 100% rename from shared/n-dhcp4/src/test-run-client.c rename to src/n-dhcp4/src/test-run-client.c diff --git a/shared/n-dhcp4/src/test-socket.c b/src/n-dhcp4/src/test-socket.c similarity index 100% rename from shared/n-dhcp4/src/test-socket.c rename to src/n-dhcp4/src/test-socket.c diff --git a/shared/n-dhcp4/src/test.h b/src/n-dhcp4/src/test.h similarity index 100% rename from shared/n-dhcp4/src/test.h rename to src/n-dhcp4/src/test.h diff --git a/shared/n-dhcp4/src/util/link.c b/src/n-dhcp4/src/util/link.c similarity index 100% rename from shared/n-dhcp4/src/util/link.c rename to src/n-dhcp4/src/util/link.c diff --git a/shared/n-dhcp4/src/util/link.h b/src/n-dhcp4/src/util/link.h similarity index 100% rename from shared/n-dhcp4/src/util/link.h rename to src/n-dhcp4/src/util/link.h diff --git a/shared/n-dhcp4/src/util/netns.c b/src/n-dhcp4/src/util/netns.c similarity index 100% rename from shared/n-dhcp4/src/util/netns.c rename to src/n-dhcp4/src/util/netns.c diff --git a/shared/n-dhcp4/src/util/netns.h b/src/n-dhcp4/src/util/netns.h similarity index 100% rename from shared/n-dhcp4/src/util/netns.h rename to src/n-dhcp4/src/util/netns.h diff --git a/shared/n-dhcp4/src/util/packet.c b/src/n-dhcp4/src/util/packet.c similarity index 100% rename from shared/n-dhcp4/src/util/packet.c rename to src/n-dhcp4/src/util/packet.c diff --git a/shared/n-dhcp4/src/util/packet.h b/src/n-dhcp4/src/util/packet.h similarity index 100% rename from shared/n-dhcp4/src/util/packet.h rename to src/n-dhcp4/src/util/packet.h diff --git a/shared/n-dhcp4/src/util/socket.c b/src/n-dhcp4/src/util/socket.c similarity index 100% rename from shared/n-dhcp4/src/util/socket.c rename to src/n-dhcp4/src/util/socket.c diff --git a/shared/n-dhcp4/src/util/socket.h b/src/n-dhcp4/src/util/socket.h similarity index 100% rename from shared/n-dhcp4/src/util/socket.h rename to src/n-dhcp4/src/util/socket.h diff --git a/shared/n-dhcp4/src/util/test-packet.c b/src/n-dhcp4/src/util/test-packet.c similarity index 100% rename from shared/n-dhcp4/src/util/test-packet.c rename to src/n-dhcp4/src/util/test-packet.c diff --git a/shared/n-dhcp4/subprojects/c-list b/src/n-dhcp4/subprojects/c-list similarity index 100% rename from shared/n-dhcp4/subprojects/c-list rename to src/n-dhcp4/subprojects/c-list diff --git a/shared/n-dhcp4/subprojects/c-siphash b/src/n-dhcp4/subprojects/c-siphash similarity index 100% rename from shared/n-dhcp4/subprojects/c-siphash rename to src/n-dhcp4/subprojects/c-siphash diff --git a/shared/n-dhcp4/subprojects/c-stdaux b/src/n-dhcp4/subprojects/c-stdaux similarity index 100% rename from shared/n-dhcp4/subprojects/c-stdaux rename to src/n-dhcp4/subprojects/c-stdaux diff --git a/tools/check-docs.sh b/tools/check-docs.sh index a7526fcb45..c2e6761d0d 100755 --- a/tools/check-docs.sh +++ b/tools/check-docs.sh @@ -23,15 +23,15 @@ same_lines() { libnm_headers() { ( - ls -1 "$1/libnm"/*.h "$1/src/libnm-core-public"/*.h | \ + ls -1 "$1/src/libnm-client-public"/*.h "$1/src/libnm-core-public"/*.h | \ if [ -n "$2" ]; then - grep -v -F "$1/libnm-core/nm-core-enum-types.h" | \ - grep -v -F "$1/libnm/nm-enum-types.h" + grep -v -F "$1/src/libnm-core-public/nm-core-enum-types.h" | \ + grep -v -F "$1/src/libnm-client-public/nm-enum-types.h" else cat fi if [ -n "$2" ]; then - ls -1 "$2/libnm"/*.h "$2/src/libnm-core-public"/*.h + ls -1 "$2/src/libnm-client-public"/*.h "$2/src/libnm-core-public"/*.h fi ) | sort | uniq } @@ -63,7 +63,7 @@ F1_EXTRA=" nm-core-enum-types nm-enum-types " -F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR/libnm/libnm.ver" | word_regex)" \ +F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR/src/libnm-client-impl/libnm.ver" | word_regex)" \ $(libnm_headers "$SOURCEDIR" "$BUILDDIR") \ | sed 's,.*/\([^/]\+\)\.h$,\1,')" F2_EXTRA=" diff --git a/tools/check-tree.sh b/tools/check-tree.sh index cc6c80ef23..1975b0931b 100755 --- a/tools/check-tree.sh +++ b/tools/check-tree.sh @@ -19,6 +19,6 @@ check_cmp() { die "files \"$a\" and \"$b\" differ!" } -check_cmp shared/nm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h +check_cmp src/libnm-base/nm-ethtool-utils-base.h src/libnm-client-public/nm-ethtool-utils.h check_cmp src/libnm-core-intern/nm-meta-setting-base-impl.h clients/common/nm-meta-setting-base-impl.h check_cmp src/libnm-core-impl/nm-meta-setting-base-impl.c clients/common/nm-meta-setting-base-impl.c diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh index 6d835a8fb8..81b94ec648 100755 --- a/tools/run-nm-test.sh +++ b/tools/run-nm-test.sh @@ -216,8 +216,8 @@ else BUILDDIR="$(dirname "$BUILDDIR")" [[ "$BUILDDIR" == / ]] && BUILDDIR= [[ -z "$BUILDDIR" ]] && break - [[ -e "$BUILDDIR/libnm/.libs/libnm.so" ]] && break - [[ -e "$BUILDDIR/libnm/libnm.so" ]] && break + [[ -e "$BUILDDIR/src/libnm-client-impl/.libs/libnm.so" ]] && break + [[ -e "$BUILDDIR/src/libnm-client-impl/libnm.so" ]] && break done fi fi @@ -244,7 +244,7 @@ TEST_NAME="${TEST##*/}" if [ -z "${NMTST_LAUNCH_DBUS}" ]; then # autodetect whether to launch D-Bus based on the test path. - if [[ $TEST_PATH == */libnm/tests ]]; then + if [[ $TEST_PATH == */src/libnm-client-impl/tests ]]; then NMTST_LAUNCH_DBUS=1 else NMTST_LAUNCH_DBUS=0 @@ -270,12 +270,12 @@ fi [ -x "$TEST" ] || die "Cannot execute test \"$TEST\"" if [[ -n "$BUILDDIR" ]]; then - if [[ -d "$BUILDDIR/libnm" ]]; then - export GI_TYPELIB_PATH="$BUILDDIR/libnm/${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" - if [[ -d "$BUILDDIR/libnm/.libs" ]]; then - export LD_LIBRARY_PATH="$BUILDDIR/libnm/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + if [[ -d "$BUILDDIR/src/libnm-client-impl" ]]; then + export GI_TYPELIB_PATH="$BUILDDIR/src/libnm-client-impl/${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" + if [[ -d "$BUILDDIR/src/libnm-client-impl/.libs" ]]; then + export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" else - export LD_LIBRARY_PATH="$BUILDDIR/libnm${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" fi fi fi