diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-02-12 15:01:09 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-02-18 19:46:51 +0100 |
| commit | fdf9614ba793a023d9b6c0f6a078beded8143771 (patch) | |
| tree | 1c21d90c0873da541302bc0e209428b667029054 | |
| parent | 2c1f8e9108a33eb3819b1bda1138a01bfd71746a (diff) | |
| download | NetworkManager-fdf9614ba793a023d9b6c0f6a078beded8143771.tar.gz | |
build: move "libnm-core/" to "src/" and split it
"libnm-core/" is rather complicated. It provides a static library that
is linked into libnm.so and NetworkManager. It also contains public
headers (like "nm-setting.h") which are part of public libnm API.
Then we have helper libraries ("libnm-core/nm-libnm-core-*/") which
only rely on public API of libnm-core, but are themself static
libraries that can be used by anybody who uses libnm-core. And
"libnm-core/nm-libnm-core-intern" is used by libnm-core itself.
Move "libnm-core/" to "src/". But also split it in different
directories so that they have a clearer purpose.
The goal is to have a flat directory hierarchy. The "src/libnm-core*/"
directories correspond to the different modules (static libraries and set
of headers that we have). We have different kinds of such modules because
of how we combine various code together. The directory layout now reflects
this.
377 files changed, 1535 insertions, 1279 deletions
diff --git a/.gitignore b/.gitignore index 2b49984ac7..8d50a621be 100644 --- a/.gitignore +++ b/.gitignore @@ -141,17 +141,17 @@ test-*.trs /introspection/org.freedesktop.NetworkManager*.[ch] -/libnm-core/tests/test-compare -/libnm-core/tests/test-crypto -/libnm-core/tests/test-settings-defaults -/libnm-core/tests/test-general -/libnm-core/tests/test-keyfile -/libnm-core/tests/test-need-secrets -/libnm-core/tests/test-secrets -/libnm-core/tests/test-setting -/libnm-core/nm-dbus-types.xml -/libnm-core/nm-version-macros.h -/libnm-core/nm-vpn-dbus-types.xml +/src/libnm-core-public/nm-version-macros.h +/src/libnm-core-public/nm-dbus-types.xml +/src/libnm-core-public/nm-vpn-dbus-types.xml +/src/libnm-core-impl/tests/test-compare +/src/libnm-core-impl/tests/test-crypto +/src/libnm-core-impl/tests/test-settings-defaults +/src/libnm-core-impl/tests/test-general +/src/libnm-core-impl/tests/test-keyfile +/src/libnm-core-impl/tests/test-need-secrets +/src/libnm-core-impl/tests/test-secrets +/src/libnm-core-impl/tests/test-setting /libnm/nm-property-infos-dbus.xml /libnm/nm-property-infos-ifcfg-rh.xml @@ -323,6 +323,17 @@ test-*.trs /libnm-core/tests/test-setting-8021x /libnm-core/tests/test-setting-bond /libnm-core/tests/test-setting-dcb +/libnm-core/tests/test-compare +/libnm-core/tests/test-crypto +/libnm-core/tests/test-settings-defaults +/libnm-core/tests/test-general +/libnm-core/tests/test-keyfile +/libnm-core/tests/test-need-secrets +/libnm-core/tests/test-secrets +/libnm-core/tests/test-setting +/libnm-core/nm-dbus-types.xml +/libnm-core/nm-version-macros.h +/libnm-core/nm-vpn-dbus-types.xml /libnm-glib/libnm-glib-test /libnm-glib/nm-secret-agent-glue.h /libnm-glib/nm-vpn-plugin-glue.h diff --git a/Makefile.am b/Makefile.am index 9e35298b3d..e888ac6cca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,20 +110,22 @@ include config-extra.h.mk DISTCLEANFILES += config-extra.h -$(libnm_core_lib_h_pub_mkenums): config-extra.h -libnm-core/.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 +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 ############################################################################### @@ -582,75 +584,82 @@ EXTRA_DIST += \ ############################################################################### -noinst_LTLIBRARIES += libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la +noinst_LTLIBRARIES += src/libnm-core-aux-intern/libnm-core-aux-intern.la -libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \ +src_libnm_core_aux_intern_libnm_core_aux_intern_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ + -I$(srcdir)/shared \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ -DG_LOG_DOMAIN=\""libnm"\" \ $(NULL) -libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \ - libnm-core/nm-libnm-core-intern/nm-auth-subject.c \ - libnm-core/nm-libnm-core-intern/nm-auth-subject.h \ - libnm-core/nm-libnm-core-intern/nm-common-macros.h \ - libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c \ - libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h \ +src_libnm_core_aux_intern_libnm_core_aux_intern_la_SOURCES = \ + src/libnm-core-aux-intern/nm-auth-subject.c \ + src/libnm-core-aux-intern/nm-auth-subject.h \ + src/libnm-core-aux-intern/nm-common-macros.h \ + src/libnm-core-aux-intern/nm-libnm-core-utils.c \ + src/libnm-core-aux-intern/nm-libnm-core-utils.h \ $(NULL) -libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS = \ +src_libnm_core_aux_intern_libnm_core_aux_intern_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_LIBADD = \ +src_libnm_core_aux_intern_libnm_core_aux_intern_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) -$(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_libnm_core_aux_intern_libnm_core_aux_intern_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -EXTRA_DIST += libnm-core/nm-libnm-core-intern/README.md +EXTRA_DIST += \ + src/libnm-core-aux-intern/README.md \ + src/libnm-core-aux-intern/meson.build \ + $(NULL) ############################################################################### -noinst_LTLIBRARIES += libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la +noinst_LTLIBRARIES += src/libnm-core-aux-extern/libnm-core-aux-extern.la -libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \ +src_libnm_core_aux_extern_libnm_core_aux_extern_la_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ + -I$(srcdir)/shared \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ + -I$(srcdir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ -DG_LOG_DOMAIN=\""libnm"\" \ $(NULL) -libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \ - libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h \ - libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c \ - libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.h \ +src_libnm_core_aux_extern_libnm_core_aux_extern_la_SOURCES = \ + src/libnm-core-aux-extern/nm-dispatcher-api.h \ + src/libnm-core-aux-extern/nm-libnm-core-aux.c \ + src/libnm-core-aux-extern/nm-libnm-core-aux.h \ $(NULL) -libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \ +src_libnm_core_aux_extern_libnm_core_aux_extern_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD = \ +src_libnm_core_aux_extern_libnm_core_aux_extern_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) -$(libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_libnm_core_aux_extern_libnm_core_aux_extern_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -EXTRA_DIST += libnm-core/nm-libnm-core-aux/README.md +EXTRA_DIST += \ + src/libnm-core-aux-extern/README.md \ + src/libnm-core-aux-extern/meson.build \ + $(NULL) ############################################################################### @@ -660,8 +669,8 @@ libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ $(CODE_COVERAGE_CFLAGS) \ @@ -685,7 +694,7 @@ libnm_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \ libnm/libnm.la \ $(NULL) -$(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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 @@ -1002,172 +1011,182 @@ check_local += check-docs ############################################################################### -libnm_core_lib_h_pub_real = \ - libnm-core/nm-connection.h \ - libnm-core/nm-core-types.h \ - libnm-core/nm-dbus-interface.h \ - libnm-core/nm-errors.h \ - libnm-core/nm-keyfile.h \ - libnm-core/nm-setting-6lowpan.h \ - libnm-core/nm-setting-8021x.h \ - libnm-core/nm-setting-adsl.h \ - libnm-core/nm-setting-bluetooth.h \ - libnm-core/nm-setting-bond.h \ - libnm-core/nm-setting-bridge-port.h \ - libnm-core/nm-setting-bridge.h \ - libnm-core/nm-setting-cdma.h \ - libnm-core/nm-setting-connection.h \ - libnm-core/nm-setting-dcb.h \ - libnm-core/nm-setting-dummy.h \ - libnm-core/nm-setting-ethtool.h \ - libnm-core/nm-setting-generic.h \ - libnm-core/nm-setting-gsm.h \ - libnm-core/nm-setting-hostname.h \ - libnm-core/nm-setting-infiniband.h \ - libnm-core/nm-setting-ip-config.h \ - libnm-core/nm-setting-ip-tunnel.h \ - libnm-core/nm-setting-ip4-config.h \ - libnm-core/nm-setting-ip6-config.h \ - libnm-core/nm-setting-macsec.h \ - libnm-core/nm-setting-macvlan.h \ - libnm-core/nm-setting-match.h \ - libnm-core/nm-setting-olpc-mesh.h \ - libnm-core/nm-setting-ovs-bridge.h \ - libnm-core/nm-setting-ovs-dpdk.h \ - libnm-core/nm-setting-ovs-external-ids.h \ - libnm-core/nm-setting-ovs-interface.h \ - libnm-core/nm-setting-ovs-patch.h \ - libnm-core/nm-setting-ovs-port.h \ - libnm-core/nm-setting-ppp.h \ - libnm-core/nm-setting-pppoe.h \ - libnm-core/nm-setting-proxy.h \ - libnm-core/nm-setting-serial.h \ - libnm-core/nm-setting-sriov.h \ - libnm-core/nm-setting-tc-config.h \ - libnm-core/nm-setting-team-port.h \ - libnm-core/nm-setting-team.h \ - libnm-core/nm-setting-tun.h \ - libnm-core/nm-setting-user.h \ - libnm-core/nm-setting-veth.h \ - libnm-core/nm-setting-vlan.h \ - libnm-core/nm-setting-vpn.h \ - libnm-core/nm-setting-vrf.h \ - libnm-core/nm-setting-vxlan.h \ - libnm-core/nm-setting-wifi-p2p.h \ - libnm-core/nm-setting-wimax.h \ - libnm-core/nm-setting-wired.h \ - libnm-core/nm-setting-wireguard.h \ - libnm-core/nm-setting-wireless-security.h \ - libnm-core/nm-setting-wireless.h \ - libnm-core/nm-setting-wpan.h \ - libnm-core/nm-setting.h \ - libnm-core/nm-simple-connection.h \ - libnm-core/nm-utils.h \ - libnm-core/nm-version-macros.h \ - libnm-core/nm-version.h \ - libnm-core/nm-vpn-dbus-interface.h \ - libnm-core/nm-vpn-editor-plugin.h \ - libnm-core/nm-vpn-plugin-info.h \ - $(NULL) -libnm_core_lib_h_pub_mkenums = \ - libnm-core/nm-core-enum-types.h \ - $(NULL) -libnm_core_lib_h_priv = \ - libnm-core/nm-connection-private.h \ - libnm-core/nm-core-internal.h \ - libnm-core/nm-core-types-internal.h \ - libnm-core/nm-crypto-impl.h \ - libnm-core/nm-crypto.h \ - libnm-core/nm-default-libnm-core.h \ - libnm-core/nm-keyfile-internal.h \ - libnm-core/nm-keyfile-utils.h \ - libnm-core/nm-meta-setting-base-impl.h \ - libnm-core/nm-meta-setting-base.h \ - libnm-core/nm-property-compare.h \ - libnm-core/nm-setting-private.h \ - libnm-core/nm-team-utils.h \ - libnm-core/nm-utils-private.h \ - $(NULL) -libnm_core_lib_c_settings_real = \ - libnm-core/nm-setting-6lowpan.c \ - libnm-core/nm-setting-8021x.c \ - libnm-core/nm-setting-adsl.c \ - libnm-core/nm-setting-bluetooth.c \ - libnm-core/nm-setting-bond.c \ - libnm-core/nm-setting-bridge-port.c \ - libnm-core/nm-setting-bridge.c \ - libnm-core/nm-setting-cdma.c \ - libnm-core/nm-setting-connection.c \ - libnm-core/nm-setting-dcb.c \ - libnm-core/nm-setting-dummy.c \ - libnm-core/nm-setting-ethtool.c \ - libnm-core/nm-setting-generic.c \ - libnm-core/nm-setting-gsm.c \ - libnm-core/nm-setting-hostname.c \ - libnm-core/nm-setting-infiniband.c \ - libnm-core/nm-setting-ip-config.c \ - libnm-core/nm-setting-ip-tunnel.c \ - libnm-core/nm-setting-ip4-config.c \ - libnm-core/nm-setting-ip6-config.c \ - libnm-core/nm-setting-macsec.c \ - libnm-core/nm-setting-macvlan.c \ - libnm-core/nm-setting-match.c \ - libnm-core/nm-setting-olpc-mesh.c \ - libnm-core/nm-setting-ovs-bridge.c \ - libnm-core/nm-setting-ovs-dpdk.c \ - libnm-core/nm-setting-ovs-external-ids.c \ - libnm-core/nm-setting-ovs-interface.c \ - libnm-core/nm-setting-ovs-patch.c \ - libnm-core/nm-setting-ovs-port.c \ - libnm-core/nm-setting-ppp.c \ - libnm-core/nm-setting-pppoe.c \ - libnm-core/nm-setting-proxy.c \ - libnm-core/nm-setting-serial.c \ - libnm-core/nm-setting-sriov.c \ - libnm-core/nm-setting-tc-config.c \ - libnm-core/nm-setting-team-port.c \ - libnm-core/nm-setting-team.c \ - libnm-core/nm-setting-tun.c \ - libnm-core/nm-setting-user.c \ - libnm-core/nm-setting-veth.c \ - libnm-core/nm-setting-vlan.c \ - libnm-core/nm-setting-vpn.c \ - libnm-core/nm-setting-vrf.c \ - libnm-core/nm-setting-vxlan.c \ - libnm-core/nm-setting-wifi-p2p.c \ - libnm-core/nm-setting-wimax.c \ - libnm-core/nm-setting-wired.c \ - libnm-core/nm-setting-wireguard.c \ - libnm-core/nm-setting-wireless-security.c \ - libnm-core/nm-setting-wireless.c \ - libnm-core/nm-setting-wpan.c \ - $(NULL) -libnm_core_lib_c_real = \ - $(libnm_core_lib_c_settings_real) \ - libnm-core/nm-connection.c \ - libnm-core/nm-crypto.c \ - libnm-core/nm-dbus-utils.c \ - libnm-core/nm-errors.c \ - libnm-core/nm-keyfile-utils.c \ - libnm-core/nm-keyfile.c \ - libnm-core/nm-meta-setting-base-impl.c \ - libnm-core/nm-property-compare.c \ - libnm-core/nm-setting.c \ - libnm-core/nm-simple-connection.c \ - libnm-core/nm-team-utils.c \ - libnm-core/nm-utils.c \ - libnm-core/nm-vpn-editor-plugin.c \ - libnm-core/nm-vpn-plugin-info.c \ - $(NULL) - -libnm_core_lib_c_mkenums = \ - libnm-core/nm-core-enum-types.c +src_libnm_core_impl_lib_h_pub_real = \ + src/libnm-core-public/nm-connection.h \ + src/libnm-core-public/nm-core-types.h \ + src/libnm-core-public/nm-dbus-interface.h \ + src/libnm-core-public/nm-errors.h \ + src/libnm-core-public/nm-keyfile.h \ + src/libnm-core-public/nm-setting-6lowpan.h \ + src/libnm-core-public/nm-setting-8021x.h \ + src/libnm-core-public/nm-setting-adsl.h \ + src/libnm-core-public/nm-setting-bluetooth.h \ + src/libnm-core-public/nm-setting-bond.h \ + src/libnm-core-public/nm-setting-bridge-port.h \ + src/libnm-core-public/nm-setting-bridge.h \ + src/libnm-core-public/nm-setting-cdma.h \ + src/libnm-core-public/nm-setting-connection.h \ + src/libnm-core-public/nm-setting-dcb.h \ + src/libnm-core-public/nm-setting-dummy.h \ + src/libnm-core-public/nm-setting-ethtool.h \ + src/libnm-core-public/nm-setting-generic.h \ + src/libnm-core-public/nm-setting-gsm.h \ + src/libnm-core-public/nm-setting-hostname.h \ + src/libnm-core-public/nm-setting-infiniband.h \ + src/libnm-core-public/nm-setting-ip-config.h \ + src/libnm-core-public/nm-setting-ip-tunnel.h \ + src/libnm-core-public/nm-setting-ip4-config.h \ + src/libnm-core-public/nm-setting-ip6-config.h \ + src/libnm-core-public/nm-setting-macsec.h \ + src/libnm-core-public/nm-setting-macvlan.h \ + src/libnm-core-public/nm-setting-match.h \ + src/libnm-core-public/nm-setting-olpc-mesh.h \ + src/libnm-core-public/nm-setting-ovs-bridge.h \ + src/libnm-core-public/nm-setting-ovs-dpdk.h \ + src/libnm-core-public/nm-setting-ovs-external-ids.h \ + src/libnm-core-public/nm-setting-ovs-interface.h \ + src/libnm-core-public/nm-setting-ovs-patch.h \ + src/libnm-core-public/nm-setting-ovs-port.h \ + src/libnm-core-public/nm-setting-ppp.h \ + src/libnm-core-public/nm-setting-pppoe.h \ + src/libnm-core-public/nm-setting-proxy.h \ + src/libnm-core-public/nm-setting-serial.h \ + src/libnm-core-public/nm-setting-sriov.h \ + src/libnm-core-public/nm-setting-tc-config.h \ + src/libnm-core-public/nm-setting-team-port.h \ + src/libnm-core-public/nm-setting-team.h \ + src/libnm-core-public/nm-setting-tun.h \ + src/libnm-core-public/nm-setting-user.h \ + src/libnm-core-public/nm-setting-veth.h \ + src/libnm-core-public/nm-setting-vlan.h \ + src/libnm-core-public/nm-setting-vpn.h \ + src/libnm-core-public/nm-setting-vrf.h \ + src/libnm-core-public/nm-setting-vxlan.h \ + src/libnm-core-public/nm-setting-wifi-p2p.h \ + src/libnm-core-public/nm-setting-wimax.h \ + src/libnm-core-public/nm-setting-wired.h \ + src/libnm-core-public/nm-setting-wireguard.h \ + src/libnm-core-public/nm-setting-wireless-security.h \ + src/libnm-core-public/nm-setting-wireless.h \ + src/libnm-core-public/nm-setting-wpan.h \ + src/libnm-core-public/nm-setting.h \ + src/libnm-core-public/nm-simple-connection.h \ + src/libnm-core-public/nm-utils.h \ + src/libnm-core-public/nm-version-macros.h \ + src/libnm-core-public/nm-version.h \ + src/libnm-core-public/nm-vpn-dbus-interface.h \ + src/libnm-core-public/nm-vpn-editor-plugin.h \ + src/libnm-core-public/nm-vpn-plugin-info.h \ + $(NULL) +src_libnm_core_public_mkenums_h = \ + src/libnm-core-public/nm-core-enum-types.h \ + $(NULL) +src_libnm_core_impl_lib_h_priv = \ + src/libnm-core-impl/nm-connection-private.h \ + src/libnm-core-impl/nm-crypto-impl.h \ + src/libnm-core-impl/nm-crypto.h \ + src/libnm-core-impl/nm-default-libnm-core.h \ + src/libnm-core-impl/nm-property-compare.h \ + src/libnm-core-impl/nm-setting-private.h \ + src/libnm-core-impl/nm-team-utils.h \ + src/libnm-core-impl/nm-utils-private.h \ + src/libnm-core-intern/nm-core-internal.h \ + src/libnm-core-intern/nm-core-types-internal.h \ + src/libnm-core-intern/nm-keyfile-internal.h \ + src/libnm-core-intern/nm-keyfile-utils.h \ + src/libnm-core-intern/nm-meta-setting-base-impl.h \ + src/libnm-core-intern/nm-meta-setting-base.h \ + $(NULL) +src_libnm_core_impl_lib_c_settings_real = \ + src/libnm-core-impl/nm-setting-6lowpan.c \ + src/libnm-core-impl/nm-setting-8021x.c \ + src/libnm-core-impl/nm-setting-adsl.c \ + src/libnm-core-impl/nm-setting-bluetooth.c \ + src/libnm-core-impl/nm-setting-bond.c \ + src/libnm-core-impl/nm-setting-bridge-port.c \ + src/libnm-core-impl/nm-setting-bridge.c \ + src/libnm-core-impl/nm-setting-cdma.c \ + src/libnm-core-impl/nm-setting-connection.c \ + src/libnm-core-impl/nm-setting-dcb.c \ + src/libnm-core-impl/nm-setting-dummy.c \ + src/libnm-core-impl/nm-setting-ethtool.c \ + src/libnm-core-impl/nm-setting-generic.c \ + src/libnm-core-impl/nm-setting-gsm.c \ + src/libnm-core-impl/nm-setting-hostname.c \ + src/libnm-core-impl/nm-setting-infiniband.c \ + src/libnm-core-impl/nm-setting-ip-config.c \ + src/libnm-core-impl/nm-setting-ip-tunnel.c \ + src/libnm-core-impl/nm-setting-ip4-config.c \ + src/libnm-core-impl/nm-setting-ip6-config.c \ + src/libnm-core-impl/nm-setting-macsec.c \ + src/libnm-core-impl/nm-setting-macvlan.c \ + src/libnm-core-impl/nm-setting-match.c \ + src/libnm-core-impl/nm-setting-olpc-mesh.c \ + src/libnm-core-impl/nm-setting-ovs-bridge.c \ + src/libnm-core-impl/nm-setting-ovs-dpdk.c \ + src/libnm-core-impl/nm-setting-ovs-external-ids.c \ + src/libnm-core-impl/nm-setting-ovs-interface.c \ + src/libnm-core-impl/nm-setting-ovs-patch.c \ + src/libnm-core-impl/nm-setting-ovs-port.c \ + src/libnm-core-impl/nm-setting-ppp.c \ + src/libnm-core-impl/nm-setting-pppoe.c \ + src/libnm-core-impl/nm-setting-proxy.c \ + src/libnm-core-impl/nm-setting-serial.c \ + src/libnm-core-impl/nm-setting-sriov.c \ + src/libnm-core-impl/nm-setting-tc-config.c \ + src/libnm-core-impl/nm-setting-team-port.c \ + src/libnm-core-impl/nm-setting-team.c \ + src/libnm-core-impl/nm-setting-tun.c \ + src/libnm-core-impl/nm-setting-user.c \ + src/libnm-core-impl/nm-setting-veth.c \ + src/libnm-core-impl/nm-setting-vlan.c \ + src/libnm-core-impl/nm-setting-vpn.c \ + src/libnm-core-impl/nm-setting-vrf.c \ + src/libnm-core-impl/nm-setting-vxlan.c \ + src/libnm-core-impl/nm-setting-wifi-p2p.c \ + src/libnm-core-impl/nm-setting-wimax.c \ + src/libnm-core-impl/nm-setting-wired.c \ + src/libnm-core-impl/nm-setting-wireguard.c \ + src/libnm-core-impl/nm-setting-wireless-security.c \ + src/libnm-core-impl/nm-setting-wireless.c \ + src/libnm-core-impl/nm-setting-wpan.c \ + $(NULL) +src_libnm_core_impl_lib_c_real = \ + $(src_libnm_core_impl_lib_c_settings_real) \ + src/libnm-core-impl/nm-connection.c \ + src/libnm-core-impl/nm-crypto.c \ + src/libnm-core-impl/nm-dbus-utils.c \ + src/libnm-core-impl/nm-errors.c \ + src/libnm-core-impl/nm-keyfile-utils.c \ + src/libnm-core-impl/nm-keyfile.c \ + src/libnm-core-impl/nm-meta-setting-base-impl.c \ + src/libnm-core-impl/nm-property-compare.c \ + src/libnm-core-impl/nm-setting.c \ + src/libnm-core-impl/nm-simple-connection.c \ + 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 \ + $(NULL) + +src_libnm_core_public_mkenums_c = \ + src/libnm-core-public/nm-core-enum-types.c \ + $(NULL) libnminclude_HEADERS += \ - $(libnm_core_lib_h_pub_real) + $(src_libnm_core_impl_lib_h_pub_real) nodist_libnminclude_HEADERS += \ - $(libnm_core_lib_h_pub_mkenums) + $(src_libnm_core_public_mkenums_h) + +EXTRA_DIST += \ + src/libnm-core-impl/README.md \ + src/libnm-core-impl/meson.build \ + src/libnm-core-intern/README.md \ + src/libnm-core-intern/meson.build \ + src/libnm-core-public/README.md \ + src/libnm-core-public/meson.build \ + $(NULL) ############################################################################### @@ -1175,119 +1194,123 @@ dflt_cppflags_libnm_core = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ + -I$(srcdir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBUDEV_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -noinst_LTLIBRARIES += libnm-core/libnm-core.la +noinst_LTLIBRARIES += src/libnm-core-impl/libnm-core-impl.la GLIB_GENERATED += \ - $(libnm_core_lib_h_pub_mkenums) \ - $(libnm_core_lib_c_mkenums) -nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real) - -nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm-core/nm-default-libnm-core.h"\n' - -libnm-core/nm-core-enum-types.h.stamp: libnm-core/.dirstamp -libnm-core/nm-core-enum-types.c.stamp: libnm-core/.dirstamp - -$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(dispatcher_nm_dispatcher_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_core_libnm_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_libnm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - -libnm_core_libnm_core_la_CPPFLAGS = \ + $(src_libnm_core_public_mkenums_h) \ + $(src_libnm_core_public_mkenums_c) \ + $(NULL) +nm_core_enum_types_sources = $(src_libnm_core_impl_lib_h_pub_real) + +nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "src/libnm-core-impl/nm-default-libnm-core.h"\n' + +src/libnm-core-public/nm-core-enum-types.h.stamp: src/libnm-core-public/.dirstamp +src/libnm-core-public/nm-core-enum-types.c.stamp: src/libnm-core-public/.dirstamp + +$(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_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) +$(src_core_devices_team_libnm_device_plugin_team_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS): $(src_libnm_core_public_mkenums_h) + +src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS = \ $(dflt_cppflags_libnm_core) \ + -I$(srcdir)/src/libnm-core-intern/ \ -DG_LOG_DOMAIN=\""libnm"\" \ $(NULL) -libnm_core_libnm_core_la_SOURCES = \ - $(libnm_core_lib_h_pub_real) \ - $(libnm_core_lib_h_priv) \ - $(libnm_core_lib_c_real) +src_libnm_core_impl_libnm_core_impl_la_SOURCES = \ + $(src_libnm_core_impl_lib_h_pub_real) \ + $(src_libnm_core_impl_lib_h_priv) \ + $(src_libnm_core_impl_lib_c_real) -nodist_libnm_core_libnm_core_la_SOURCES = \ - $(libnm_core_lib_h_pub_mkenums) \ - $(libnm_core_lib_c_mkenums) +nodist_src_libnm_core_impl_libnm_core_impl_la_SOURCES = \ + $(src_libnm_core_public_mkenums_h) \ + $(src_libnm_core_public_mkenums_c) \ + $(NULL) -libnm_core_libnm_core_la_LIBADD = \ +src_libnm_core_impl_libnm_core_impl_la_LIBADD = \ $(GLIB_LIBS) \ $(UUID_LIBS) \ $(NULL) -libnm_core_libnm_core_la_LDFLAGS = \ +src_libnm_core_impl_libnm_core_impl_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) EXTRA_DIST += \ - libnm-core/nm-crypto-gnutls.c \ - libnm-core/nm-crypto-nss.c \ - libnm-core/meson.build \ + src/libnm-core-impl/nm-crypto-gnutls.c \ + src/libnm-core-impl/nm-crypto-nss.c \ + src/libnm-core-impl/meson.build \ $(NULL) -libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl - @$(MKDIR_P) libnm-core/ +src/libnm-core-public/nm-vpn-dbus-types.xml: src/libnm-core-public/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl + @$(MKDIR_P) src/libnm-core-public/ $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $< >$@ -libnm-core/nm-dbus-types.xml: libnm-core/nm-dbus-interface.h tools/enums-to-docbook.pl - @$(MKDIR_P) libnm-core/ +src/libnm-core-public/nm-dbus-types.xml: src/libnm-core-public/nm-dbus-interface.h tools/enums-to-docbook.pl + @$(MKDIR_P) src/libnm-core-public/ $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $< >$@ BUILT_SOURCES += \ - libnm-core/nm-vpn-dbus-types.xml \ - libnm-core/nm-dbus-types.xml + src/libnm-core-public/nm-vpn-dbus-types.xml \ + src/libnm-core-public/nm-dbus-types.xml dist_dependencies += \ - libnm-core/nm-vpn-dbus-types.xml \ - libnm-core/nm-dbus-types.xml + src/libnm-core-public/nm-vpn-dbus-types.xml \ + src/libnm-core-public/nm-dbus-types.xml ############################################################################### if HAVE_CRYPTO_GNUTLS if WITH_GNUTLS -libnm_crypto_lib = libnm-core/libnm-crypto-gnutls.la +libnm_crypto_lib = src/libnm-core-impl/libnm-crypto-gnutls.la else -check_ltlibraries += libnm-core/libnm-crypto-gnutls.la +check_ltlibraries += src/libnm-core-impl/libnm-crypto-gnutls.la endif -libnm_core_libnm_crypto_gnutls_la_SOURCES = libnm-core/nm-crypto-gnutls.c -libnm_core_libnm_crypto_gnutls_la_CPPFLAGS = \ - $(libnm_core_libnm_core_la_CPPFLAGS) \ +src_libnm_core_impl_libnm_crypto_gnutls_la_SOURCES = src/libnm-core-impl/nm-crypto-gnutls.c +src_libnm_core_impl_libnm_crypto_gnutls_la_CPPFLAGS = \ + $(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) \ $(GNUTLS_CFLAGS) -libnm_core_libnm_crypto_gnutls_la_LDFLAGS = \ - $(libnm_core_libnm_core_la_LDFLAGS) -libnm_core_libnm_crypto_gnutls_la_LIBADD = \ +src_libnm_core_impl_libnm_crypto_gnutls_la_LDFLAGS = \ + $(src_libnm_core_impl_libnm_core_impl_la_LDFLAGS) +src_libnm_core_impl_libnm_crypto_gnutls_la_LIBADD = \ $(GLIB_LIBS) \ $(GNUTLS_LIBS) endif if HAVE_CRYPTO_NSS if WITH_NSS -libnm_crypto_lib = libnm-core/libnm-crypto-nss.la +libnm_crypto_lib = src/libnm-core-impl/libnm-crypto-nss.la else -check_ltlibraries += libnm-core/libnm-crypto-nss.la +check_ltlibraries += src/libnm-core-impl/libnm-crypto-nss.la endif -libnm_core_libnm_crypto_nss_la_SOURCES = libnm-core/nm-crypto-nss.c -libnm_core_libnm_crypto_nss_la_CPPFLAGS = \ - $(libnm_core_libnm_core_la_CPPFLAGS) \ +src_libnm_core_impl_libnm_crypto_nss_la_SOURCES = src/libnm-core-impl/nm-crypto-nss.c +src_libnm_core_impl_libnm_crypto_nss_la_CPPFLAGS = \ + $(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) \ $(NSS_CFLAGS) -libnm_core_libnm_crypto_nss_la_LDFLAGS = \ - $(libnm_core_libnm_core_la_LDFLAGS) -libnm_core_libnm_crypto_nss_la_LIBADD = \ +src_libnm_core_impl_libnm_crypto_nss_la_LDFLAGS = \ + $(src_libnm_core_impl_libnm_core_impl_la_LDFLAGS) +src_libnm_core_impl_libnm_crypto_nss_la_LIBADD = \ $(GLIB_LIBS) \ $(NSS_LIBS) endif @@ -1297,56 +1320,57 @@ noinst_LTLIBRARIES += $(libnm_crypto_lib) ############################################################################### check_programs += \ - libnm-core/tests/test-compare \ - libnm-core/tests/test-crypto \ - libnm-core/tests/test-general \ - libnm-core/tests/test-keyfile \ - libnm-core/tests/test-secrets \ - libnm-core/tests/test-setting \ - libnm-core/tests/test-settings-defaults + src/libnm-core-impl/tests/test-compare \ + src/libnm-core-impl/tests/test-crypto \ + src/libnm-core-impl/tests/test-general \ + src/libnm-core-impl/tests/test-keyfile \ + src/libnm-core-impl/tests/test-secrets \ + src/libnm-core-impl/tests/test-setting \ + src/libnm-core-impl/tests/test-settings-defaults GLIB_GENERATED += \ - libnm-core/tests/nm-core-tests-enum-types.h \ - libnm-core/tests/nm-core-tests-enum-types.c -nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h -nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "libnm-core/nm-default-libnm-core.h"\n' + src/libnm-core-impl/tests/nm-core-tests-enum-types.h \ + src/libnm-core-impl/tests/nm-core-tests-enum-types.c +nm_core_tests_enum_types_sources = src/libnm-core-impl/tests/test-general-enums.h +nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "src/libnm-core-impl/nm-default-libnm-core.h"\n' -libnm-core/tests/nm-core-tests-enum-types.h.stamp: libnm-core/tests/.dirstamp -libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp +src/libnm-core-impl/tests/nm-core-tests-enum-types.h.stamp: src/libnm-core-impl/tests/.dirstamp +src/libnm-core-impl/tests/nm-core-tests-enum-types.c.stamp: src/libnm-core-impl/tests/.dirstamp -$(libnm_core_tests_test_general_OBJECTS): libnm-core/tests/nm-core-tests-enum-types.h +$(src_libnm_core_impl_tests_test_general_OBJECTS): src/libnm-core-impl/tests/nm-core-tests-enum-types.h -libnm_core_tests_cppflags = \ - -I$(srcdir)/libnm-core/tests \ - -I$(builddir)/libnm-core/tests \ +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 \ $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""test"\" \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) -libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) -libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags) -libnm_core_tests_test_general_CPPFLAGS = $(libnm_core_tests_cppflags) -libnm_core_tests_test_keyfile_CPPFLAGS = $(libnm_core_tests_cppflags) -libnm_core_tests_test_secrets_CPPFLAGS = $(libnm_core_tests_cppflags) -libnm_core_tests_test_setting_CPPFLAGS = $(libnm_core_tests_cppflags) -libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags) +src_libnm_core_impl_tests_test_compare_CPPFLAGS = $(src_libnm_core_impl_tests_cppflags) +src_libnm_core_impl_tests_test_crypto_CPPFLAGS = $(src_libnm_core_impl_tests_cppflags) +src_libnm_core_impl_tests_test_general_CPPFLAGS = $(src_libnm_core_impl_tests_cppflags) +src_libnm_core_impl_tests_test_keyfile_CPPFLAGS = $(src_libnm_core_impl_tests_cppflags) +src_libnm_core_impl_tests_test_secrets_CPPFLAGS = $(src_libnm_core_impl_tests_cppflags) +src_libnm_core_impl_tests_test_setting_CPPFLAGS = $(src_libnm_core_impl_tests_cppflags) +src_libnm_core_impl_tests_test_settings_defaults_CPPFLAGS = $(src_libnm_core_impl_tests_cppflags) -libnm_core_tests_test_general_SOURCES = \ - libnm-core/tests/test-general-enums.h \ - libnm-core/tests/test-general.c \ +src_libnm_core_impl_tests_test_general_SOURCES = \ + src/libnm-core-impl/tests/test-general-enums.h \ + src/libnm-core-impl/tests/test-general.c \ $(NULL) -nodist_libnm_core_tests_test_general_SOURCES = \ - libnm-core/tests/nm-core-tests-enum-types.c \ - libnm-core/tests/nm-core-tests-enum-types.h \ +nodist_src_libnm_core_impl_tests_test_general_SOURCES = \ + src/libnm-core-impl/tests/nm-core-tests-enum-types.c \ + src/libnm-core-impl/tests/nm-core-tests-enum-types.h \ $(NULL) -libnm_core_tests_ldadd = \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/libnm-core.la \ +src_libnm_core_impl_tests_ldadd = \ + src/libnm-core-aux-extern/libnm-core-aux-extern.la \ + src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + 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 \ @@ -1356,33 +1380,33 @@ libnm_core_tests_ldadd = \ $(GLIB_LIBS) \ $(NULL) -libnm_core_tests_ldflags = \ +src_libnm_core_impl_tests_ldflags = \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) -libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) -libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd) -libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd) -libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd) -libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd) -libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd) - -libnm_core_tests_test_compare_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_crypto_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_general_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_keyfile_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_secrets_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_setting_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_settings_defaults_LDFLAGS = $(libnm_core_tests_ldflags) - -$(libnm_core_tests_test_compare_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_core_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_core_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_core_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_core_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_core_tests_test_setting_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +src_libnm_core_impl_tests_test_compare_LDADD = $(src_libnm_core_impl_tests_ldadd) +src_libnm_core_impl_tests_test_crypto_LDADD = $(src_libnm_core_impl_tests_ldadd) +src_libnm_core_impl_tests_test_general_LDADD = $(src_libnm_core_impl_tests_ldadd) +src_libnm_core_impl_tests_test_keyfile_LDADD = $(src_libnm_core_impl_tests_ldadd) +src_libnm_core_impl_tests_test_secrets_LDADD = $(src_libnm_core_impl_tests_ldadd) +src_libnm_core_impl_tests_test_setting_LDADD = $(src_libnm_core_impl_tests_ldadd) +src_libnm_core_impl_tests_test_settings_defaults_LDADD = $(src_libnm_core_impl_tests_ldadd) + +src_libnm_core_impl_tests_test_compare_LDFLAGS = $(src_libnm_core_impl_tests_ldflags) +src_libnm_core_impl_tests_test_crypto_LDFLAGS = $(src_libnm_core_impl_tests_ldflags) +src_libnm_core_impl_tests_test_general_LDFLAGS = $(src_libnm_core_impl_tests_ldflags) +src_libnm_core_impl_tests_test_keyfile_LDFLAGS = $(src_libnm_core_impl_tests_ldflags) +src_libnm_core_impl_tests_test_secrets_LDFLAGS = $(src_libnm_core_impl_tests_ldflags) +src_libnm_core_impl_tests_test_setting_LDFLAGS = $(src_libnm_core_impl_tests_ldflags) +src_libnm_core_impl_tests_test_settings_defaults_LDFLAGS = $(src_libnm_core_impl_tests_ldflags) + +$(src_libnm_core_impl_tests_test_compare_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_core_impl_tests_test_crypto_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_core_impl_tests_test_general_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_core_impl_tests_test_keyfile_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_core_impl_tests_test_secrets_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_core_impl_tests_test_setting_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_core_impl_tests_test_settings_defaults_OBJECTS): $(src_libnm_core_public_mkenums_h) # test-cert.p12 created with: # @@ -1394,28 +1418,28 @@ $(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenu # -out test-cert.p12 EXTRA_DIST += \ - libnm-core/tests/certs/ca-no-ending-newline.pem \ - libnm-core/tests/certs/pkcs8-decrypted.der \ - libnm-core/tests/certs/pkcs8-enc-key.pem \ - libnm-core/tests/certs/pkcs8-noenc-key.pem \ - libnm-core/tests/certs/test2_ca_cert.pem \ - libnm-core/tests/certs/test2-cert.p12 \ - libnm-core/tests/certs/test2_key_and_cert.pem \ - libnm-core/tests/certs/test-aes-128-key.pem \ - libnm-core/tests/certs/test-aes-256-key.pem \ - libnm-core/tests/certs/test_ca_cert.der \ - libnm-core/tests/certs/test_ca_cert.pem \ - libnm-core/tests/certs/test-ca-cert.pem \ - libnm-core/tests/certs/test-cert.p12 \ - libnm-core/tests/certs/test_key_and_cert.pem \ - libnm-core/tests/certs/test-key-and-cert.pem \ - libnm-core/tests/certs/test-key-only-decrypted.der \ - libnm-core/tests/certs/test-key-only-decrypted.pem \ - libnm-core/tests/certs/test-key-only.pem \ - libnm-core/tests/certs/test-tpm2wrapped-key.pem \ - libnm-core/tests/nm-core-tests-enum-types.c.template \ - libnm-core/tests/nm-core-tests-enum-types.h.template \ - libnm-core/tests/meson.build + src/libnm-core-impl/tests/certs/ca-no-ending-newline.pem \ + src/libnm-core-impl/tests/certs/pkcs8-decrypted.der \ + src/libnm-core-impl/tests/certs/pkcs8-enc-key.pem \ + src/libnm-core-impl/tests/certs/pkcs8-noenc-key.pem \ + src/libnm-core-impl/tests/certs/test2_ca_cert.pem \ + src/libnm-core-impl/tests/certs/test2-cert.p12 \ + src/libnm-core-impl/tests/certs/test2_key_and_cert.pem \ + src/libnm-core-impl/tests/certs/test-aes-128-key.pem \ + src/libnm-core-impl/tests/certs/test-aes-256-key.pem \ + src/libnm-core-impl/tests/certs/test_ca_cert.der \ + src/libnm-core-impl/tests/certs/test_ca_cert.pem \ + src/libnm-core-impl/tests/certs/test-ca-cert.pem \ + src/libnm-core-impl/tests/certs/test-cert.p12 \ + src/libnm-core-impl/tests/certs/test_key_and_cert.pem \ + src/libnm-core-impl/tests/certs/test-key-and-cert.pem \ + src/libnm-core-impl/tests/certs/test-key-only-decrypted.der \ + src/libnm-core-impl/tests/certs/test-key-only-decrypted.pem \ + src/libnm-core-impl/tests/certs/test-key-only.pem \ + src/libnm-core-impl/tests/certs/test-tpm2wrapped-key.pem \ + src/libnm-core-impl/tests/nm-core-tests-enum-types.c.template \ + src/libnm-core-impl/tests/nm-core-tests-enum-types.h.template \ + src/libnm-core-impl/tests/meson.build ############################################################################### @@ -1543,13 +1567,6 @@ libnm_lib_c_real = \ libnm_lib_c_mkenums = \ libnm/nm-enum-types.c -libnm_lib_cppflags = \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ - $(dflt_cppflags_libnm_core) \ - -DG_LOG_DOMAIN=\""libnm"\" \ - $(NULL) - libnminclude_HEADERS += \ $(libnm_lib_h_pub_real) @@ -1561,8 +1578,12 @@ nodist_libnminclude_HEADERS += \ noinst_LTLIBRARIES += libnm/libnm_static.la libnm_libnm_static_la_CPPFLAGS = \ + -I$(builddir)/libnm \ + -I$(srcdir)/libnm \ + -I$(srcdir)/src \ + $(dflt_cppflags_libnm_core) \ + -DG_LOG_DOMAIN=\""libnm"\" \ $(INTROSPECTION_CFLAGS) \ - $(libnm_lib_cppflags) \ $(NULL) libnm_libnm_static_la_SOURCES = \ @@ -1575,10 +1596,10 @@ nodist_libnm_libnm_static_la_SOURCES = \ $(NULL) libnm_libnm_static_la_LIBADD = \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/libnm-core.la \ + src/libnm-core-aux-extern/libnm-core-aux-extern.la \ + src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + src/libnm-core-aux-intern/libnm-core-aux-intern.la \ shared/nm-base/libnm-base.la \ introspection/libnmdbus.la \ shared/nm-glib-aux/libnm-glib-aux.la \ @@ -1594,7 +1615,7 @@ libnm_libnm_static_la_LIBADD = \ $(NULL) $(libnm_libnm_static_la_OBJECTS) : $(libnm_lib_h_pub_mkenums) -$(libnm_libnm_static_la_OBJECTS) : $(libnm_core_lib_h_pub_mkenums) +$(libnm_libnm_static_la_OBJECTS) : $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -1612,10 +1633,14 @@ nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm $(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): $(libnm_core_lib_h_pub_mkenums) +$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) libnm_libnm_la_CPPFLAGS = \ - $(libnm_lib_cppflags) \ + -I$(builddir)/libnm \ + -I$(srcdir)/libnm \ + -I$(srcdir)/src \ + $(dflt_cppflags_libnm_core) \ + -DG_LOG_DOMAIN=\""libnm"\" \ $(LIBUDEV_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) @@ -1670,10 +1695,10 @@ libnm_NM_1_0_gir_CFLAGS = \ $(NULL) libnm_NM_1_0_gir_LIBS = libnm/libnm.la libnm_NM_1_0_gir_FILES = \ - $(libnm_core_lib_h_pub_mkenums) \ - $(libnm_core_lib_h_pub_real) \ - $(libnm_core_lib_c_mkenums) \ - $(libnm_core_lib_c_real) \ + $(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) \ $(libnm_lib_h_pub_real) \ $(libnm_lib_c_mkenums) \ @@ -1681,7 +1706,7 @@ libnm_NM_1_0_gir_FILES = \ libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm libnm/libnm.typelib: libnm/libnm.gir - $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ + $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/src/libnm-core-public --includedir=$(builddir)/src/libnm-core-public --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ INTROSPECTION_GIRS += libnm/NM-1.0.gir @@ -1713,7 +1738,7 @@ clients/cli/generate-docs-nm-settings-nmcli.xml: clients/cli/generate-docs-nm-se check-local-generate-docs-nm-settings-nmcli: endif -libnm_docs_sources = $(libnm_core_lib_c_settings_real) +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) $(AM_V_GEN) $(srcdir)/tools/generate-docs-nm-property-infos.pl $(patsubst nm-property-infos-%.xml,%,$(notdir $@)) $@ $(filter-out $<,$^) @@ -1815,10 +1840,10 @@ 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): $(libnm_core_lib_h_pub_mkenums) -$(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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) # tools/test-networkmanager-service.py uses libnm's typelib. Ensure it # is built first. @@ -1841,8 +1866,8 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ $(GLIB_CFLAGS) \ @@ -2092,8 +2117,9 @@ shared_systemd_libnm_systemd_shared_la_LIBADD = \ src_core_libnm_systemd_core_la_cppflags = \ $(libsystemd_cppflags) \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ + -I$(srcdir)/src \ -I$(srcdir)/src/core \ -I$(srcdir)/src/core/systemd/sd-adapt-core \ -I$(srcdir)/src/core/systemd/src/systemd \ @@ -2181,7 +2207,7 @@ src_core_libnm_systemd_core_la_LIBADD = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) -$(src_core_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_libnm_systemd_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/systemd/meson.build @@ -2270,7 +2296,7 @@ src_core_libNetworkManagerBase_la_LIBADD = \ $(LIBUDEV_LIBS) \ $(NULL) -$(src_core_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_libNetworkManagerBase_la_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/platform/linux/nl802154.h @@ -2460,10 +2486,10 @@ src_core_libNetworkManager_la_SOURCES = \ src_core_libNetworkManager_la_LIBADD = \ src/core/libNetworkManagerBase.la \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/libnm-core.la \ + src/libnm-core-aux-extern/libnm-core-aux-extern.la \ + src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + 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 \ @@ -2488,7 +2514,7 @@ src_core_libNetworkManager_la_LIBADD = \ $(LIBCURL_LIBS) \ $(NULL) -$(src_core_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_libNetworkManager_la_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -2515,7 +2541,7 @@ src_core_libNetworkManagerTest_la_LIBADD = \ $(LIBUDEV_LIBS) \ $(NULL) -$(src_core_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_libNetworkManagerTest_la_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -2536,7 +2562,7 @@ src_core_NetworkManager_all_sym_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -$(src_core_NetworkManager_all_sym_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_NetworkManager_all_sym_OBJECTS): $(src_libnm_core_public_mkenums_h) src/core/NetworkManager.ver: src/core/NetworkManager-all-sym $(core_plugins) $(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)" @@ -2562,7 +2588,7 @@ src_core_NetworkManager_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -$(src_core_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_NetworkManager_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -2573,10 +2599,10 @@ src_core_nm_iface_helper_SOURCES = \ src_core_nm_iface_helper_LDADD = \ src/core/libNetworkManagerBase.la \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/libnm-core.la \ + src/libnm-core-aux-extern/libnm-core-aux-extern.la \ + src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + 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 \ @@ -2600,7 +2626,7 @@ src_core_nm_iface_helper_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ $(SANITIZER_EXEC_LDFLAGS) -$(src_core_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_nm_iface_helper_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -2627,10 +2653,10 @@ src_core_initrd_nm_initrd_generator_SOURCES = \ src_core_initrd_nm_initrd_generator_LDADD = \ src/core/initrd/libnmi-core.la \ src/core/libNetworkManagerBase.la \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/libnm-core.la \ + src/libnm-core-aux-extern/libnm-core-aux-extern.la \ + src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + 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 \ @@ -2925,11 +2951,11 @@ src_core_initrd_tests_test_cmdline_reader_LDADD = \ $(GLIB_LIBS) \ $(NULL) -$(src_core_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_initrd_tests_test_dt_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_initrd_libnmi_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_initrd_nm_initrd_generator_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_initrd_tests_test_cmdline_reader_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_initrd_tests_test_ibft_reader_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_initrd_tests_test_dt_reader_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -2987,8 +3013,8 @@ src_core_dhcp_tests_test_dhcp_utils_LDADD = $(src_core_dhcp_tests_ldadd) src_core_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_core_tests_ldflags) src_core_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_core_tests_ldflags) -$(src_core_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_dhcp_tests_test_dhcp_utils_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/dhcp/tests/test-dhclient-duid.leases \ @@ -3009,7 +3035,8 @@ src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ $(GLIB_CFLAGS) @@ -3026,7 +3053,7 @@ src_core_ppp_nm_pppd_plugin_la_LIBADD = \ $(DL_LIBS) \ $(NULL) -$(src_core_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_ppp_nm_pppd_plugin_la_OBJECTS): $(src_libnm_core_public_mkenums_h) src_core_ppp_libnm_ppp_plugin_la_SOURCES = \ src/core/ppp/nm-pppd-plugin.h \ @@ -3051,7 +3078,7 @@ src_core_ppp_libnm_ppp_plugin_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) -$(src_core_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_ppp_libnm_ppp_plugin_la_OBJECTS): $(src_libnm_core_public_mkenums_h) endif @@ -3074,7 +3101,7 @@ src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \ src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \ src/core/libNetworkManagerTest.la -$(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ @@ -3170,7 +3197,7 @@ src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_core_cppflags_base) -$(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -3192,7 +3219,7 @@ src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la $(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h -$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(src_libnm_core_public_mkenums_h) check-local-symbols-settings-ifcfg-rh: src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la $(call check_so_symbols,$(builddir)/src/core/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so) @@ -3219,7 +3246,7 @@ src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ src/core/libNetworkManagerTest.la -$(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(src_libnm_core_public_mkenums_h) dist_libexec_SCRIPTS += \ src/core/settings/plugins/ifcfg-rh/nm-ifup \ @@ -3512,8 +3539,8 @@ src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \ $(LIBUDEV_LIBS) \ $(NULL) -$(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) check-local-symbols-settings-ifupdown: src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la $(call check_so_symbols,$(builddir)/src/core/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so) @@ -3536,7 +3563,7 @@ src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ $(GLIB_LIBS) \ $(NULL) -$(src_core_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(src_libnm_core_public_mkenums_h) endif @@ -3645,7 +3672,7 @@ src_core_devices_wwan_libnm_wwan_la_LIBADD = \ $(LIBSYSTEMD_LIBS) \ $(MM_GLIB_LIBS) -$(src_core_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wwan_libnm_wwan_la_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_src_core_devices_wwan_libnm_wwan_la_DEPENDENCIES = \ src/core/devices/wwan/libnm-wwan.ver @@ -3697,7 +3724,7 @@ src_core_devices_wwan_tests_test_service_providers_LDADD = \ check_programs += src/core/devices/wwan/tests/test-service-providers -$(src_core_devices_wwan_tests_test_service_providers_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wwan_tests_test_service_providers_OBJECTS): $(src_libnm_core_public_mkenums_h) endif @@ -3739,7 +3766,7 @@ src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS += $(BLUEZ5_CFLAGS) src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD += $(BLUEZ5_LIBS) endif -$(src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -3783,7 +3810,7 @@ src_core_devices_bluetooth_tests_nm_bt_test_LDADD = \ $(GLIB_LIBS) \ $(NULL) -$(src_core_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -3838,7 +3865,7 @@ src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_core_cppflags_device_p src_core_devices_wifi_libnm_wifi_base_la_LIBADD = \ $(GLIB_LIBS) -$(src_core_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wifi_libnm_wifi_base_la_OBJECTS): $(src_libnm_core_public_mkenums_h) core_plugins += src/core/devices/wifi/libnm-device-plugin-wifi.la @@ -3878,7 +3905,7 @@ src_core_devices_wifi_tests_test_devices_wifi_LDADD = \ src_core_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) -$(src_core_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wifi_tests_test_devices_wifi_OBJECTS): $(src_libnm_core_public_mkenums_h) endif @@ -3995,7 +4022,7 @@ src_core_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ src_core_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) -$(src_core_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/dnsmasq/tests/meson.build @@ -4094,19 +4121,19 @@ src_core_platform_tests_test_tc_linux_LDFLAGS = $(src_core_platform_tests_ldflag src_core_platform_tests_test_tc_linux_LDADD = $(src_core_platform_tests_libadd) -$(src_core_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_tc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_platform_tests_test_tc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_monitor_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_address_fake_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_address_linux_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_cleanup_fake_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_cleanup_linux_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_link_fake_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_link_linux_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_nmp_object_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_platform_general_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_route_fake_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_route_linux_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_tc_fake_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_platform_tests_test_tc_linux_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/platform/tests/meson.build \ @@ -4134,8 +4161,8 @@ src_core_devices_tests_test_acd_LDFLAGS = $(src_core_devices_tests_ldflags) src_core_devices_tests_test_acd_LDADD = \ src/core/libNetworkManagerTest.la -$(src_core_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_tests_test_lldp_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_devices_tests_test_acd_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/devices/tests/meson.build @@ -4163,8 +4190,8 @@ src_core_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_core_cppflags_test) src_core_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_core_ndisc_tests_ldflags) src_core_ndisc_tests_test_ndisc_fake_LDADD = $(src_core_ndisc_tests_ldadd) -$(src_core_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_ndisc_tests_test_ndisc_linux_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_ndisc_tests_test_ndisc_fake_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/ndisc/tests/meson.build @@ -4183,7 +4210,7 @@ src_core_supplicant_tests_test_supplicant_config_LDADD = \ src_core_supplicant_tests_test_supplicant_config_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) -$(src_core_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_supplicant_tests_test_supplicant_config_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/supplicant/tests/certs/test-ca-cert.pem \ @@ -4209,7 +4236,7 @@ src_core_tests_config_test_config_LDADD = \ src_core_tests_config_test_config_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) -$(src_core_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_config_test_config_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/tests/config/NetworkManager.conf \ @@ -4278,14 +4305,14 @@ src_core_tests_test_l3cfg_CPPFLAGS = $(src_core_cppflags_test) src_core_tests_test_l3cfg_LDFLAGS = $(src_core_devices_tests_ldflags) src_core_tests_test_l3cfg_LDADD = $(src_core_tests_ldadd) -$(src_core_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_tests_test_l3cfg_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_core_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_core_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_tests_test_core_with_expect_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_tests_test_dcb_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_tests_test_ip4_config_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_tests_test_ip6_config_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_tests_test_l3cfg_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_tests_test_utils_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_core_tests_test_wired_defname_OBJECTS): $(src_libnm_core_public_mkenums_h) src_core_tests_test_systemd_CPPFLAGS = \ $(src_core_libnm_systemd_core_la_cppflags) \ @@ -4303,7 +4330,7 @@ src_core_tests_test_systemd_LDADD = \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) -$(src_core_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_systemd_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/tests/test-secret-agent.py \ @@ -4339,14 +4366,15 @@ noinst_LTLIBRARIES += \ dispatcher_cppflags = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ - -I$(srcdir)/dispatcher \ + -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$(srcdir)/src \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nm-dispatcher"\" \ $(NULL) @@ -4421,14 +4449,15 @@ check_programs += dispatcher/tests/test-dispatcher-envp dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -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 \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ @@ -4456,7 +4485,7 @@ dispatcher_tests_test_dispatcher_envp_LDADD = \ $(GLIB_LIBS) \ $(NULL) -$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ dispatcher/tests/dispatcher-connectivity-full \ @@ -4479,8 +4508,8 @@ clients_nm_online_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ $(GLIB_CFLAGS) \ @@ -4501,7 +4530,7 @@ clients_nm_online_LDADD = \ $(GLIB_LIBS) \ $(NULL) -$(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_nm_online_OBJECTS): $(src_libnm_core_public_mkenums_h) $(clients_nm_online_OBJECTS): $(libnm_lib_h_pub_mkenums) EXTRA_DIST += \ @@ -4515,11 +4544,13 @@ clients_cppflags = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -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$(srcdir)/src \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) @@ -4551,7 +4582,7 @@ clients_common_libnmc_base_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) -$(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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): clients/common/.dirstamp @@ -4591,7 +4622,6 @@ clients_common_libnmc_la_SOURCES = \ clients_common_libnmc_la_CPPFLAGS = \ $(clients_cppflags) \ - -I$(builddir)/clients/common \ -DG_LOG_DOMAIN=\""libnmc"\" \ $(NULL) @@ -4600,7 +4630,7 @@ clients_common_libnmc_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) -$(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_common_libnmc_la_OBJECTS): $(src_libnm_core_public_mkenums_h) $(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h) $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp @@ -4624,8 +4654,8 @@ clients_common_tests_test_clients_common_LDFLAGS = \ clients_common_tests_test_clients_common_LDADD = \ clients/common/libnmc.la \ clients/common/libnmc-base.la \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.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 \ @@ -4633,7 +4663,7 @@ clients_common_tests_test_clients_common_LDADD = \ libnm/libnm.la \ $(GLIB_LIBS) -$(clients_common_tests_test_clients_common_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_common_tests_test_clients_common_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### @@ -4652,10 +4682,11 @@ clients_common_tests_test_libnm_core_aux_CPPFLAGS = \ $(dflt_cppflags) \ -I$(builddir)/shared \ -I$(srcdir)/shared \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm-core \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-core-public \ -I$(builddir)/libnm \ -I$(srcdir)/libnm \ + -I$(srcdir)/src \ -DG_LOG_DOMAIN=\""test"\" \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ @@ -4668,7 +4699,8 @@ clients_common_tests_test_libnm_core_aux_LDFLAGS = \ $(NULL) clients_common_tests_test_libnm_core_aux_LDADD = \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + 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 \ @@ -4676,7 +4708,7 @@ clients_common_tests_test_libnm_core_aux_LDADD = \ $(GLIB_LIBS) \ $(NULL) -$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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) ############################################################################### @@ -4715,8 +4747,8 @@ clients_cli_nmcli_CPPFLAGS = \ clients_cli_nmcli_LDADD = \ clients/common/libnmc.la \ clients/common/libnmc-base.la \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.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 \ @@ -4730,7 +4762,7 @@ clients_cli_nmcli_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ $(SANITIZER_EXEC_LDFLAGS) -$(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_cli_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h) $(clients_cli_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums) install-data-hook-nmcli: @@ -4764,8 +4796,8 @@ 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 \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.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 \ @@ -4779,7 +4811,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -$(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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) ############################################################################### @@ -4850,7 +4882,7 @@ clients_tui_newt_libnmt_newt_a_CPPFLAGS = \ $(NEWT_CFLAGS) \ $(NULL) -$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(src_libnm_core_public_mkenums_h) bin_PROGRAMS += clients/tui/nmtui @@ -4955,8 +4987,8 @@ clients_tui_nmtui_LDADD = \ clients/common/libnmc.la \ clients/common/libnmc-base.la \ libnm/nm-libnm-aux/libnm-libnm-aux.la \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.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 \ @@ -4966,7 +4998,7 @@ clients_tui_nmtui_LDADD = \ $(NEWT_LIBS) \ $(NULL) -$(clients_tui_nmtui_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_tui_nmtui_OBJECTS): $(src_libnm_core_public_mkenums_h) nmtui_links = nmtui-edit nmtui-connect nmtui-hostname @@ -5019,7 +5051,7 @@ clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS = \ $(LIBCURL_CFLAGS) \ $(NULL) -$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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) libexec_PROGRAMS += clients/cloud-setup/nm-cloud-setup @@ -5042,8 +5074,8 @@ 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 \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.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 \ @@ -5053,7 +5085,7 @@ clients_cloud_setup_nm_cloud_setup_LDADD = \ $(LIBCURL_LIBS) \ $(NULL) -$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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) if HAVE_SYSTEMD @@ -5108,8 +5140,8 @@ 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 \ - libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.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 \ @@ -5119,7 +5151,7 @@ clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \ $(LIBCURL_LIBS) \ $(NULL) -$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(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) endif @@ -5447,7 +5479,9 @@ EXTRA_DIST += \ shared/nm-utils/nm-vpn-plugin-utils.h \ shared/meson.build \ \ - libnm-core/nm-version-macros.h.in \ + src/meson.build \ + \ + src/libnm-core-public/nm-version-macros.h.in \ \ tools/check-config-options.sh \ tools/check-docs.sh \ @@ -5526,7 +5560,7 @@ uninstall-hook: $(uninstall_hook) ############################################################################### cscope: - cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -sclients; + cscope -b -q -R -sshared -ssrc -slibnm -sclients; ############################################################################### diff --git a/Makefile.examples b/Makefile.examples index 3cb46293bb..7690baf252 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -3,12 +3,10 @@ ############################################################################### examples_C_glib_cppflags = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/libnm \ + -I$(top_builddir)/src/libnm-core-public \ + -I$(top_srcdir)/src/libnm-core-public \ -I$(top_builddir)/libnm \ + -I$(top_srcdir)/libnm \ $(GLIB_CFLAGS) examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) @@ -75,8 +73,10 @@ EXTRA_DIST += \ if WITH_QT examples_C_qt_cppflags = \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ + -I$(top_builddir)/src/libnm-core-public \ + -I$(top_srcdir)/src/libnm-core-public \ + -I$(top_builddir)/libnm \ + -I$(top_srcdir)/libnm \ -I$(builddir)/examples/C/qt \ $(DBUS_CFLAGS) \ $(QT_CFLAGS) diff --git a/clients/cli/general.c b/clients/cli/general.c index 1dae57e116..8094ad7c71 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -7,7 +7,7 @@ #include <stdlib.h> -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-client-utils.h" diff --git a/clients/cli/meson.build b/clients/cli/meson.build index f8e6a8236d..7bb75d34a5 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -24,8 +24,12 @@ executable( dependencies: [ libnmc_base_dep, libnmc_dep, - readline_dep, libnm_libnm_aux_dep, + libnm_core_aux_extern_dep_link, + libnm_core_aux_intern_dep_link, + libnm_base_dep_link, + libnm_glib_aux_dep_link, + readline_dep, ], c_args: [ '-DG_LOG_DOMAIN="nmcli"', @@ -46,6 +50,10 @@ generate_docs_nm_settings_nmcli = executable( libnmc_base_dep, libnmc_dep, libnm_libnm_aux_dep, + libnm_core_aux_extern_dep_link, + libnm_core_aux_intern_dep_link, + libnm_base_dep_link, + libnm_glib_aux_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="nmcli"', diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 2c1037f222..4de1a37ebf 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include <arpa/inet.h> -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-client-utils.h" #include "nm-vpn-helpers.h" diff --git a/clients/cloud-setup/main.c b/clients/cloud-setup/main.c index 065901760a..7cee355d75 100644 --- a/clients/cloud-setup/main.c +++ b/clients/cloud-setup/main.c @@ -8,7 +8,7 @@ #include "nmcs-provider-ec2.h" #include "nmcs-provider-gcp.h" #include "nmcs-provider-azure.h" -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" /*****************************************************************************/ diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index 581dde6a18..debe19f02c 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -53,11 +53,13 @@ executable( 'main.c', ), dependencies: [ + libnm_cloud_setup_core_dep, libnmc_base_dep, libnmc_dep, + libnm_core_aux_intern_dep_link, + libnm_core_aux_extern_dep_link, + libnm_glib_aux_dep_link, libcurl_dep, - libnm_libnm_aux_dep, - libnm_cloud_setup_core_dep, ], c_args: [ '-DG_LOG_DOMAIN="nm-cloud-setup"', diff --git a/clients/cloud-setup/tests/meson.build b/clients/cloud-setup/tests/meson.build index 1c5e6ec667..976437af9a 100644 --- a/clients/cloud-setup/tests/meson.build +++ b/clients/cloud-setup/tests/meson.build @@ -4,9 +4,10 @@ exe = executable( 'test-cloud-setup-general', 'test-cloud-setup-general.c', dependencies: [ + libnm_cloud_setup_core_dep, libnmc_base_dep, libnmc_dep, - libnm_cloud_setup_core_dep, + libnm_glib_aux_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="test"', diff --git a/clients/cloud-setup/tests/test-cloud-setup-general.c b/clients/cloud-setup/tests/test-cloud-setup-general.c index 63f3c13d59..e7d898e0e4 100644 --- a/clients/cloud-setup/tests/test-cloud-setup-general.c +++ b/clients/cloud-setup/tests/test-cloud-setup-general.c @@ -3,7 +3,7 @@ #include "libnm/nm-default-client.h" #include "nm-cloud-setup-utils.h" -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "nm-utils/nm-test-utils.h" diff --git a/clients/common/meson.build b/clients/common/meson.build index 6b91f36ff0..260df35b68 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -76,7 +76,7 @@ libnmc = static_library( dependencies: [ libnm_dep, libnm_nm_default_dep, - libnm_libnm_core_aux_dep, + libnm_core_aux_extern_dep, ], c_args: [ '-DG_LOG_DOMAIN="libnmc"', diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h index d6f163434a..0fd25c305d 100644 --- a/clients/common/nm-client-utils.h +++ b/clients/common/nm-client-utils.h @@ -9,7 +9,7 @@ #include "nm-meta-setting-desc.h" #include "nm-active-connection.h" #include "nm-device.h" -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" const NMObject **nmc_objects_sort_by_path(const NMObject *const *objs, gssize len); diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index b6e3d671fa..c0d086e433 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -12,11 +12,11 @@ #include <linux/if_ether.h> #include <linux/if_infiniband.h> -#include "nm-libnm-core-intern/nm-common-macros.h" +#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 "nm-libnm-core-intern/nm-libnm-core-utils.h" -#include "nm-libnm-core-aux/nm-libnm-core-aux.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-extern/nm-libnm-core-aux.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index 357e1efb8b..c83aa128bb 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -30,7 +30,7 @@ #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 "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "c-list/src/c-list.h" #define LOGIND_BUS_NAME "org.freedesktop.login1" diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index 28b27ae9e0..0c2c727a46 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -6,6 +6,10 @@ exe = executable( dependencies: [ libnmc_base_dep, libnmc_dep, + libnm_core_aux_intern_dep_link, + libnm_core_aux_extern_dep_link, + libnm_glib_aux_dep_link, + libnm_base_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="test"', @@ -23,8 +27,9 @@ exe = executable( 'test-libnm-core-aux.c', dependencies: [ libnm_dep, - libnm_libnm_core_aux_dep, + libnm_core_aux_extern_dep_link, libnm_nm_default_dep, + libnm_glib_aux_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="test"', diff --git a/clients/common/tests/test-libnm-core-aux.c b/clients/common/tests/test-libnm-core-aux.c index bf639878c0..a0bfea25d2 100644 --- a/clients/common/tests/test-libnm-core-aux.c +++ b/clients/common/tests/test-libnm-core-aux.c @@ -5,8 +5,8 @@ #include "libnm/nm-default-client.h" -#include "nm-libnm-core-aux/nm-libnm-core-aux.h" -#include "nm-libnm-core-intern/nm-libnm-core-utils.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" diff --git a/clients/meson.build b/clients/meson.build index 2c92e29098..3e34c705cc 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -7,6 +7,7 @@ executable( libnm_dep, libnm_nm_default_dep, libnm_libnm_aux_dep, + libnm_glib_aux_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="nm-online"', diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 89f842e643..379200dbb0 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -51,6 +51,10 @@ executable( libnmc_dep, libnmt_newt_dep, libnm_libnm_aux_dep, + libnm_core_aux_extern_dep_link, + libnm_core_aux_intern_dep_link, + libnm_base_dep_link, + libnm_glib_aux_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="nmtui"', diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 2768eaab35..1f4cab9384 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -20,7 +20,7 @@ #include <linux/if_ether.h> #include <linux/if_infiniband.h> -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" G_DEFINE_TYPE(NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index 9c86a49860..8dfc38f861 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -19,7 +19,7 @@ #include <linux/if_ether.h> #include <linux/if_infiniband.h> -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "nmt-mac-entry.h" #include "nmt-address-list.h" #include "nmt-slave-list.h" diff --git a/configure.ac b/configure.ac index 86ab9c6a5c..ba64a95835 100644 --- a/configure.ac +++ b/configure.ac @@ -1305,7 +1305,6 @@ AC_SUBST(AM_CFLAGS) AC_CONFIG_FILES([ Makefile -libnm-core/nm-version-macros.h libnm/libnm.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in @@ -1314,6 +1313,7 @@ docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc +src/libnm-core-public/nm-version-macros.h ]) AC_OUTPUT diff --git a/dispatcher/meson.build b/dispatcher/meson.build index d12e47145f..c0fe5f7187 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -40,7 +40,8 @@ executable( dependencies: [ libnm_dep, libnm_nm_default_dep, - libnm_libnm_aux_dep, + libnm_core_aux_extern_dep_link, + libnm_glib_aux_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="nm-dispatcher"', diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c index f1ec979f27..78885712f2 100644 --- a/dispatcher/nm-dispatcher-utils.c +++ b/dispatcher/nm-dispatcher-utils.c @@ -13,7 +13,7 @@ #include "nm-setting-ip6-config.h" #include "nm-setting-connection.h" -#include "nm-libnm-core-aux/nm-dispatcher-api.h" +#include "libnm-core-aux-extern/nm-dispatcher-api.h" #include "nm-utils.h" /*****************************************************************************/ diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c index 9891bf3d15..06744ff3ab 100644 --- a/dispatcher/nm-dispatcher.c +++ b/dispatcher/nm-dispatcher.c @@ -16,7 +16,7 @@ #include <arpa/inet.h> #include <glib-unix.h> -#include "nm-libnm-core-aux/nm-dispatcher-api.h" +#include "libnm-core-aux-extern/nm-dispatcher-api.h" #include "nm-dispatcher-utils.h" /*****************************************************************************/ diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index 84b4b61c66..9a86d098d2 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -9,7 +9,7 @@ exe = executable( include_directories: dispatcher_inc, dependencies: [ libnm_nm_default_dep, - libnm_glib_aux_dep, + libnm_glib_aux_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="test"', diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c index 4c37dd6c07..20097b56e6 100644 --- a/dispatcher/tests/test-dispatcher-envp.c +++ b/dispatcher/tests/test-dispatcher-envp.c @@ -9,7 +9,7 @@ #include <stdlib.h> #include "nm-dispatcher-utils.h" -#include "nm-libnm-core-aux/nm-dispatcher-api.h" +#include "libnm-core-aux-extern/nm-dispatcher-api.h" #include "nm-utils/nm-test-utils.h" diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 65eed1a534..a5b71ad3fe 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -79,8 +79,8 @@ content_files = \ dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \ dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \ dbus-org.freedesktop.NetworkManager.xml \ - $(top_builddir)/libnm-core/nm-dbus-types.xml \ - $(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \ + $(top_builddir)/src/libnm-core-public/nm-dbus-types.xml \ + $(top_builddir)/src/libnm-core-public/nm-vpn-dbus-types.xml \ $(top_builddir)/man/nmcli.xml \ $(top_builddir)/man/nmtui.xml \ $(top_builddir)/man/nm-online.xml \ diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index 7a57582caa..f921b08604 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -265,7 +265,7 @@ <chapter id="dbus-types"> <title>Types</title> - <xi:include href="../../libnm-core/nm-dbus-types.xml"/> + <xi:include href="../../src/libnm-core-public/nm-dbus-types.xml"/> </chapter> </part> @@ -289,7 +289,7 @@ </chapter> <chapter id="dbus-vpn-types"> <title>Types</title> - <xi:include href="../../libnm-core/nm-vpn-dbus-types.xml"/> + <xi:include href="../../src/libnm-core-public/nm-vpn-dbus-types.xml"/> </chapter> </part> diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index ae61d85af0..c868fff790 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -13,8 +13,10 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting functions and macros. DOC_SOURCE_DIR= \ - $(top_srcdir)/libnm-core \ - $(top_builddir)/libnm-core \ + $(top_builddir)/src/libnm-core-public \ + $(top_srcdir)/src/libnm-core-public \ + $(top_builddir)/src/libnm-core-impl \ + $(top_srcdir)/src/libnm-core-impl \ $(top_srcdir)/libnm \ $(top_builddir)/libnm @@ -28,8 +30,8 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml FIXXREF_OPTIONS= # Used for dependencies. -HFILE_GLOB=$(top_srcdir)/libnm-core/*.h $(top_srcdir)/libnm/*.h -CFILE_GLOB=$(top_srcdir)/libnm-core/*.c $(top_srcdir)/libnm/*.c +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 # Header files to ignore when scanning. IGNORE_HFILES= \ @@ -84,10 +86,10 @@ extra_files = libnm.png # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/libnm \ + -I$(top_builddir)/src/libnm-core-public \ + -I$(top_srcdir)/src/libnm-core-public \ -I$(top_builddir)/libnm \ + -I$(top_srcdir)/libnm \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 102009899d..7cb5c646ee 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -1,10 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -src_dirs = [ - libnm_core_inc, - libnm_inc, -] - private_headers = [ 'common.h', 'nm-core-internal.h', @@ -57,7 +52,10 @@ version_xml = configure_file( gnome.gtkdoc( libnm_name, main_xml: libnm_name + '-docs.xml', - src_dir: src_dirs, + src_dir: [ + libnm_core_public_inc, + libnm_inc, + ], dependencies: libnm_dep, scan_args: scan_args, scanobjs_args: '--type-init-func="g_type_init();"', diff --git a/examples/C/qt/meson.build b/examples/C/qt/meson.build index 7e4e127419..8b905bd61d 100644 --- a/examples/C/qt/meson.build +++ b/examples/C/qt/meson.build @@ -6,13 +6,6 @@ examples = [ ['change-ipv4-addresses', []], ] -deps = [ - dbus_dep, - qt_core_dep, - qt_dbus_dep, - qt_network_dep, -] - moc = find_program('moc-qt4', required: false) if not moc.found() moc = qt_core_dep.get_pkgconfig_variable('moc_location') @@ -34,8 +27,13 @@ foreach example: examples executable( example[0], example[0] + '.cpp', - include_directories: libnm_core_inc, - dependencies: deps, + include_directories: libnm_core_public_inc, + dependencies: [ + dbus_dep, + qt_core_dep, + qt_dbus_dep, + qt_network_dep, + ], link_depends: example[1], ) endforeach diff --git a/libnm-core/meson.build b/libnm-core/meson.build deleted file mode 100644 index ec9fb8ce52..0000000000 --- a/libnm-core/meson.build +++ /dev/null @@ -1,280 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -libnm_core_inc = include_directories('.') - -nm_version_macro_header = configure_file( - input: 'nm-version-macros.h.in', - output: '@BASENAME@', - configuration: data_conf, -) - -libnm_core_nm_default_dep = declare_dependency( - sources: nm_version_macro_header, - include_directories: libnm_core_inc, - dependencies: glib_nm_default_dep, -) - -libnm_core_headers = files( - 'nm-connection.h', - 'nm-core-types.h', - 'nm-dbus-interface.h', - 'nm-errors.h', - 'nm-keyfile.h', - 'nm-setting-6lowpan.h', - 'nm-setting-8021x.h', - 'nm-setting-adsl.h', - 'nm-setting-bluetooth.h', - 'nm-setting-bond.h', - 'nm-setting-bridge-port.h', - 'nm-setting-bridge.h', - 'nm-setting-cdma.h', - 'nm-setting-connection.h', - 'nm-setting-dcb.h', - 'nm-setting-dummy.h', - 'nm-setting-ethtool.h', - 'nm-setting-generic.h', - 'nm-setting-gsm.h', - 'nm-setting-hostname.h', - 'nm-setting-infiniband.h', - 'nm-setting-ip-config.h', - 'nm-setting-ip-tunnel.h', - 'nm-setting-ip4-config.h', - 'nm-setting-ip6-config.h', - 'nm-setting-macsec.h', - 'nm-setting-macvlan.h', - 'nm-setting-match.h', - 'nm-setting-olpc-mesh.h', - 'nm-setting-ovs-bridge.h', - 'nm-setting-ovs-dpdk.h', - 'nm-setting-ovs-external-ids.h', - 'nm-setting-ovs-interface.h', - 'nm-setting-ovs-patch.h', - 'nm-setting-ovs-port.h', - 'nm-setting-ppp.h', - 'nm-setting-pppoe.h', - 'nm-setting-proxy.h', - 'nm-setting-serial.h', - 'nm-setting-sriov.h', - 'nm-setting-tc-config.h', - 'nm-setting-team-port.h', - 'nm-setting-team.h', - 'nm-setting-tun.h', - 'nm-setting-user.h', - 'nm-setting-veth.h', - 'nm-setting-vlan.h', - 'nm-setting-vpn.h', - 'nm-setting-vrf.h', - 'nm-setting-vxlan.h', - 'nm-setting-wifi-p2p.h', - 'nm-setting-wimax.h', - 'nm-setting-wired.h', - 'nm-setting-wireguard.h', - 'nm-setting-wireless-security.h', - 'nm-setting-wireless.h', - 'nm-setting-wpan.h', - 'nm-setting.h', - 'nm-simple-connection.h', - 'nm-utils.h', - 'nm-version.h', - 'nm-vpn-dbus-interface.h', - 'nm-vpn-editor-plugin.h', - 'nm-vpn-plugin-info.h', -) - -libnm_core_enum_sources = gnome.mkenums_simple( - 'nm-core-enum-types', - sources: libnm_core_headers + [nm_version_macro_header], - identifier_prefix: nm_id_prefix, - body_prefix: '#include "libnm-core/nm-default-libnm-core.h"', - install_header: true, - install_dir: libnm_pkgincludedir, -) - -libnm_libnm_core_intern = static_library( - 'nm-libnm-core-intern', - sources: files( - 'nm-libnm-core-intern/nm-auth-subject.c', - 'nm-libnm-core-intern/nm-libnm-core-utils.c', - ) + [libnm_core_enum_sources[1]], - dependencies: [ - libnm_core_nm_default_dep, - libnm_base_dep, - ], - c_args: [ - '-DG_LOG_DOMAIN="libnm"', - ], -) - -libnm_libnm_core_intern_dep = declare_dependency( - sources: [libnm_core_enum_sources[1], nm_version_macro_header], - include_directories: [libnm_core_inc, shared_inc], - dependencies: [ - libnm_glib_aux_dep, - libnm_base_dep, - ], - link_with: libnm_libnm_core_intern, -) - -libnm_crypto = static_library( - 'nm-crypto', - sources: 'nm-crypto-@0@.c'.format(crypto), - dependencies: [ - crypto_dep, - libnm_glib_aux_dep, - ], - c_args: [ - '-DG_LOG_DOMAIN="libnm"', - ], -) - -libnm_core_settings_sources = files( - 'nm-setting-6lowpan.c', - 'nm-setting-8021x.c', - 'nm-setting-adsl.c', - 'nm-setting-bluetooth.c', - 'nm-setting-bond.c', - 'nm-setting-bridge-port.c', - 'nm-setting-bridge.c', - 'nm-setting-cdma.c', - 'nm-setting-connection.c', - 'nm-setting-dcb.c', - 'nm-setting-dummy.c', - 'nm-setting-ethtool.c', - 'nm-setting-generic.c', - 'nm-setting-gsm.c', - 'nm-setting-hostname.c', - 'nm-setting-infiniband.c', - 'nm-setting-ip-config.c', - 'nm-setting-ip-tunnel.c', - 'nm-setting-ip4-config.c', - 'nm-setting-ip6-config.c', - 'nm-setting-macsec.c', - 'nm-setting-macvlan.c', - 'nm-setting-match.c', - 'nm-setting-olpc-mesh.c', - 'nm-setting-ovs-bridge.c', - 'nm-setting-ovs-dpdk.c', - 'nm-setting-ovs-external-ids.c', - 'nm-setting-ovs-interface.c', - 'nm-setting-ovs-patch.c', - 'nm-setting-ovs-port.c', - 'nm-setting-ppp.c', - 'nm-setting-pppoe.c', - 'nm-setting-proxy.c', - 'nm-setting-serial.c', - 'nm-setting-sriov.c', - 'nm-setting-tc-config.c', - 'nm-setting-team-port.c', - 'nm-setting-team.c', - 'nm-setting-tun.c', - 'nm-setting-user.c', - 'nm-setting-veth.c', - 'nm-setting-vlan.c', - 'nm-setting-vpn.c', - 'nm-setting-vrf.c', - 'nm-setting-vxlan.c', - 'nm-setting-wifi-p2p.c', - 'nm-setting-wimax.c', - 'nm-setting-wired.c', - 'nm-setting-wireguard.c', - 'nm-setting-wireless-security.c', - 'nm-setting-wireless.c', - 'nm-setting-wpan.c', -) - -libnm_core_sources = libnm_core_settings_sources + files( - 'nm-connection.c', - 'nm-crypto.c', - 'nm-dbus-utils.c', - 'nm-errors.c', - 'nm-keyfile-utils.c', - 'nm-keyfile.c', - 'nm-meta-setting-base-impl.c', - 'nm-property-compare.c', - 'nm-setting.c', - 'nm-simple-connection.c', - 'nm-team-utils.c', - 'nm-utils.c', - 'nm-vpn-editor-plugin.c', - 'nm-vpn-plugin-info.c', -) - -libnm_core = static_library( - 'nm-core', - sources: libnm_core_sources + libnm_core_enum_sources + [nm_version_macro_header], - include_directories: top_inc, - dependencies: [ - dl_dep, - libnm_systemd_shared_dep, - libnm_glib_aux_dep, - uuid_dep, - ], - c_args: [ - '-DG_LOG_DOMAIN="libnm"', - ], - link_with: [ - libnm_crypto, - libnm_libnm_core_intern, - ], -) - -libnm_core_dep = declare_dependency( - sources: [libnm_core_enum_sources[1], nm_version_macro_header], - include_directories: [libnm_core_inc, shared_inc], - dependencies: glib_dep, - link_with: libnm_core, -) - -libnm_libnm_core_aux = static_library( - 'nm-libnm-core-aux', - sources: files( - 'nm-libnm-core-aux/nm-libnm-core-aux.c', - ) + [libnm_core_enum_sources[1]], - dependencies: libnm_glib_aux_dep, - c_args: [ - '-DG_LOG_DOMAIN="libnm"', - ], - link_with: [ - libnm_libnm_core_intern, - libnm_base, - ], -) - -libnm_libnm_core_aux_dep = declare_dependency( - sources: [libnm_core_enum_sources[1], nm_version_macro_header], - include_directories: [libnm_core_inc, shared_inc], - dependencies: glib_dep, - link_with: libnm_libnm_core_aux, -) - -docbooks = [ - ['nm-dbus-types', 'nm-dbus-interface.h', 'NetworkManager D-Bus API Types'], - ['nm-vpn-dbus-types', 'nm-vpn-dbus-interface.h', 'VPN Plugin D-Bus API Types'], -] - -foreach docbook: docbooks - output = docbook[0] + '.xml' - - xml = custom_target( - output, - input: docbook[1], - output: output, - capture: true, - command: [ - perl, - join_paths(source_root, 'tools', 'enums-to-docbook.pl'), - docbook[0], - docbook[2], - '@INPUT@', - ], - # FIXME: gtkdoc does not depend directly on this. - # https://github.com/mesonbuild/meson/pull/2806 - build_by_default: true, - ) - - content_files += xml.full_path() -endforeach - -if enable_tests - subdir('tests') -endif diff --git a/libnm-core/nm-libnm-core-aux/README.md b/libnm-core/nm-libnm-core-aux/README.md deleted file mode 100644 index 01f361b44d..0000000000 --- a/libnm-core/nm-libnm-core-aux/README.md +++ /dev/null @@ -1,21 +0,0 @@ -nm-libnm-core-aux is a static library that: - - - uses parts of "libnm-core", that are public API of "libnm" - - can be statically linked into users of libnm-core (like libnm - and NetworkManager). - - that can also be statically linked into other users of libnm. - -Basically, it is a static library with utility functions that extends -libnm-core (the part that is public API of libnm), but can also be -used without full libnm. - -That means: - - - you can use it everywhere where you either statically link - with libnm-core, or dynamically link with libnm. - - you cannot use it inside libnm-core itself. This is the difference - between nm-libnm-core-intern and nm-libnm-core-aux. - -Also, since nm-libnm-core-aux itself only uses public (stable) -API of libnm, you theoretically can copy the sources into your -own source tree. diff --git a/libnm-core/nm-libnm-core-intern/README.md b/libnm-core/nm-libnm-core-intern/README.md deleted file mode 100644 index 2dcc3c80cd..0000000000 --- a/libnm-core/nm-libnm-core-intern/README.md +++ /dev/null @@ -1,21 +0,0 @@ -nm-libnm-core-intern is a static library that: - - - uses parts of "libnm-core", that are public API of "libnm" - - that is statically linked into libnm-core (and thus libnm - and NetworkManager). - - that can also be statically linked into other users of libnm. - -Basically, it is a static library with utility functions that extends -libnm-core (the part that is public API of libnm), but it is used -by libnm-core. - -That means: - - - you can use it everywhere where you either statically link - with libnm-core, or dynamically link with libnm. - - you can even use it inside of libnm-core itself. This is the difference - between nm-libnm-core-intern and nm-libnm-core-aux. - -Also, since nm-libnm-core-intern itself only uses public (stable) -API of libnm, you theoretically can copy the sources into your -own source tree. diff --git a/libnm/meson.build b/libnm/meson.build index d0846419c5..8462d4bc50 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -3,9 +3,16 @@ libnm_inc = include_directories('.') libnm_nm_default_dep = declare_dependency( - sources: libnm_core_enum_sources[1], - include_directories: libnm_inc, - dependencies: libnm_core_nm_default_dep, + include_directories: [ + libnm_inc, + libnm_core_public_inc, + top_inc, + shared_inc, + src_inc, + ], + dependencies: [ + libnm_core_public_dep, + ], ) libnm_headers = files( @@ -135,7 +142,7 @@ libnm_static = static_library( sources: libnm_sources + libnm_enum_sources, dependencies: [ libnmdbus_dep, - libnm_libnm_core_intern_dep, + libnm_core_aux_intern_dep, libnm_nm_default_dep, libnm_udev_aux_dep, libudev_dep, @@ -154,10 +161,11 @@ libnm = shared_library( dependencies: libnm_nm_default_dep, link_whole: [ libnm_static, - libnm_core, + libnm_core_impl, libnmdbus, libnm_systemd_logging_stub, libnm_glib_aux, + libnm_base, ], link_args: '-Wl,--version-script,@0@'.format(linker_script), link_depends: linker_script, @@ -194,8 +202,11 @@ if enable_introspection libnm_gir = gnome.generate_gir( libnm, - sources: libnm_core_sources + libnm_core_headers + libnm_core_enum_sources + 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_sources + libnm_headers + libnm_enum_sources + [nm_version_macro_header], includes: 'Gio-2.0', + include_directories: [ + libnm_core_public_inc, + ], nsversion: nm_gir_version, namespace: 'NM', identifier_prefix: nm_id_prefix, @@ -300,8 +311,7 @@ libnm_libnm_aux = static_library( '-DG_LOG_DOMAIN="libnmc"', ], dependencies: [ - libnm_core_nm_default_dep, - libnm_libnm_core_intern_dep, + libnm_core_aux_intern_dep, libnm_dep, ], ) diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c index 80fb25115b..60c68f3478 100644 --- a/libnm/nm-active-connection.c +++ b/libnm/nm-active-connection.c @@ -10,7 +10,7 @@ #include "nm-dbus-interface.h" #include "nm-object-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-device.h" #include "nm-connection.h" #include "nm-vpn-connection.h" diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c index 5fd55bc1d7..951e66229f 100644 --- a/libnm/nm-checkpoint.c +++ b/libnm/nm-checkpoint.c @@ -7,7 +7,7 @@ #include "nm-checkpoint.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-interface.h" #include "nm-device.h" #include "nm-object-private.h" diff --git a/libnm/nm-client.c b/libnm/nm-client.c index f1b259700f..a2d953cee0 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -13,12 +13,12 @@ #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 "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-access-point.h" #include "nm-active-connection.h" #include "nm-checkpoint.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-helpers.h" #include "nm-device-6lowpan.h" #include "nm-device-adsl.h" diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index 1214964161..caf9cdcaef 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -11,7 +11,7 @@ #include "nm-utils.h" #include "nm-device-bond.h" #include "nm-object-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index 732c5a2ceb..2a7226e92b 100644 --- a/libnm/nm-device-bridge.c +++ b/libnm/nm-device-bridge.c @@ -11,7 +11,7 @@ #include "nm-utils.h" #include "nm-device-bridge.h" #include "nm-object-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm/nm-device-ip-tunnel.c b/libnm/nm-device-ip-tunnel.c index a6d2ef4a4c..c370f79e20 100644 --- a/libnm/nm-device-ip-tunnel.c +++ b/libnm/nm-device-ip-tunnel.c @@ -11,7 +11,7 @@ #include "nm-setting-ip-tunnel.h" #include "nm-utils.h" #include "nm-object-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm/nm-device-ovs-bridge.c b/libnm/nm-device-ovs-bridge.c index 9c17554899..c95355161e 100644 --- a/libnm/nm-device-ovs-bridge.c +++ b/libnm/nm-device-ovs-bridge.c @@ -11,7 +11,7 @@ #include "nm-setting-ovs-bridge.h" #include "nm-setting-ovs-port.h" #include "nm-setting-connection.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm/nm-device-ovs-port.c b/libnm/nm-device-ovs-port.c index 1b3faa53f1..b52fdf9b21 100644 --- a/libnm/nm-device-ovs-port.c +++ b/libnm/nm-device-ovs-port.c @@ -11,7 +11,7 @@ #include "nm-setting-ovs-port.h" #include "nm-setting-ovs-port.h" #include "nm-setting-connection.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c index d76dd5c1c1..4af9f8e60a 100644 --- a/libnm/nm-device-team.c +++ b/libnm/nm-device-team.c @@ -11,7 +11,7 @@ #include "nm-setting-team.h" #include "nm-utils.h" #include "nm-object-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm/nm-device-wifi-p2p.c b/libnm/nm-device-wifi-p2p.c index 019bf1cf6a..d946977383 100644 --- a/libnm/nm-device-wifi-p2p.c +++ b/libnm/nm-device-wifi-p2p.c @@ -13,7 +13,7 @@ #include "nm-utils.h" #include "nm-wifi-p2p-peer.h" #include "nm-object-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-helpers.h" /*****************************************************************************/ diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 90e4a302f2..76a6e824ab 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -17,7 +17,7 @@ #include "nm-utils.h" #include "nm-access-point.h" #include "nm-object-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-helpers.h" /*****************************************************************************/ diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 9cb88dae8e..b1ace53bed 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -20,7 +20,7 @@ #include "nm-ip6-config.h" #include "nm-object-private.h" #include "nm-remote-connection.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-utils.h" #include "nm-dbus-helpers.h" #include "nm-device-tun.h" diff --git a/libnm/nm-dns-manager.c b/libnm/nm-dns-manager.c index 6261c71ac6..9c5f0cf0f7 100644 --- a/libnm/nm-dns-manager.c +++ b/libnm/nm-dns-manager.c @@ -12,7 +12,7 @@ #include "nm-client.h" #include "nm-object-private.h" #include "nm-dbus-helpers.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /***************************************************************************** * NMDnsEntry diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c index 1663c62257..4c336213c9 100644 --- a/libnm/nm-ip-config.c +++ b/libnm/nm-ip-config.c @@ -14,7 +14,7 @@ #include "nm-dbus-interface.h" #include "nm-object-private.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c index 1000e04d1a..02abd560c6 100644 --- a/libnm/nm-libnm-utils.c +++ b/libnm/nm-libnm-utils.c @@ -9,7 +9,7 @@ #include "nm-libnm-utils.h" #include "nm-glib-aux/nm-time-utils.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-object.h" /*****************************************************************************/ diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 00e520d7e5..eaf178e7db 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -16,7 +16,7 @@ #include "nm-object-private.h" #include "nm-dbus-helpers.h" #include "nm-client.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "c-list/src/c-list.h" /*****************************************************************************/ diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index b5b12bf020..8ad1e51c72 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -12,7 +12,7 @@ #include "nm-dbus-interface.h" #include "nm-utils.h" #include "nm-setting-connection.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-remote-connection-private.h" #include "nm-object-private.h" #include "nm-dbus-helpers.h" diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 8f826ed86b..771706610d 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -8,7 +8,7 @@ #include "nm-secret-agent-old.h" #include "c-list/src/c-list.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-helpers.h" #include "nm-dbus-interface.h" #include "nm-enum-types.h" diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index f45d0c09e9..2ff83efa3c 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -15,7 +15,7 @@ #include "nm-utils.h" #include "nm-connection.h" #include "nm-dbus-helpers.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-simple-connection.h" #include "nm-vpn-service-plugin.h" diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 34de21b875..f89ea4ce7f 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -17,7 +17,7 @@ #include "nm-utils.h" #include "nm-connection.h" #include "nm-dbus-helpers.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-simple-connection.h" #include "introspection/org.freedesktop.NetworkManager.VPN.Plugin.h" diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build index 08eecfbdee..efc86a71b3 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -16,13 +16,16 @@ foreach test_unit: test_units libnm_enum_sources[1], ], dependencies: [ - libnm_core_dep, + libnm_core_impl_dep_link, libnm_nm_default_dep, ], c_args: [ '-DG_LOG_DOMAIN="test"', ], - link_with: libnm_static, + link_with: [ + libnm_static, + libnm_base, + ], ) test( diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c index a90acd9b10..f97cd62c20 100644 --- a/libnm/tests/test-libnm.c +++ b/libnm/tests/test-libnm.c @@ -22,7 +22,7 @@ #include "nm-libnm-utils.h" #include "nm-object.h" #include "nm-vpn-service-plugin.h" -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "nm-utils/nm-test-utils.h" diff --git a/meson.build b/meson.build index 4adcf0fec7..8a42183594 100644 --- a/meson.build +++ b/meson.build @@ -917,8 +917,7 @@ content_files = [] subdir('introspection') subdir('shared') -subdir('libnm-core') -subdir('src/core') +subdir('src') subdir('libnm') subdir('dispatcher') subdir('clients') diff --git a/po/POTFILES.in b/po/POTFILES.in index 21507eecee..db73203878 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -33,9 +33,9 @@ clients/tui/nmt-page-bridge.c clients/tui/nmt-page-dsl.c clients/tui/nmt-page-ethernet.c clients/tui/nmt-page-infiniband.c +clients/tui/nmt-page-ip-tunnel.c clients/tui/nmt-page-ip4.c clients/tui/nmt-page-ip6.c -clients/tui/nmt-page-ip-tunnel.c clients/tui/nmt-page-ppp.c clients/tui/nmt-page-team-port.c clients/tui/nmt-page-team.c @@ -51,67 +51,7 @@ clients/tui/nmtui-connect.c clients/tui/nmtui-edit.c clients/tui/nmtui-hostname.c clients/tui/nmtui.c -libnm-core/nm-crypto.c -libnm-core/nm-crypto-gnutls.c -libnm-core/nm-crypto-nss.c -libnm-core/nm-connection.c -libnm-core/nm-dbus-utils.c -libnm-core/nm-keyfile-utils.c -libnm-core/nm-keyfile.c -libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c -libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c -libnm-core/nm-setting-6lowpan.c -libnm-core/nm-setting-8021x.c -libnm-core/nm-setting-adsl.c -libnm-core/nm-setting-bluetooth.c -libnm-core/nm-setting-bond.c -libnm-core/nm-setting-bridge-port.c -libnm-core/nm-setting-bridge.c -libnm-core/nm-setting-cdma.c -libnm-core/nm-setting-connection.c -libnm-core/nm-setting-dcb.c -libnm-core/nm-setting-ethtool.c -libnm-core/nm-setting-gsm.c -libnm-core/nm-setting-infiniband.c -libnm-core/nm-setting-ip-config.c -libnm-core/nm-setting-ip-tunnel.c -libnm-core/nm-setting-ip4-config.c -libnm-core/nm-setting-ip6-config.c -libnm-core/nm-setting-macsec.c -libnm-core/nm-setting-macvlan.c -libnm-core/nm-setting-match.c -libnm-core/nm-setting-olpc-mesh.c -libnm-core/nm-setting-ovs-bridge.c -libnm-core/nm-setting-ovs-external-ids.c -libnm-core/nm-setting-ovs-interface.c -libnm-core/nm-setting-ovs-patch.c -libnm-core/nm-setting-ovs-port.c -libnm-core/nm-setting-ppp.c -libnm-core/nm-setting-pppoe.c -libnm-core/nm-setting-proxy.c -libnm-core/nm-setting-sriov.c -libnm-core/nm-setting-tc-config.c -libnm-core/nm-setting-team-port.c -libnm-core/nm-setting-team.c -libnm-core/nm-setting-tun.c -libnm-core/nm-setting-user.c -libnm-core/nm-setting-veth.c -libnm-core/nm-setting-vlan.c -libnm-core/nm-setting-vrf.c -libnm-core/nm-setting-vpn.c -libnm-core/nm-setting-vxlan.c -libnm-core/nm-setting-wifi-p2p.c -libnm-core/nm-setting-wimax.c -libnm-core/nm-setting-wired.c -libnm-core/nm-setting-wireguard.c -libnm-core/nm-setting-wireless-security.c -libnm-core/nm-setting-wireless.c -libnm-core/nm-setting-wpan.c -libnm-core/nm-setting.c -libnm-core/nm-team-utils.c -libnm-core/nm-utils.c -libnm-core/nm-vpn-editor-plugin.c -libnm-core/nm-vpn-plugin-info.c +data/org.freedesktop.NetworkManager.policy.in.in libnm/nm-client.c libnm/nm-device-6lowpan.c libnm/nm-device-adsl.c @@ -145,16 +85,9 @@ libnm/nm-remote-connection.c libnm/nm-secret-agent-old.c libnm/nm-vpn-plugin-old.c libnm/nm-vpn-service-plugin.c -data/org.freedesktop.NetworkManager.policy.in.in shared/nm-glib-aux/nm-shared-utils.c shared/nm-log-core/nm-logging.c src/core/NetworkManagerUtils.c -src/core/main.c -src/core/main-utils.c -src/core/dhcp/nm-dhcp-dhclient.c -src/core/dhcp/nm-dhcp-dhclient-utils.c -src/core/dhcp/nm-dhcp-manager.c -src/core/dns/nm-dns-manager.c src/core/devices/adsl/nm-device-adsl.c src/core/devices/bluetooth/nm-bluez-manager.c src/core/devices/bluetooth/nm-device-bt.c @@ -162,8 +95,8 @@ src/core/devices/nm-device-6lowpan.c src/core/devices/nm-device-bond.c src/core/devices/nm-device-bridge.c src/core/devices/nm-device-dummy.c -src/core/devices/nm-device-ethernet.c src/core/devices/nm-device-ethernet-utils.c +src/core/devices/nm-device-ethernet.c src/core/devices/nm-device-infiniband.c src/core/devices/nm-device-ip-tunnel.c src/core/devices/nm-device-macvlan.c @@ -178,8 +111,75 @@ src/core/devices/wifi/nm-device-olpc-mesh.c src/core/devices/wifi/nm-device-wifi.c src/core/devices/wifi/nm-wifi-utils.c src/core/devices/wwan/nm-modem-broadband.c +src/core/dhcp/nm-dhcp-dhclient-utils.c +src/core/dhcp/nm-dhcp-dhclient.c +src/core/dhcp/nm-dhcp-manager.c +src/core/dns/nm-dns-manager.c +src/core/main-utils.c +src/core/main.c src/core/nm-config.c 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-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 +src/libnm-core-impl/nm-crypto-gnutls.c +src/libnm-core-impl/nm-crypto-nss.c +src/libnm-core-impl/nm-crypto.c +src/libnm-core-impl/nm-dbus-utils.c +src/libnm-core-impl/nm-keyfile-utils.c +src/libnm-core-impl/nm-keyfile.c +src/libnm-core-impl/nm-setting-6lowpan.c +src/libnm-core-impl/nm-setting-8021x.c +src/libnm-core-impl/nm-setting-adsl.c +src/libnm-core-impl/nm-setting-bluetooth.c +src/libnm-core-impl/nm-setting-bond.c +src/libnm-core-impl/nm-setting-bridge-port.c +src/libnm-core-impl/nm-setting-bridge.c +src/libnm-core-impl/nm-setting-cdma.c +src/libnm-core-impl/nm-setting-connection.c +src/libnm-core-impl/nm-setting-dcb.c +src/libnm-core-impl/nm-setting-ethtool.c +src/libnm-core-impl/nm-setting-gsm.c +src/libnm-core-impl/nm-setting-infiniband.c +src/libnm-core-impl/nm-setting-ip-config.c +src/libnm-core-impl/nm-setting-ip-tunnel.c +src/libnm-core-impl/nm-setting-ip4-config.c +src/libnm-core-impl/nm-setting-ip6-config.c +src/libnm-core-impl/nm-setting-macsec.c +src/libnm-core-impl/nm-setting-macvlan.c +src/libnm-core-impl/nm-setting-match.c +src/libnm-core-impl/nm-setting-olpc-mesh.c +src/libnm-core-impl/nm-setting-ovs-bridge.c +src/libnm-core-impl/nm-setting-ovs-external-ids.c +src/libnm-core-impl/nm-setting-ovs-interface.c +src/libnm-core-impl/nm-setting-ovs-patch.c +src/libnm-core-impl/nm-setting-ovs-port.c +src/libnm-core-impl/nm-setting-ppp.c +src/libnm-core-impl/nm-setting-pppoe.c +src/libnm-core-impl/nm-setting-proxy.c +src/libnm-core-impl/nm-setting-sriov.c +src/libnm-core-impl/nm-setting-tc-config.c +src/libnm-core-impl/nm-setting-team-port.c +src/libnm-core-impl/nm-setting-team.c +src/libnm-core-impl/nm-setting-tun.c +src/libnm-core-impl/nm-setting-user.c +src/libnm-core-impl/nm-setting-veth.c +src/libnm-core-impl/nm-setting-vlan.c +src/libnm-core-impl/nm-setting-vpn.c +src/libnm-core-impl/nm-setting-vrf.c +src/libnm-core-impl/nm-setting-vxlan.c +src/libnm-core-impl/nm-setting-wifi-p2p.c +src/libnm-core-impl/nm-setting-wimax.c +src/libnm-core-impl/nm-setting-wired.c +src/libnm-core-impl/nm-setting-wireguard.c +src/libnm-core-impl/nm-setting-wireless-security.c +src/libnm-core-impl/nm-setting-wireless.c +src/libnm-core-impl/nm-setting-wpan.c +src/libnm-core-impl/nm-setting.c +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 diff --git a/shared/meson.build b/shared/meson.build index 52eb6b9b10..a51497000e 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -4,8 +4,8 @@ shared_inc = include_directories('.') glib_nm_default_dep = declare_dependency( include_directories: [ - top_inc, shared_inc, + top_inc, ], dependencies: [ glib_dep, @@ -139,7 +139,17 @@ libnm_glib_aux = static_library( ) libnm_glib_aux_dep = declare_dependency( - dependencies: glib_nm_default_dep, + 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, ) @@ -165,7 +175,7 @@ libnm_base = static_library( sources: files( 'nm-base/nm-ethtool-base.c', ), - dependencies: libnm_glib_aux_dep, + dependencies: libnm_glib_aux_dep_link, c_args: [ '-DG_LOG_DOMAIN="libnm"', ], @@ -174,6 +184,10 @@ libnm_base = static_library( 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, ) @@ -192,7 +206,7 @@ libnm_log_core = static_library( libnm_log_core_dep = declare_dependency( include_directories: shared_inc, dependencies: [ - libnm_glib_aux_dep, + libnm_glib_aux_dep_link, ], link_with: libnm_log_core, ) @@ -215,7 +229,7 @@ libnm_platform = static_library( libnm_platform_dep = declare_dependency( include_directories: shared_inc, dependencies: [ - libnm_glib_aux_dep, + libnm_glib_aux_dep_link, ], link_with: libnm_platform, ) diff --git a/shared/nm-glib-aux/tests/meson.build b/shared/nm-glib-aux/tests/meson.build index 464f4e7c86..a28d3b0802 100644 --- a/shared/nm-glib-aux/tests/meson.build +++ b/shared/nm-glib-aux/tests/meson.build @@ -6,7 +6,7 @@ exe = executable( c_args: [ '-DG_LOG_DOMAIN="test"', ], - dependencies: libnm_glib_aux_dep, + dependencies: libnm_glib_aux_dep_link, link_with: libnm_systemd_logging_stub, ) @@ -25,7 +25,7 @@ if jansson_dep.found() '-DG_LOG_DOMAIN="test"', ], dependencies: [ - libnm_glib_aux_dep, + libnm_glib_aux_dep_link, jansson_dep, dl_dep, ], diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index 5407221097..08402729f9 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -14,12 +14,12 @@ #include "nm-glib-aux/nm-c-list.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils.h" #include "nm-setting-connection.h" #include "nm-setting-ip4-config.h" #include "nm-setting-ip6-config.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "platform/nmp-object.h" #include "platform/nm-platform.h" diff --git a/src/core/devices/bluetooth/meson.build b/src/core/devices/bluetooth/meson.build index d5f260686f..086b0dee80 100644 --- a/src/core/devices/bluetooth/meson.build +++ b/src/core/devices/bluetooth/meson.build @@ -7,7 +7,12 @@ libnm_device_plugin_bluetooth_static = static_library( 'nm-bt-error.c', 'nm-device-bt.c', ) + (enable_bluez5_dun ? files('nm-bluez5-dun.c') : files()), + c_args: [ + '-DG_LOG_DOMAIN="NetworkManager"', + ], dependencies: [ + libnm_core_public_dep, + libnm_core_intern_dep, core_default_dep, libnm_wwan_dep, bluez5_dep, diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c index dd998d29b0..fe0350c7f9 100644 --- a/src/core/devices/bluetooth/nm-bluez-manager.c +++ b/src/core/devices/bluetooth/nm-bluez-manager.c @@ -23,7 +23,7 @@ #include "nm-device-bt.h" #include "nm-manager.h" #include "nm-bluez5-dun.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" #include "nm-std-aux/nm-dbus-compat.h" diff --git a/src/core/devices/bluetooth/nm-device-bt.c b/src/core/devices/bluetooth/nm-device-bt.c index c07be2d3b9..2c336587ed 100644 --- a/src/core/devices/bluetooth/nm-device-bt.c +++ b/src/core/devices/bluetooth/nm-device-bt.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <linux/if_ether.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-bluez-common.h" #include "nm-bluez-manager.h" #include "devices/nm-device-private.h" diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c index f68c080b18..b650e04753 100644 --- a/src/core/devices/nm-device-bond.c +++ b/src/core/devices/nm-device-bond.c @@ -14,7 +14,7 @@ #include "nm-device-private.h" #include "platform/nm-platform.h" #include "nm-device-factory.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-ip4-config.h" #define _NMLOG_DEVICE_TYPE NMDeviceBond diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c index c919d85dfb..8ace4a4d54 100644 --- a/src/core/devices/nm-device-bridge.c +++ b/src/core/devices/nm-device-bridge.c @@ -14,7 +14,7 @@ #include "nm-device-private.h" #include "platform/nm-platform.h" #include "nm-device-factory.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define _NMLOG_DEVICE_TYPE NMDeviceBridge #include "nm-device-logging.h" diff --git a/src/core/devices/nm-device-dummy.c b/src/core/devices/nm-device-dummy.c index 13cfd3b0a3..b553299ada 100644 --- a/src/core/devices/nm-device-dummy.c +++ b/src/core/devices/nm-device-dummy.c @@ -16,7 +16,7 @@ #include "platform/nm-platform.h" #include "nm-device-factory.h" #include "nm-setting-dummy.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define _NMLOG_DEVICE_TYPE NMDeviceDummy #include "nm-device-logging.h" diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c index 44428869cd..92d70aa8f9 100644 --- a/src/core/devices/nm-device-ethernet.c +++ b/src/core/devices/nm-device-ethernet.c @@ -32,7 +32,7 @@ #include "nm-device-ethernet-utils.h" #include "settings/nm-settings.h" #include "nm-device-factory.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "nm-udev-aux/nm-udev-utils.h" #include "nm-device-veth.h" diff --git a/src/core/devices/nm-device-factory.c b/src/core/devices/nm-device-factory.c index 81124a8dc3..8dbc985ceb 100644 --- a/src/core/devices/nm-device-factory.c +++ b/src/core/devices/nm-device-factory.c @@ -13,7 +13,7 @@ #include "platform/nm-platform.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-bluetooth.h" #define PLUGIN_PREFIX "libnm-device-plugin-" diff --git a/src/core/devices/nm-device-generic.c b/src/core/devices/nm-device-generic.c index a319666a9c..497a5f94b7 100644 --- a/src/core/devices/nm-device-generic.c +++ b/src/core/devices/nm-device-generic.c @@ -9,7 +9,7 @@ #include "nm-device-private.h" #include "platform/nm-platform.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/src/core/devices/nm-device-infiniband.c b/src/core/devices/nm-device-infiniband.c index f54ffcf038..feee1583aa 100644 --- a/src/core/devices/nm-device-infiniband.c +++ b/src/core/devices/nm-device-infiniband.c @@ -16,7 +16,7 @@ #include "nm-ip4-config.h" #include "platform/nm-platform.h" #include "nm-device-factory.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define NM_DEVICE_INFINIBAND_IS_PARTITION "is-partition" diff --git a/src/core/devices/nm-device-ip-tunnel.c b/src/core/devices/nm-device-ip-tunnel.c index da6afb3b50..75cc222e92 100644 --- a/src/core/devices/nm-device-ip-tunnel.c +++ b/src/core/devices/nm-device-ip-tunnel.c @@ -18,7 +18,7 @@ #include "nm-manager.h" #include "platform/nm-platform.h" #include "nm-device-factory.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "settings/nm-settings.h" #include "nm-act-request.h" #include "nm-ip4-config.h" diff --git a/src/core/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c index 51b820a165..839a3f094c 100644 --- a/src/core/devices/nm-device-macsec.c +++ b/src/core/devices/nm-device-macsec.c @@ -15,7 +15,7 @@ #include "nm-device-factory.h" #include "nm-manager.h" #include "nm-setting-macsec.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "supplicant/nm-supplicant-manager.h" #include "supplicant/nm-supplicant-interface.h" #include "supplicant/nm-supplicant-config.h" diff --git a/src/core/devices/nm-device-tun.c b/src/core/devices/nm-device-tun.c index edca69e9fa..d3050b8c89 100644 --- a/src/core/devices/nm-device-tun.c +++ b/src/core/devices/nm-device-tun.c @@ -17,7 +17,7 @@ #include "platform/nm-platform.h" #include "nm-device-factory.h" #include "nm-setting-tun.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define _NMLOG_DEVICE_TYPE NMDeviceTun #include "nm-device-logging.h" diff --git a/src/core/devices/nm-device-veth.c b/src/core/devices/nm-device-veth.c index e0ba843df7..03e34bd8bc 100644 --- a/src/core/devices/nm-device-veth.c +++ b/src/core/devices/nm-device-veth.c @@ -7,7 +7,7 @@ #include <stdlib.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-device-veth.h" #include "nm-device-private.h" #include "nm-manager.h" diff --git a/src/core/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c index bfde60efec..85edff5b0a 100644 --- a/src/core/devices/nm-device-vlan.c +++ b/src/core/devices/nm-device-vlan.c @@ -19,7 +19,7 @@ #include "platform/nm-platform.h" #include "nm-device-factory.h" #include "nm-manager.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "platform/nmp-object.h" #define _NMLOG_DEVICE_TYPE NMDeviceVlan diff --git a/src/core/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c index 4fec59ba5a..ab17197add 100644 --- a/src/core/devices/nm-device-vrf.c +++ b/src/core/devices/nm-device-vrf.c @@ -4,7 +4,7 @@ #include "nm-device-vrf.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-device-factory.h" #include "nm-device-private.h" #include "nm-manager.h" diff --git a/src/core/devices/nm-device-vxlan.c b/src/core/devices/nm-device-vxlan.c index f16a52c4b1..c0a11cd042 100644 --- a/src/core/devices/nm-device-vxlan.c +++ b/src/core/devices/nm-device-vxlan.c @@ -17,7 +17,7 @@ #include "settings/nm-settings.h" #include "nm-act-request.h" #include "nm-ip4-config.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define _NMLOG_DEVICE_TYPE NMDeviceVxlan #include "nm-device-logging.h" diff --git a/src/core/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c index 5bee09e6f1..f9bd8ad8f8 100644 --- a/src/core/devices/nm-device-wireguard.c +++ b/src/core/devices/nm-device-wireguard.c @@ -11,7 +11,7 @@ #include <linux/fib_rules.h> #include "nm-setting-wireguard.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-glib-aux/nm-secret-utils.h" #include "nm-device-private.h" #include "platform/nm-platform.h" diff --git a/src/core/devices/nm-device-wpan.c b/src/core/devices/nm-device-wpan.c index 2f3b16ff8a..7f1f9e3286 100644 --- a/src/core/devices/nm-device-wpan.c +++ b/src/core/devices/nm-device-wpan.c @@ -18,7 +18,7 @@ #include "platform/nm-platform.h" #include "nm-device-factory.h" #include "nm-setting-wpan.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define _NMLOG_DEVICE_TYPE NMDeviceWpan #include "nm-device-logging.h" diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 040dd0b4d3..28ba196b60 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -29,7 +29,7 @@ #include "systemd/nm-sd-utils-shared.h" #include "nm-base/nm-ethtool-base.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-device-private.h" #include "nm-l3cfg.h" #include "nm-l3-config-data.h" @@ -65,7 +65,7 @@ #include "c-list/src/c-list.h" #include "dns/nm-dns-manager.h" #include "nm-acd-manager.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "systemd/nm-sd.h" #include "nm-lldp-listener.h" #include "nm-audit-manager.h" diff --git a/src/core/devices/ovs/nm-device-ovs-bridge.c b/src/core/devices/ovs/nm-device-ovs-bridge.c index 3ae8a4813c..37feb2f442 100644 --- a/src/core/devices/ovs/nm-device-ovs-bridge.c +++ b/src/core/devices/ovs/nm-device-ovs-bridge.c @@ -16,7 +16,7 @@ #include "nm-setting-connection.h" #include "nm-setting-ovs-bridge.h" #include "nm-setting-ovs-external-ids.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define _NMLOG_DEVICE_TYPE NMDeviceOvsBridge #include "devices/nm-device-logging.h" diff --git a/src/core/devices/ovs/nm-ovs-factory.c b/src/core/devices/ovs/nm-ovs-factory.c index e7af38d83d..3a9a736448 100644 --- a/src/core/devices/ovs/nm-ovs-factory.c +++ b/src/core/devices/ovs/nm-ovs-factory.c @@ -11,7 +11,7 @@ #include "nm-device-ovs-port.h" #include "nm-device-ovs-bridge.h" #include "platform/nm-platform.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "settings/nm-settings.h" #include "devices/nm-device-factory.h" #include "devices/nm-device-private.h" diff --git a/src/core/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c index da3a7989a8..0aa613bd75 100644 --- a/src/core/devices/ovs/nm-ovsdb.c +++ b/src/core/devices/ovs/nm-ovsdb.c @@ -13,7 +13,7 @@ #include "nm-glib-aux/nm-jansson.h" #include "nm-glib-aux/nm-str-buf.h" #include "nm-core-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "devices/nm-device.h" #include "nm-manager.h" #include "nm-setting-ovs-external-ids.h" diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c index d2d717298d..e6e230eed1 100644 --- a/src/core/devices/team/nm-device-team.c +++ b/src/core/devices/team/nm-device-team.c @@ -20,7 +20,7 @@ #include "devices/nm-device-private.h" #include "platform/nm-platform.h" #include "nm-config.h" -#include "nm-core-internal.h" +#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" diff --git a/src/core/devices/team/nm-team-factory.c b/src/core/devices/team/nm-team-factory.c index 57b51bf843..21be23965b 100644 --- a/src/core/devices/team/nm-team-factory.c +++ b/src/core/devices/team/nm-team-factory.c @@ -11,7 +11,7 @@ #include "devices/nm-device-factory.h" #include "nm-device-team.h" #include "platform/nm-platform.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c index 95ade44b58..dc5bc54a10 100644 --- a/src/core/devices/wifi/nm-device-iwd.c +++ b/src/core/devices/wifi/nm-device-iwd.c @@ -13,11 +13,11 @@ #include "devices/nm-device.h" #include "nm-act-request.h" #include "nm-config.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" #include "nm-glib-aux/nm-ref-string.h" #include "nm-iwd-manager.h" -#include "nm-libnm-core-intern/nm-common-macros.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" diff --git a/src/core/devices/wifi/nm-device-wifi-p2p.c b/src/core/devices/wifi/nm-device-wifi-p2p.c index fb9876005f..74eba64c39 100644 --- a/src/core/devices/wifi/nm-device-wifi-p2p.c +++ b/src/core/devices/wifi/nm-device-wifi-p2p.c @@ -15,7 +15,7 @@ #include "NetworkManagerUtils.h" #include "devices/nm-device-private.h" #include "nm-act-request.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-glib-aux/nm-ref-string.h" #include "nm-ip4-config.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 042d48871a..3f55d9f15f 100644 --- a/src/core/devices/wifi/nm-device-wifi.c +++ b/src/core/devices/wifi/nm-device-wifi.c @@ -16,7 +16,7 @@ #include "nm-glib-aux/nm-c-list.h" #include "nm-device-wifi-p2p.h" #include "nm-wifi-ap.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "devices/nm-device.h" #include "devices/nm-device-private.h" #include "nm-dbus-manager.h" @@ -39,7 +39,7 @@ #include "settings/nm-settings.h" #include "nm-wifi-utils.h" #include "nm-wifi-common.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-config.h" #define _NMLOG_DEVICE_TYPE NMDeviceWifi diff --git a/src/core/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c index b4b019d3e5..b0b208ac52 100644 --- a/src/core/devices/wifi/nm-iwd-manager.c +++ b/src/core/devices/wifi/nm-iwd-manager.c @@ -9,7 +9,7 @@ #include <net/if.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-manager.h" #include "nm-device-iwd.h" #include "nm-wifi-utils.h" diff --git a/src/core/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c index 08fa10ec33..7d39e913d5 100644 --- a/src/core/devices/wifi/nm-wifi-ap.c +++ b/src/core/devices/wifi/nm-wifi-ap.c @@ -13,7 +13,7 @@ #include "NetworkManagerUtils.h" #include "devices/nm-device.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" #include "nm-glib-aux/nm-ref-string.h" #include "nm-setting-wireless.h" diff --git a/src/core/devices/wifi/nm-wifi-p2p-peer.c b/src/core/devices/wifi/nm-wifi-p2p-peer.c index 8488f32dca..40532bb142 100644 --- a/src/core/devices/wifi/nm-wifi-p2p-peer.c +++ b/src/core/devices/wifi/nm-wifi-p2p-peer.c @@ -12,7 +12,7 @@ #include "NetworkManagerUtils.h" #include "devices/nm-device.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" #include "nm-glib-aux/nm-ref-string.h" #include "nm-setting-wireless.h" diff --git a/src/core/devices/wifi/nm-wifi-utils.c b/src/core/devices/wifi/nm-wifi-utils.c index aed236ccaa..56a324387f 100644 --- a/src/core/devices/wifi/nm-wifi-utils.c +++ b/src/core/devices/wifi/nm-wifi-utils.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" static gboolean verify_no_wep(NMSettingWirelessSecurity *s_wsec, const char *tag, GError **error) diff --git a/src/core/devices/wifi/tests/test-devices-wifi.c b/src/core/devices/wifi/tests/test-devices-wifi.c index bc0ba126dc..693bc546da 100644 --- a/src/core/devices/wifi/tests/test-devices-wifi.c +++ b/src/core/devices/wifi/tests/test-devices-wifi.c @@ -7,7 +7,7 @@ #include "devices/wifi/nm-wifi-utils.h" #include "devices/wifi/nm-device-wifi.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-test-utils-core.h" diff --git a/src/core/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c index 3ea89d2c69..87d4023817 100644 --- a/src/core/devices/wwan/nm-device-modem.c +++ b/src/core/devices/wwan/nm-device-modem.c @@ -14,7 +14,7 @@ #include "settings/nm-settings-connection.h" #include "nm-modem-broadband.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define _NMLOG_DEVICE_TYPE NMDeviceModem #include "devices/nm-device-logging.h" diff --git a/src/core/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c index ca02880417..c7bfd7cf1f 100644 --- a/src/core/devices/wwan/nm-modem-broadband.c +++ b/src/core/devices/wwan/nm-modem-broadband.c @@ -11,7 +11,7 @@ #include <arpa/inet.h> #include <libmm-glib.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "devices/nm-device-private.h" #include "platform/nm-platform.h" diff --git a/src/core/devices/wwan/nm-modem-ofono.c b/src/core/devices/wwan/nm-modem-ofono.c index 21734cee77..6ca78292f0 100644 --- a/src/core/devices/wwan/nm-modem-ofono.c +++ b/src/core/devices/wwan/nm-modem-ofono.c @@ -7,7 +7,7 @@ #include "nm-modem-ofono.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "devices/nm-device-private.h" #include "nm-modem.h" #include "platform/nm-platform.h" diff --git a/src/core/devices/wwan/nm-modem.c b/src/core/devices/wwan/nm-modem.c index 0d334fa465..68cd8f00b2 100644 --- a/src/core/devices/wwan/nm-modem.c +++ b/src/core/devices/wwan/nm-modem.c @@ -12,7 +12,7 @@ #include <termios.h> #include <linux/rtnetlink.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" #include "nm-setting-connection.h" #include "NetworkManagerUtils.h" diff --git a/src/core/dhcp/nm-dhcp-listener.c b/src/core/dhcp/nm-dhcp-listener.c index 1673bbb7a5..b8bb3c33a0 100644 --- a/src/core/dhcp/nm-dhcp-listener.c +++ b/src/core/dhcp/nm-dhcp-listener.c @@ -16,7 +16,7 @@ #include "nm-dhcp-helper-api.h" #include "nm-dhcp-client.h" #include "nm-dhcp-manager.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" #include "NetworkManagerUtils.h" diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c index 646411e201..9867e4c16e 100644 --- a/src/core/dhcp/nm-dhcp-utils.c +++ b/src/core/dhcp/nm-dhcp-utils.c @@ -19,7 +19,7 @@ #include "NetworkManagerUtils.h" #include "platform/nm-platform.h" #include "nm-dhcp-client-logging.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c index dcff98e913..7ecd785f5f 100644 --- a/src/core/dns/nm-dns-dnsmasq.c +++ b/src/core/dns/nm-dns-dnsmasq.c @@ -16,7 +16,7 @@ #include <linux/if.h> #include "nm-glib-aux/nm-dbus-aux.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" #include "nm-utils.h" #include "nm-ip4-config.h" diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c index f318b9b89b..d30c3fa549 100644 --- a/src/core/dns/nm-dns-manager.c +++ b/src/core/dns/nm-dns-manager.c @@ -23,7 +23,7 @@ #endif #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dns-manager.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/core/dns/nm-dns-plugin.c b/src/core/dns/nm-dns-plugin.c index 74d4eb2bd9..e5035f061f 100644 --- a/src/core/dns/nm-dns-plugin.c +++ b/src/core/dns/nm-dns-plugin.c @@ -12,7 +12,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" /*****************************************************************************/ diff --git a/src/core/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c index f6e116f375..bbf212b135 100644 --- a/src/core/dns/nm-dns-systemd-resolved.c +++ b/src/core/dns/nm-dns-systemd-resolved.c @@ -18,7 +18,7 @@ #include "nm-glib-aux/nm-c-list.h" #include "nm-glib-aux/nm-dbus-aux.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" #include "nm-utils.h" #include "nm-ip4-config.h" diff --git a/src/core/dnsmasq/nm-dnsmasq-manager.c b/src/core/dnsmasq/nm-dnsmasq-manager.c index 82c002b0d0..e8697e817e 100644 --- a/src/core/dnsmasq/nm-dnsmasq-manager.c +++ b/src/core/dnsmasq/nm-dnsmasq-manager.c @@ -17,7 +17,7 @@ #include "nm-dnsmasq-utils.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define CONFDIR NMCONFDIR "/dnsmasq-shared.d" diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build index bd590e8ca5..5fa575c023 100644 --- a/src/core/initrd/meson.build +++ b/src/core/initrd/meson.build @@ -19,6 +19,8 @@ executable( link_with: [ libNetworkManagerBase, libnmi_core, + libnm_core_impl, + libnm_base, ], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, diff --git a/src/core/initrd/nm-initrd-generator.c b/src/core/initrd/nm-initrd-generator.c index 18c7258a91..f9756df29b 100644 --- a/src/core/initrd/nm-initrd-generator.c +++ b/src/core/initrd/nm-initrd-generator.c @@ -5,8 +5,8 @@ #include "src/core/nm-default-daemon.h" #include "nm-core-utils.h" -#include "nm-core-internal.h" -#include "nm-keyfile-internal.h" +#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 "nm-config.h" diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c index 1a95e4f7dd..3bde667888 100644 --- a/src/core/initrd/nmi-cmdline-reader.c +++ b/src/core/initrd/nmi-cmdline-reader.c @@ -8,7 +8,7 @@ #include <linux/if_ether.h> #include <linux/if_infiniband.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-initrd-generator.h" #include "systemd/nm-sd-utils-shared.h" diff --git a/src/core/initrd/nmi-dt-reader.c b/src/core/initrd/nmi-dt-reader.c index 63e4524b5a..de549a208a 100644 --- a/src/core/initrd/nmi-dt-reader.c +++ b/src/core/initrd/nmi-dt-reader.c @@ -10,7 +10,7 @@ #include <arpa/inet.h> #include <linux/if_ether.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/src/core/initrd/nmi-ibft-reader.c b/src/core/initrd/nmi-ibft-reader.c index 9895cda43f..3a5b5d6634 100644 --- a/src/core/initrd/nmi-ibft-reader.c +++ b/src/core/initrd/nmi-ibft-reader.c @@ -17,7 +17,7 @@ #include <unistd.h> #include <linux/if_ether.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" /*****************************************************************************/ diff --git a/src/core/initrd/tests/test-cmdline-reader.c b/src/core/initrd/tests/test-cmdline-reader.c index 33fb22d364..e1f7bd7030 100644 --- a/src/core/initrd/tests/test-cmdline-reader.c +++ b/src/core/initrd/tests/test-cmdline-reader.c @@ -12,7 +12,7 @@ #include <arpa/inet.h> #include <sys/socket.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "../nm-initrd-generator.h" diff --git a/src/core/initrd/tests/test-dt-reader.c b/src/core/initrd/tests/test-dt-reader.c index 619a4e6fc1..d9424c9a3d 100644 --- a/src/core/initrd/tests/test-dt-reader.c +++ b/src/core/initrd/tests/test-dt-reader.c @@ -12,7 +12,7 @@ #include <arpa/inet.h> #include <sys/socket.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "../nm-initrd-generator.h" diff --git a/src/core/initrd/tests/test-ibft-reader.c b/src/core/initrd/tests/test-ibft-reader.c index 1d263b9e2e..5c26659db4 100644 --- a/src/core/initrd/tests/test-ibft-reader.c +++ b/src/core/initrd/tests/test-ibft-reader.c @@ -12,7 +12,7 @@ #include <arpa/inet.h> #include <sys/socket.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "../nm-initrd-generator.h" diff --git a/src/core/main.c b/src/core/main.c index 9b79bcbb7c..88fd8f20d4 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -29,7 +29,7 @@ #include "nm-dispatcher.h" #include "settings/nm-settings.h" #include "nm-auth-manager.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-object.h" #include "nm-connectivity.h" #include "dns/nm-dns-manager.h" diff --git a/src/core/meson.build b/src/core/meson.build index 368a3e8555..0cbe817344 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -1,25 +1,30 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -src_inc = include_directories('.') +src_core_inc = include_directories('.') core_plugin_dep = declare_dependency( - sources: libnm_core_enum_sources[1], include_directories: [ - src_inc, + src_core_inc, top_inc, shared_inc, - libnm_core_inc, + libnm_core_public_inc, ], dependencies: [ + libnm_core_intern_dep, + libnm_core_public_dep, glib_dep, ], ) core_default_dep = declare_dependency( - sources: libnm_core_enum_sources[1], - include_directories: src_inc, + include_directories: [ + src_core_inc, + shared_inc, + top_inc, + ], dependencies: [ - libnm_core_nm_default_dep, + libnm_core_public_dep, + libnm_core_intern_dep, libnm_log_core_dep, libnm_platform_dep, ], @@ -77,7 +82,7 @@ libNetworkManagerBase = static_library( dependencies: [ core_default_dep, libn_dhcp4_dep, - libnm_core_dep, + libnm_core_impl_dep, libnm_systemd_shared_dep, libnm_udev_aux_dep, libsystemd_dep, @@ -87,6 +92,8 @@ libNetworkManagerBase = static_library( ) nm_deps = [ + libnm_core_public_dep, + libnm_core_impl_dep, core_default_dep, dl_dep, libn_acd_dep, @@ -211,12 +218,16 @@ executable( libndp_dep, libudev_dep, libn_acd_dep, + libnm_glib_aux_dep_link, + libnm_core_impl_dep_link, ], c_args: daemon_c_flags, link_with: [ libNetworkManagerBase, libnm_systemd_core, libnm_systemd_shared, + libnm_base, + libnm_glib_aux, ], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, @@ -244,7 +255,11 @@ if enable_tests libNetworkManagerTest_dep = declare_dependency( dependencies: core_default_dep, - link_with: libNetworkManagerTest, + link_with: [ + libNetworkManagerTest, + libnm_base, + libnm_core_impl, + ], ) subdir('dnsmasq/tests') @@ -280,7 +295,8 @@ NetworkManager_all_sym = executable( link_whole: [ libNetworkManager, libNetworkManagerBase, - libnm_core, + libnm_core_impl, + libnm_base, ], ) @@ -303,7 +319,12 @@ NetworkManager = executable( 'main.c', dependencies: nm_deps, c_args: daemon_c_flags, - link_with: libNetworkManager, + link_with: [ + libNetworkManager, + libNetworkManagerBase, + libnm_core_impl, + libnm_base, + ], link_args: [ '-rdynamic', '-Wl,--version-script,@0@'.format(ver_script.full_path()), diff --git a/src/core/nm-act-request.c b/src/core/nm-act-request.c index defe3e8c93..cb4b0260a5 100644 --- a/src/core/nm-act-request.c +++ b/src/core/nm-act-request.c @@ -19,7 +19,7 @@ #include "devices/nm-device.h" #include "nm-active-connection.h" #include "settings/nm-settings-connection.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" typedef struct { CList call_ids_lst_head; diff --git a/src/core/nm-active-connection.c b/src/core/nm-active-connection.c index 3c8c472e74..b0327fd0a4 100644 --- a/src/core/nm-active-connection.c +++ b/src/core/nm-active-connection.c @@ -7,17 +7,17 @@ #include "nm-active-connection.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-dbus-interface.h" #include "devices/nm-device.h" #include "settings/nm-settings-connection.h" #include "nm-simple-connection.h" #include "nm-auth-utils.h" #include "nm-auth-manager.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-keep-alive.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define AUTH_CALL_ID_SHARED_WIFI_PERMISSION_FAILED ((NMAuthManagerCallId *) GINT_TO_POINTER(1)) diff --git a/src/core/nm-audit-manager.c b/src/core/nm-audit-manager.c index 8f41947264..a1d20fcb62 100644 --- a/src/core/nm-audit-manager.c +++ b/src/core/nm-audit-manager.c @@ -11,7 +11,7 @@ #include <libaudit.h> #endif -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-config.h" #include "nm-dbus-manager.h" #include "settings/nm-settings-connection.h" diff --git a/src/core/nm-auth-manager.c b/src/core/nm-auth-manager.c index 9470838c8f..4a7542ccfe 100644 --- a/src/core/nm-auth-manager.c +++ b/src/core/nm-auth-manager.c @@ -10,7 +10,7 @@ #include "c-list/src/c-list.h" #include "nm-glib-aux/nm-dbus-aux.h" #include "nm-errors.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-manager.h" #include "NetworkManagerUtils.h" diff --git a/src/core/nm-auth-manager.h b/src/core/nm-auth-manager.h index 991083c1b8..0586322fea 100644 --- a/src/core/nm-auth-manager.h +++ b/src/core/nm-auth-manager.h @@ -6,7 +6,7 @@ #ifndef NM_AUTH_MANAGER_H #define NM_AUTH_MANAGER_H -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-config-data.h" /*****************************************************************************/ diff --git a/src/core/nm-auth-utils.c b/src/core/nm-auth-utils.c index 12da5749a5..96c48cc336 100644 --- a/src/core/nm-auth-utils.c +++ b/src/core/nm-auth-utils.c @@ -9,7 +9,7 @@ #include "nm-glib-aux/nm-c-list.h" #include "nm-setting-connection.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-auth-manager.h" #include "nm-session-monitor.h" #include "nm-dbus-manager.h" diff --git a/src/core/nm-checkpoint.c b/src/core/nm-checkpoint.c index 2088c24760..3e22239608 100644 --- a/src/core/nm-checkpoint.c +++ b/src/core/nm-checkpoint.c @@ -9,7 +9,7 @@ #include "nm-active-connection.h" #include "nm-act-request.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-core-utils.h" #include "nm-dbus-interface.h" #include "devices/nm-device.h" diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c index c62c677372..6cdca586cc 100644 --- a/src/core/nm-config-data.c +++ b/src/core/nm-config-data.c @@ -10,9 +10,9 @@ #include "nm-config.h" #include "devices/nm-device.h" -#include "nm-core-internal.h" -#include "nm-keyfile-internal.h" -#include "nm-keyfile-utils.h" +#include "libnm-core-intern/nm-core-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-utils.h" /*****************************************************************************/ diff --git a/src/core/nm-config.c b/src/core/nm-config.c index 55323919af..4d61f1aa22 100644 --- a/src/core/nm-config.c +++ b/src/core/nm-config.c @@ -13,9 +13,9 @@ #include "nm-utils.h" #include "devices/nm-device.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" -#include "nm-keyfile-internal.h" -#include "nm-keyfile-utils.h" +#include "libnm-core-intern/nm-core-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-utils.h" #define DEFAULT_CONFIG_MAIN_FILE NMCONFDIR "/NetworkManager.conf" #define DEFAULT_CONFIG_DIR NMCONFDIR "/conf.d" diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c index f847c8f4ef..1d37bd5a22 100644 --- a/src/core/nm-connectivity.c +++ b/src/core/nm-connectivity.c @@ -16,7 +16,7 @@ #include <glib-unix.h> #include "c-list/src/c-list.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-config.h" #include "NetworkManagerUtils.h" #include "nm-dbus-manager.h" diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index 9075c30dd0..49dd1af64b 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c @@ -28,7 +28,7 @@ #include "nm-glib-aux/nm-secret-utils.h" #include "nm-glib-aux/nm-time-utils.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-connection.h" #include "nm-setting-ip4-config.h" #include "nm-setting-ip6-config.h" diff --git a/src/core/nm-dbus-manager.c b/src/core/nm-dbus-manager.c index 4f34ee52af..cae2d71344 100644 --- a/src/core/nm-dbus-manager.c +++ b/src/core/nm-dbus-manager.c @@ -15,11 +15,11 @@ #include "c-list/src/c-list.h" #include "nm-glib-aux/nm-c-list.h" #include "nm-dbus-interface.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-std-aux/nm-dbus-compat.h" #include "nm-dbus-object.h" #include "NetworkManagerUtils.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" /* The base path for our GDBusObjectManagerServers. They do not contain * "NetworkManager" because GDBusObjectManagerServer requires that all diff --git a/src/core/nm-dispatcher.c b/src/core/nm-dispatcher.c index 0ab409f5ed..5d9c51aa81 100644 --- a/src/core/nm-dispatcher.c +++ b/src/core/nm-dispatcher.c @@ -8,7 +8,7 @@ #include "nm-dispatcher.h" -#include "nm-libnm-core-aux/nm-dispatcher-api.h" +#include "libnm-core-aux-extern/nm-dispatcher-api.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" #include "nm-connectivity.h" @@ -21,7 +21,7 @@ #include "nm-manager.h" #include "settings/nm-settings-connection.h" #include "platform/nm-platform.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define CALL_TIMEOUT (1000 * 60 * 10) /* 10 minutes for all scripts */ diff --git a/src/core/nm-hostname-manager.c b/src/core/nm-hostname-manager.c index c99c83267c..4f1624262e 100644 --- a/src/core/nm-hostname-manager.c +++ b/src/core/nm-hostname-manager.c @@ -14,11 +14,11 @@ #include <selinux/label.h> #endif -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-dbus-interface.h" #include "nm-connection.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/core/nm-iface-helper.c b/src/core/nm-iface-helper.c index b6e9981da9..c125d572d9 100644 --- a/src/core/nm-iface-helper.c +++ b/src/core/nm-iface-helper.c @@ -26,7 +26,7 @@ #include "ndisc/nm-ndisc.h" #include "ndisc/nm-lndp-ndisc.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-ip6-config.h" #include "systemd/nm-sd.h" diff --git a/src/core/nm-ip4-config.c b/src/core/nm-ip4-config.c index c49dfb4c34..24ff29895c 100644 --- a/src/core/nm-ip4-config.c +++ b/src/core/nm-ip4-config.c @@ -19,7 +19,7 @@ #include "platform/nm-platform.h" #include "nm-platform/nm-platform-utils.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-object.h" /*****************************************************************************/ diff --git a/src/core/nm-ip6-config.c b/src/core/nm-ip6-config.c index 1f7def3465..0b44064fc5 100644 --- a/src/core/nm-ip6-config.c +++ b/src/core/nm-ip6-config.c @@ -19,7 +19,7 @@ #include "platform/nmp-object.h" #include "platform/nm-platform.h" #include "nm-platform/nm-platform-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "nm-ip4-config.h" #include "ndisc/nm-ndisc.h" diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c index 5f9af7ac59..61ef98f45c 100644 --- a/src/core/nm-l3-config-data.c +++ b/src/core/nm-l3-config-data.c @@ -9,7 +9,7 @@ #include <linux/rtnetlink.h> #include "nm-glib-aux/nm-enum-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "platform/nm-platform.h" #include "nm-platform/nm-platform-utils.h" #include "platform/nmp-object.h" diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index 5a6e05a934..8d2e8a8fe1 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -18,7 +18,7 @@ #include "nm-glib-aux/nm-c-list.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-dbus-manager.h" #include "vpn/nm-vpn-manager.h" #include "devices/nm-device.h" @@ -40,7 +40,7 @@ #include "nm-policy.h" #include "nm-session-monitor.h" #include "nm-act-request.h" -#include "nm-core-internal.h" +#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" diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c index 88ea09b6ce..51957d7e04 100644 --- a/src/core/nm-netns.c +++ b/src/core/nm-netns.c @@ -11,7 +11,7 @@ #include "nm-glib-aux/nm-c-list.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-l3cfg.h" #include "platform/nm-platform.h" #include "nm-platform/nmp-netns.h" diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index db4983f889..176cc2ebf3 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -24,7 +24,7 @@ #include "nm-firewall-manager.h" #include "nm-dispatcher.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-manager.h" #include "settings/nm-settings.h" #include "settings/nm-settings-connection.h" diff --git a/src/core/nm-proxy-config.c b/src/core/nm-proxy-config.c index f41601c900..49156dfae0 100644 --- a/src/core/nm-proxy-config.c +++ b/src/core/nm-proxy-config.c @@ -9,7 +9,7 @@ #include <stdlib.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/src/core/nm-sleep-monitor.c b/src/core/nm-sleep-monitor.c index ffb4db4ea8..e275fd0883 100644 --- a/src/core/nm-sleep-monitor.c +++ b/src/core/nm-sleep-monitor.c @@ -11,7 +11,7 @@ #include <sys/stat.h> #include <gio/gunixfdlist.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #if defined(SUSPEND_RESUME_UPOWER) diff --git a/src/core/nm-test-utils-core.h b/src/core/nm-test-utils-core.h index e655ce22fa..5bde9cdaab 100644 --- a/src/core/nm-test-utils-core.h +++ b/src/core/nm-test-utils-core.h @@ -7,7 +7,7 @@ #define __NM_TEST_UTILS_CORE_H__ #include "NetworkManagerUtils.h" -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #define _NMTST_INSIDE_CORE 1 diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c index 7bd42bbab5..d4f6b0fb90 100644 --- a/src/core/platform/nm-linux-platform.c +++ b/src/core/platform/nm-linux-platform.c @@ -35,7 +35,7 @@ #include "nm-std-aux/unaligned.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-vlan.h" #include "nm-glib-aux/nm-secret-utils.h" diff --git a/src/core/platform/nm-platform.c b/src/core/platform/nm-platform.c index 0e5f8ab548..e3ee9b8f49 100644 --- a/src/core/platform/nm-platform.c +++ b/src/core/platform/nm-platform.c @@ -23,7 +23,7 @@ #include <libudev.h> #include "nm-utils.h" -#include "nm-core-internal.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" diff --git a/src/core/platform/nm-platform.h b/src/core/platform/nm-platform.h index d400c5680a..cf1254c40a 100644 --- a/src/core/platform/nm-platform.h +++ b/src/core/platform/nm-platform.h @@ -7,7 +7,7 @@ #define __NETWORKMANAGER_PLATFORM_H__ #include "nm-dbus-interface.h" -#include "nm-core-types-internal.h" +#include "libnm-core-intern/nm-core-types-internal.h" #include "nm-platform/nmp-base.h" #include "nm-base/nm-base.h" diff --git a/src/core/platform/wifi/nm-wifi-utils-wext.c b/src/core/platform/wifi/nm-wifi-utils-wext.c index a44fcf6239..88529647c5 100644 --- a/src/core/platform/wifi/nm-wifi-utils-wext.c +++ b/src/core/platform/wifi/nm-wifi-utils-wext.c @@ -24,7 +24,7 @@ #include "nm-wifi-utils-private.h" #include "nm-utils.h" #include "nm-platform/nm-platform-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-core-utils.h" typedef struct { diff --git a/src/core/ppp/meson.build b/src/core/ppp/meson.build index 607b471874..6ba36a70ef 100644 --- a/src/core/ppp/meson.build +++ b/src/core/ppp/meson.build @@ -4,7 +4,11 @@ nm_pppd_plugin = shared_module( 'nm-pppd-plugin', name_prefix: '', sources: 'nm-pppd-plugin.c', - dependencies: libnm_core_nm_default_dep, + dependencies: [ + libnm_core_impl_dep_link, + libnm_glib_aux_dep_link, + glib_dep, + ], c_args: [ '-DG_LOG_DOMAIN="nm-pppd-plugin"', ], diff --git a/src/core/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c index 396a49aeb5..eebb82311c 100644 --- a/src/core/ppp/nm-ppp-manager.c +++ b/src/core/ppp/nm-ppp-manager.c @@ -29,7 +29,7 @@ #include "NetworkManagerUtils.h" #include "platform/nm-platform.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-act-request.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/core/settings/nm-agent-manager.c b/src/core/settings/nm-agent-manager.c index 7e61790998..a1c2eb9c76 100644 --- a/src/core/settings/nm-agent-manager.c +++ b/src/core/settings/nm-agent-manager.c @@ -9,7 +9,7 @@ #include <pwd.h> -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-dbus-interface.h" #include "nm-secret-agent.h" #include "nm-auth-utils.h" @@ -19,7 +19,7 @@ #include "nm-session-monitor.h" #include "nm-simple-connection.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "c-list/src/c-list.h" /*****************************************************************************/ diff --git a/src/core/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c index 7e7c5d7dfd..b0d71886b4 100644 --- a/src/core/settings/nm-secret-agent.c +++ b/src/core/settings/nm-secret-agent.c @@ -13,8 +13,8 @@ #include "nm-glib-aux/nm-c-list.h" #include "nm-glib-aux/nm-dbus-aux.h" #include "nm-dbus-interface.h" -#include "nm-core-internal.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-intern/nm-core-internal.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-simple-connection.h" #include "NetworkManagerUtils.h" #include "c-list/src/c-list.h" diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c index 0ff0718997..0f0beef068 100644 --- a/src/core/settings/nm-settings-connection.c +++ b/src/core/settings/nm-settings-connection.c @@ -11,7 +11,7 @@ #include "c-list/src/c-list.h" #include "nm-glib-aux/nm-keyfile-aux.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-config.h" #include "nm-config-data.h" #include "nm-dbus-interface.h" @@ -20,7 +20,7 @@ #include "nm-auth-utils.h" #include "nm-agent-manager.h" #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-audit-manager.h" #include "nm-settings.h" #include "nm-dbus-manager.h" diff --git a/src/core/settings/nm-settings-plugin.c b/src/core/settings/nm-settings-plugin.c index 9e81caabb5..66cc19b656 100644 --- a/src/core/settings/nm-settings-plugin.c +++ b/src/core/settings/nm-settings-plugin.c @@ -9,7 +9,7 @@ #include "nm-settings-plugin.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-settings-connection.h" diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c index 3d31fb8b7b..858df29883 100644 --- a/src/core/settings/nm-settings.c +++ b/src/core/settings/nm-settings.c @@ -20,9 +20,9 @@ #include <selinux/selinux.h> #endif -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-glib-aux/nm-keyfile-aux.h" -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #include "nm-dbus-interface.h" #include "nm-connection.h" #include "nm-setting-8021x.h" @@ -44,7 +44,7 @@ #include "nm-setting-proxy.h" #include "nm-setting-bond.h" #include "nm-utils.h" -#include "nm-core-internal.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" @@ -54,7 +54,7 @@ #include "nm-settings-plugin.h" #include "nm-dbus-manager.h" #include "nm-auth-utils.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-session-monitor.h" #include "plugins/keyfile/nms-keyfile-plugin.h" #include "plugins/keyfile/nms-keyfile-storage.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 d114db0f82..2cc1d373de 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 @@ -18,7 +18,7 @@ #include "nm-glib-aux/nm-io-utils.h" #include "nm-std-aux/nm-dbus-compat.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-config.h" #include "nm-dbus-manager.h" #include "settings/nm-settings-plugin.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 209957d9b8..7524e87c57 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 @@ -38,7 +38,7 @@ #include "nm-setting-user.h" #include "nm-setting-proxy.h" #include "nm-setting-generic.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-utils.h" #include "nm-base/nm-ethtool-base.h" diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c index 3f674deab3..714357a8be 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c @@ -8,7 +8,7 @@ #include "nms-ifcfg-rh-storage.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-connection.h" #include "nms-ifcfg-rh-plugin.h" diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c index 8da5de473b..aa5f7297ef 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c @@ -9,7 +9,7 @@ #include <stdlib.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "nms-ifcfg-rh-common.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 a968fce0ba..a86bf4781d 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 @@ -32,7 +32,7 @@ #include "nm-setting-team.h" #include "nm-setting-team-port.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "NetworkManagerUtils.h" #include "nm-base/nm-ethtool-base.h" diff --git a/src/core/settings/plugins/ifcfg-rh/shvar.c b/src/core/settings/plugins/ifcfg-rh/shvar.c index 386bcac707..dc26da759c 100644 --- a/src/core/settings/plugins/ifcfg-rh/shvar.c +++ b/src/core/settings/plugins/ifcfg-rh/shvar.c @@ -14,7 +14,7 @@ #include <sys/stat.h> #include <unistd.h> -#include "nm-core-internal.h" +#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" 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 59127d0103..bad0052013 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 @@ -36,7 +36,7 @@ #include "nm-setting-serial.h" #include "nm-setting-vlan.h" #include "nm-setting-dcb.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-base/nm-ethtool-base.h" #include "nm-base/nm-ethtool-utils-base.h" diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c index a4974a9600..63c78f93aa 100644 --- a/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c +++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c @@ -12,7 +12,7 @@ #include <stdlib.h> #include <ctype.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "settings/nm-settings-plugin.h" #include "nms-ifupdown-plugin.h" diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c index 34523f8d5a..80a5638a13 100644 --- a/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c +++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c @@ -9,7 +9,7 @@ #include "nms-ifupdown-plugin.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-core-utils.h" #include "nm-config.h" #include "settings/nm-settings-plugin.h" diff --git a/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c index 6e3eb0e74b..0e8db733eb 100644 --- a/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -5,7 +5,7 @@ #include "src/core/nm-default-daemon.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "settings/plugins/ifupdown/nms-ifupdown-interface-parser.h" #include "settings/plugins/ifupdown/nms-ifupdown-parser.h" diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c index 789bfc1ad2..6d3e879611 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c @@ -22,8 +22,8 @@ #include "nm-setting-connection.h" #include "nm-utils.h" #include "nm-config.h" -#include "nm-core-internal.h" -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-core-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #include "systemd/nm-sd-utils-shared.h" diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-reader.c b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c index 70b047f32f..8b9d982fa5 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-reader.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c @@ -9,7 +9,7 @@ #include <sys/stat.h> -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #include "NetworkManagerUtils.h" #include "nms-keyfile-utils.h" diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-storage.c b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c index 89be817a7e..c6b4b81f57 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-storage.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c @@ -8,7 +8,7 @@ #include "nms-keyfile-storage.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nms-keyfile-plugin.h" /*****************************************************************************/ diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c index f3dffdae49..4b69dc79aa 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c @@ -11,7 +11,7 @@ #include <sys/stat.h> #include "nm-glib-aux/nm-io-utils.h" -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #include "nm-utils.h" #include "nm-setting-wired.h" #include "nm-setting-wireless.h" diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c index 0e2c94b533..0dae91ae76 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c @@ -12,7 +12,7 @@ #include <sys/stat.h> #include <unistd.h> -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #include "nms-keyfile-utils.h" #include "nms-keyfile-reader.h" diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c index 348b0ed6ad..5c5786b947 100644 --- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -15,7 +15,7 @@ #include <linux/if_ether.h> #include <linux/if_infiniband.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "settings/plugins/keyfile/nms-keyfile-reader.h" #include "settings/plugins/keyfile/nms-keyfile-writer.h" diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c index eab494b022..1f27ab80dd 100644 --- a/src/core/supplicant/nm-supplicant-config.c +++ b/src/core/supplicant/nm-supplicant-config.c @@ -11,10 +11,10 @@ #include <stdlib.h> #include "nm-glib-aux/nm-str-buf.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-supplicant-settings-verify.h" #include "nm-setting.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" #include "nm-setting-ip4-config.h" diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c index 6d9c604f80..176e4d2f61 100644 --- a/src/core/supplicant/nm-supplicant-interface.c +++ b/src/core/supplicant/nm-supplicant-interface.c @@ -12,7 +12,7 @@ #include <linux/if_ether.h> #include "NetworkManagerUtils.h" -#include "nm-core-internal.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" diff --git a/src/core/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c index 325541876c..d4806161e8 100644 --- a/src/core/supplicant/nm-supplicant-manager.c +++ b/src/core/supplicant/nm-supplicant-manager.c @@ -8,7 +8,7 @@ #include "nm-supplicant-manager.h" -#include "nm-core-internal.h" +#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" diff --git a/src/core/supplicant/tests/test-supplicant-config.c b/src/core/supplicant/tests/test-supplicant-config.c index 99729c18e5..2c2d9478e2 100644 --- a/src/core/supplicant/tests/test-supplicant-config.c +++ b/src/core/supplicant/tests/test-supplicant-config.c @@ -14,7 +14,7 @@ #include <sys/types.h> #include <sys/stat.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "supplicant/nm-supplicant-config.h" #include "supplicant/nm-supplicant-settings-verify.h" diff --git a/src/core/systemd/meson.build b/src/core/systemd/meson.build index 70f6b54295..518b0053c3 100644 --- a/src/core/systemd/meson.build +++ b/src/core/systemd/meson.build @@ -39,10 +39,12 @@ libnm_systemd_core = static_library( include_directories: [ incs, src_inc, + src_core_inc, + shared_inc, ], dependencies: [ glib_nm_default_dep, - libnm_core_dep, + libnm_core_impl_dep, libnm_systemd_shared_dep, ], c_args: [ @@ -52,10 +54,13 @@ libnm_systemd_core = static_library( ) libnm_systemd_core_dep = declare_dependency( - include_directories: incs, + include_directories: [ + incs, + shared_inc, + ], dependencies: [ glib_dep, - libnm_core_dep, + libnm_core_impl_dep, libnm_systemd_shared_dep, ], link_with: libnm_systemd_core, diff --git a/src/core/systemd/nm-sd-utils-core.c b/src/core/systemd/nm-sd-utils-core.c index af68603ec0..b81e36f377 100644 --- a/src/core/systemd/nm-sd-utils-core.c +++ b/src/core/systemd/nm-sd-utils-core.c @@ -7,7 +7,7 @@ #include "nm-sd-utils-core.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-sd-adapt-core.h" diff --git a/src/core/tests/meson.build b/src/core/tests/meson.build index 994563c42c..5997b70d36 100644 --- a/src/core/tests/meson.build +++ b/src/core/tests/meson.build @@ -35,6 +35,7 @@ exe = executable( include_directories: [ top_inc, src_inc, + src_core_inc, ], dependencies: [ libnm_systemd_core_dep, diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c index 8698c40607..fc4a217e81 100644 --- a/src/core/tests/test-core.c +++ b/src/core/tests/test-core.c @@ -12,7 +12,7 @@ #include <math.h> #include "NetworkManagerUtils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-core-utils.h" #include "systemd/nm-sd-utils-core.h" diff --git a/src/core/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c index 02831b0838..3d110b2888 100644 --- a/src/core/vpn/nm-vpn-connection.c +++ b/src/core/vpn/nm-vpn-connection.c @@ -26,7 +26,7 @@ #include "nm-dispatcher.h" #include "nm-netns.h" #include "settings/nm-agent-manager.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-pacrunner-manager.h" #include "nm-firewall-manager.h" #include "nm-config.h" diff --git a/src/core/vpn/nm-vpn-connection.h b/src/core/vpn/nm-vpn-connection.h index 66ec7eec3a..0209ea3d60 100644 --- a/src/core/vpn/nm-vpn-connection.h +++ b/src/core/vpn/nm-vpn-connection.h @@ -9,7 +9,7 @@ #include "nm-vpn-dbus-interface.h" #include "devices/nm-device.h" -#include "nm-libnm-core-intern/nm-auth-subject.h" +#include "libnm-core-aux-intern/nm-auth-subject.h" #include "nm-active-connection.h" #include "nm-vpn-plugin-info.h" diff --git a/src/core/vpn/nm-vpn-manager.c b/src/core/vpn/nm-vpn-manager.c index 53fe58dd36..f30dba79bc 100644 --- a/src/core/vpn/nm-vpn-manager.c +++ b/src/core/vpn/nm-vpn-manager.c @@ -12,7 +12,7 @@ #include "nm-vpn-connection.h" #include "nm-setting-vpn.h" #include "nm-vpn-dbus-interface.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" typedef struct { GSList * plugins; diff --git a/src/libnm-core-aux-extern/README.md b/src/libnm-core-aux-extern/README.md new file mode 100644 index 0000000000..27f2cccad2 --- /dev/null +++ b/src/libnm-core-aux-extern/README.md @@ -0,0 +1,11 @@ +libnm-core-aux-extern +===================== + +libnm-core-aux-extern is a static library that is similar to +[`libnm-core-aux-intern`](../libnm-core-aux-intern). + +The only difference is that `libnm-core-aux-extern` is not used by +[`libnm-core-impl`](../libnm-core-impl) itself. So you must not +use it there. + +Otherwise, it's the same and has the same usage. diff --git a/src/libnm-core-aux-extern/meson.build b/src/libnm-core-aux-extern/meson.build new file mode 100644 index 0000000000..0aaadc5f52 --- /dev/null +++ b/src/libnm-core-aux-extern/meson.build @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_core_aux_extern = static_library( + 'nm-core-aux-extern', + sources: files( + 'nm-libnm-core-aux.c', + ), + dependencies: [ + libnm_core_aux_intern_dep, + libnm_core_public_dep, + libnm_glib_aux_dep, + glib_dep, + ], + c_args: [ + '-DG_LOG_DOMAIN="libnm"', + ], +) + +libnm_core_aux_extern_dep = declare_dependency( + include_directories: [ + src_inc, + ], + dependencies: [ + libnm_core_aux_intern_dep, + libnm_core_public_dep, + libnm_glib_aux_dep, + glib_dep, + ], +) + +libnm_core_aux_extern_dep_link = declare_dependency( + dependencies: libnm_core_aux_extern_dep, + link_with: libnm_core_aux_extern, +) diff --git a/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h b/src/libnm-core-aux-extern/nm-dispatcher-api.h index 7776c84f9a..7776c84f9a 100644 --- a/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h +++ b/src/libnm-core-aux-extern/nm-dispatcher-api.h diff --git a/libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c b/src/libnm-core-aux-extern/nm-libnm-core-aux.c index 888dbac4b2..8f3bbef0b9 100644 --- a/libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c +++ b/src/libnm-core-aux-extern/nm-libnm-core-aux.c @@ -7,7 +7,7 @@ #include "nm-libnm-core-aux.h" -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" /*****************************************************************************/ diff --git a/libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.h b/src/libnm-core-aux-extern/nm-libnm-core-aux.h index 905f24331e..905f24331e 100644 --- a/libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.h +++ b/src/libnm-core-aux-extern/nm-libnm-core-aux.h diff --git a/src/libnm-core-aux-intern/README.md b/src/libnm-core-aux-intern/README.md new file mode 100644 index 0000000000..37e238f111 --- /dev/null +++ b/src/libnm-core-aux-intern/README.md @@ -0,0 +1,28 @@ +libnm-core-aux-intern +===================== + +`libnm-core-aux-intern` is a static library that: + + - uses parts of [`libnm-core-impl`](../libnm-core-impl), that are public API + of [`libnm`](../../libnm) (i.e. [`libnm-core-public`](../libnm-core-public)). + - that is statically linked into [`libnm-core-impl`](../libnm-core-impl) (and thus + [`libnm`](../libnm) and NetworkManager core. + - that can also be statically linked into other users of [`libnm`](../libnm). + +Basically, it is a static library with utility functions that extends +[`libnm-core-impl`](../libnm-core-impl) (the part that is public API of libnm), +but it is also used by [`libnm-core-impl`](../libnm-core-impl) itself. + +That means: + + - you can use it everywhere where you either statically link + with [`libnm-core-impl`](../libnm-core-impl), or dynamically link with + [`libnm`](../../libnm). + - you can even use it inside of [`libnm-core-impl`](../libnm-core-impl) itself. + This is the difference between `libnm-core-aux-intern` and + [`libnm-core-aux-extern`](..libnm-core-aux-extern). + +Note that `libnm-core-aux-intern` only uses public API of `libnm`. + +This directory should not be added to the include search path. Instead, +users should fully qualify the include like `#include "libnm-core-aux-intern/nm-auth-subject.h"`. diff --git a/src/libnm-core-aux-intern/meson.build b/src/libnm-core-aux-intern/meson.build new file mode 100644 index 0000000000..fbb534c160 --- /dev/null +++ b/src/libnm-core-aux-intern/meson.build @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_core_aux_intern = static_library( + 'nm-core-aux-intern', + sources: files( + 'nm-auth-subject.c', + 'nm-libnm-core-utils.c', + ), + dependencies: [ + libnm_core_public_dep, + libnm_glib_aux_dep, + glib_dep, + ], + c_args: [ + '-DG_LOG_DOMAIN="libnm"', + ], +) + +libnm_core_aux_intern_dep = declare_dependency( + include_directories: [ + shared_inc, + src_inc, + top_inc, + ], + dependencies: [ + libnm_core_public_dep, + glib_dep, + ], +) + +libnm_core_aux_intern_dep_link = declare_dependency( + dependencies: libnm_core_aux_intern_dep, + link_with: libnm_core_aux_intern, +) diff --git a/libnm-core/nm-libnm-core-intern/nm-auth-subject.c b/src/libnm-core-aux-intern/nm-auth-subject.c index 1866662c2d..2862356052 100644 --- a/libnm-core/nm-libnm-core-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 "libnm-core/nm-default-libnm-core.h" +#include "nm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-auth-subject.h" diff --git a/libnm-core/nm-libnm-core-intern/nm-auth-subject.h b/src/libnm-core-aux-intern/nm-auth-subject.h index 2c9c4f71a9..2c9c4f71a9 100644 --- a/libnm-core/nm-libnm-core-intern/nm-auth-subject.h +++ b/src/libnm-core-aux-intern/nm-auth-subject.h diff --git a/libnm-core/nm-libnm-core-intern/nm-common-macros.h b/src/libnm-core-aux-intern/nm-common-macros.h index c452b7d3cb..c452b7d3cb 100644 --- a/libnm-core/nm-libnm-core-intern/nm-common-macros.h +++ b/src/libnm-core-aux-intern/nm-common-macros.h diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c index 1ab0fcf253..e3d7b7b183 100644 --- a/libnm-core/nm-libnm-core-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 "libnm-core/nm-default-libnm-core.h" +#include "nm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-libnm-core-utils.h" diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h b/src/libnm-core-aux-intern/nm-libnm-core-utils.h index 946c7a2c0e..946c7a2c0e 100644 --- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h +++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.h diff --git a/src/libnm-core-impl/README.md b/src/libnm-core-impl/README.md new file mode 100644 index 0000000000..0fce8e1e5c --- /dev/null +++ b/src/libnm-core-impl/README.md @@ -0,0 +1,22 @@ +libnm-core-impl +=============== + +NetworkManager provides a client library [`libnm`](../../libnm). +NetworkManager core does not (dynamically) link against all of libnm. +Instead, it statically links against a part of it. +That part is the static helper library `libnm-core-impl`. + +`libnm-core-impl` implements (and provides) the API from +[`libnm-core-public`](../libnm-core-public), which is part of the public +API of [`libnm`](../../libnm). In this form, `libnm-core-impl` is part +of the implementation of [`libnm`](../../libnm). It also implements (and +provides) an internal API [`libnm-core-intern`](../libnm-core-intern) which +can only be used by those who link statically against `libnm-core-impl`. + +Only NetworkManager core and [`libnm`](../../libnm) are allowed to statically +link with `libnm-core-impl`. Consequently, only those are allowed to include +[`libnm-core-intern`](../libnm-core-intern). + +This directory should not be added to the include search path of other +components as they are only allowed to include [`libnm-core-public`](../libnm-core-public) +and [`libnm-core-intern`](../libnm-core-intern). diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build new file mode 100644 index 0000000000..b4a257e9ec --- /dev/null +++ b/src/libnm-core-impl/meson.build @@ -0,0 +1,132 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_core_impl_inc = include_directories('.') + +# FIXME: compile both crypto backends. +libnm_crypto = static_library( + 'nm-crypto', + sources: 'nm-crypto-@0@.c'.format(crypto), + dependencies: [ + libnm_core_public_dep, + crypto_dep, + libnm_glib_aux_dep_link, + ], + c_args: [ + '-DG_LOG_DOMAIN="libnm"', + ], +) + +libnm_core_settings_sources = files( + 'nm-setting-6lowpan.c', + 'nm-setting-8021x.c', + 'nm-setting-adsl.c', + 'nm-setting-bluetooth.c', + 'nm-setting-bond.c', + 'nm-setting-bridge-port.c', + 'nm-setting-bridge.c', + 'nm-setting-cdma.c', + 'nm-setting-connection.c', + 'nm-setting-dcb.c', + 'nm-setting-dummy.c', + 'nm-setting-ethtool.c', + 'nm-setting-generic.c', + 'nm-setting-gsm.c', + 'nm-setting-hostname.c', + 'nm-setting-infiniband.c', + 'nm-setting-ip-config.c', + 'nm-setting-ip-tunnel.c', + 'nm-setting-ip4-config.c', + 'nm-setting-ip6-config.c', + 'nm-setting-macsec.c', + 'nm-setting-macvlan.c', + 'nm-setting-match.c', + 'nm-setting-olpc-mesh.c', + 'nm-setting-ovs-bridge.c', + 'nm-setting-ovs-dpdk.c', + 'nm-setting-ovs-external-ids.c', + 'nm-setting-ovs-interface.c', + 'nm-setting-ovs-patch.c', + 'nm-setting-ovs-port.c', + 'nm-setting-ppp.c', + 'nm-setting-pppoe.c', + 'nm-setting-proxy.c', + 'nm-setting-serial.c', + 'nm-setting-sriov.c', + 'nm-setting-tc-config.c', + 'nm-setting-team-port.c', + 'nm-setting-team.c', + 'nm-setting-tun.c', + 'nm-setting-user.c', + 'nm-setting-veth.c', + 'nm-setting-vlan.c', + 'nm-setting-vpn.c', + 'nm-setting-vrf.c', + 'nm-setting-vxlan.c', + 'nm-setting-wifi-p2p.c', + 'nm-setting-wimax.c', + 'nm-setting-wired.c', + 'nm-setting-wireguard.c', + 'nm-setting-wireless-security.c', + 'nm-setting-wireless.c', + 'nm-setting-wpan.c', +) + +libnm_core_impl_sources = files( + 'nm-connection.c', + 'nm-crypto.c', + 'nm-dbus-utils.c', + 'nm-errors.c', + 'nm-keyfile-utils.c', + 'nm-keyfile.c', + 'nm-meta-setting-base-impl.c', + 'nm-property-compare.c', + 'nm-setting.c', + 'nm-simple-connection.c', + 'nm-team-utils.c', + 'nm-utils.c', + 'nm-vpn-editor-plugin.c', + 'nm-vpn-plugin-info.c', +) + +libnm_core_impl = static_library( + 'nm-core-impl', + sources: libnm_core_impl_sources + libnm_core_settings_sources + libnm_core_public_enum_sources + [nm_version_macro_header], + include_directories: [ + top_inc, + src_inc, + libnm_core_intern_inc, + ], + dependencies: [ + dl_dep, + libnm_systemd_shared_dep, + libnm_core_public_dep, + libnm_core_intern_dep, + libnm_glib_aux_dep_link, + uuid_dep, + ], + c_args: [ + '-DG_LOG_DOMAIN="libnm"', + ], + link_with: [ + libnm_crypto, + libnm_core_aux_intern, + ], +) + +libnm_core_impl_dep = declare_dependency( + dependencies: [ + libnm_core_public_dep, + glib_dep, + ], +) + +libnm_core_impl_dep_link = declare_dependency( + dependencies: [ + libnm_core_impl_dep, + ], + link_with: libnm_core_impl, +) + +if enable_tests + subdir('tests') +endif diff --git a/libnm-core/nm-connection-private.h b/src/libnm-core-impl/nm-connection-private.h index 532b17637b..532b17637b 100644 --- a/libnm-core/nm-connection-private.h +++ b/src/libnm-core-impl/nm-connection-private.h diff --git a/libnm-core/nm-connection.c b/src/libnm-core-impl/nm-connection.c index b39c41d7bd..bc070a9d84 100644 --- a/libnm-core/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-connection.h" @@ -13,7 +13,7 @@ #include "nm-connection-private.h" #include "nm-utils.h" #include "nm-setting-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /** * SECTION:nm-connection diff --git a/libnm-core/nm-crypto-gnutls.c b/src/libnm-core-impl/nm-crypto-gnutls.c index 17c5d1dc6a..0f6da6175e 100644 --- a/libnm-core/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 "libnm-core/nm-default-libnm-core.h" +#include "nm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-crypto-impl.h" diff --git a/libnm-core/nm-crypto-impl.h b/src/libnm-core-impl/nm-crypto-impl.h index 185f11da12..0fd8f194d4 100644 --- a/libnm-core/nm-crypto-impl.h +++ b/src/libnm-core-impl/nm-crypto-impl.h @@ -7,10 +7,6 @@ #ifndef __NM_CRYPTO_IMPL_H__ #define __NM_CRYPTO_IMPL_H__ -#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE) - #error Cannot use this header. -#endif - #include "nm-crypto.h" gboolean _nm_crypto_init(GError **error); diff --git a/libnm-core/nm-crypto-nss.c b/src/libnm-core-impl/nm-crypto-nss.c index 8cbb4daf67..24a53f5dfe 100644 --- a/libnm-core/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 "libnm-core/nm-default-libnm-core.h" +#include "nm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-crypto-impl.h" diff --git a/libnm-core/nm-crypto.c b/src/libnm-core-impl/nm-crypto.c index 0eaeeb72f5..46888d45b8 100644 --- a/libnm-core/nm-crypto.c +++ b/src/libnm-core-impl/nm-crypto.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2018 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-crypto.h" diff --git a/libnm-core/nm-crypto.h b/src/libnm-core-impl/nm-crypto.h index 97bd4628a7..8665a234bf 100644 --- a/libnm-core/nm-crypto.h +++ b/src/libnm-core-impl/nm-crypto.h @@ -7,10 +7,6 @@ #ifndef __NM_CRYPTO_H__ #define __NM_CRYPTO_H__ -#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE) - #error Cannot use this header. -#endif - typedef enum { NM_CRYPTO_CIPHER_UNKNOWN, NM_CRYPTO_CIPHER_DES_EDE3_CBC, diff --git a/libnm-core/nm-dbus-utils.c b/src/libnm-core-impl/nm-dbus-utils.c index cf679daf9c..a272f08ce9 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/src/libnm-core-impl/nm-dbus-utils.c @@ -3,9 +3,9 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" typedef struct { char * signal_name; diff --git a/libnm-core/nm-default-libnm-core.h b/src/libnm-core-impl/nm-default-libnm-core.h index 6eb84b947a..6eb84b947a 100644 --- a/libnm-core/nm-default-libnm-core.h +++ b/src/libnm-core-impl/nm-default-libnm-core.h diff --git a/libnm-core/nm-errors.c b/src/libnm-core-impl/nm-errors.c index 023926630a..ea4ca5e9e6 100644 --- a/libnm-core/nm-errors.c +++ b/src/libnm-core-impl/nm-errors.c @@ -3,12 +3,12 @@ * Copyright (C) 2004 - 2014 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-errors.h" #include "nm-vpn-dbus-interface.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" NM_CACHED_QUARK_FCN("nm-agent-manager-error-quark", nm_agent_manager_error_quark); NM_CACHED_QUARK_FCN("nm-connection-error-quark", nm_connection_error_quark); diff --git a/libnm-core/nm-keyfile-utils.c b/src/libnm-core-impl/nm-keyfile-utils.c index 8de4b0d257..6e1a255314 100644 --- a/libnm-core/nm-keyfile-utils.c +++ b/src/libnm-core-impl/nm-keyfile-utils.c @@ -3,9 +3,9 @@ * Copyright (C) 2010 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" -#include "nm-keyfile-utils.h" +#include "libnm-core-intern/nm-keyfile-utils.h" #include <stdlib.h> @@ -16,7 +16,7 @@ #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" /*****************************************************************************/ diff --git a/libnm-core/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c index c9c8cf8966..4e12f13c7e 100644 --- a/libnm-core/nm-keyfile.c +++ b/src/libnm-core-impl/nm-keyfile.c @@ -4,9 +4,9 @@ * Copyright (C) 2008 - 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #include <stdlib.h> #include <stdio.h> @@ -21,14 +21,14 @@ #include "nm-glib-aux/nm-str-buf.h" #include "nm-glib-aux/nm-secret-utils.h" #include "systemd/nm-sd-utils-shared.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-keyfile.h" #include "nm-setting-user.h" #include "nm-setting-ovs-external-ids.h" -#include "nm-keyfile-utils.h" +#include "libnm-core-intern/nm-keyfile-utils.h" #define ETHERNET_S390_OPTIONS_GROUP_NAME "ethernet-s390-options" diff --git a/libnm-core/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c index 523c0d5db3..523c0d5db3 100644 --- a/libnm-core/nm-meta-setting-base-impl.c +++ b/src/libnm-core-impl/nm-meta-setting-base-impl.c diff --git a/libnm-core/nm-property-compare.c b/src/libnm-core-impl/nm-property-compare.c index c7cf10a26b..4347d6d678 100644 --- a/libnm-core/nm-property-compare.c +++ b/src/libnm-core-impl/nm-property-compare.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-property-compare.h" diff --git a/libnm-core/nm-property-compare.h b/src/libnm-core-impl/nm-property-compare.h index d422b1c8a4..d422b1c8a4 100644 --- a/libnm-core/nm-property-compare.h +++ b/src/libnm-core-impl/nm-property-compare.h diff --git a/libnm-core/nm-setting-6lowpan.c b/src/libnm-core-impl/nm-setting-6lowpan.c index f71daf3258..408b39b5dd 100644 --- a/libnm-core/nm-setting-6lowpan.c +++ b/src/libnm-core-impl/nm-setting-6lowpan.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-6lowpan.h" diff --git a/libnm-core/nm-setting-8021x.c b/src/libnm-core-impl/nm-setting-8021x.c index 1b38aa1416..96935b5f08 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/src/libnm-core-impl/nm-setting-8021x.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/nm-setting-adsl.c b/src/libnm-core-impl/nm-setting-adsl.c index f26698b6da..5b1afab69f 100644 --- a/libnm-core/nm-setting-adsl.c +++ b/src/libnm-core-impl/nm-setting-adsl.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 - 2013 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-adsl.h" diff --git a/libnm-core/nm-setting-bluetooth.c b/src/libnm-core-impl/nm-setting-bluetooth.c index eb0e59300d..18d08487e1 100644 --- a/libnm-core/nm-setting-bluetooth.c +++ b/src/libnm-core-impl/nm-setting-bluetooth.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-bluetooth.h" diff --git a/libnm-core/nm-setting-bond.c b/src/libnm-core-impl/nm-setting-bond.c index 2d64ef02b4..69bf49a4e4 100644 --- a/libnm-core/nm-setting-bond.c +++ b/src/libnm-core-impl/nm-setting-bond.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 - 2013 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-bond.h" @@ -12,12 +12,12 @@ #include <arpa/inet.h> #include <linux/if_ether.h> -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-connection-private.h" #include "nm-setting-infiniband.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm-core/nm-setting-bridge-port.c b/src/libnm-core-impl/nm-setting-bridge-port.c index 74c6384772..9d1ff25986 100644 --- a/libnm-core/nm-setting-bridge-port.c +++ b/src/libnm-core-impl/nm-setting-bridge-port.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 - 2013 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-bridge-port.h" diff --git a/libnm-core/nm-setting-bridge.c b/src/libnm-core-impl/nm-setting-bridge.c index 15d663db40..95ae5bfbcc 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/src/libnm-core-impl/nm-setting-bridge.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 - 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-bridge.h" diff --git a/libnm-core/nm-setting-cdma.c b/src/libnm-core-impl/nm-setting-cdma.c index 42e77c6169..bb30d10425 100644 --- a/libnm-core/nm-setting-cdma.c +++ b/src/libnm-core-impl/nm-setting-cdma.c @@ -3,7 +3,7 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-cdma.h" diff --git a/libnm-core/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index d6626a4d5a..38ba6663fb 100644 --- a/libnm-core/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -4,11 +4,11 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-connection.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-core-enum-types.h" diff --git a/libnm-core/nm-setting-dcb.c b/src/libnm-core-impl/nm-setting-dcb.c index 839d914674..695953d14e 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/src/libnm-core-impl/nm-setting-dcb.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-dcb.h" diff --git a/libnm-core/nm-setting-dummy.c b/src/libnm-core-impl/nm-setting-dummy.c index 9ba626dc82..f2b479b883 100644 --- a/libnm-core/nm-setting-dummy.c +++ b/src/libnm-core-impl/nm-setting-dummy.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-dummy.h" diff --git a/libnm-core/nm-setting-ethtool.c b/src/libnm-core-impl/nm-setting-ethtool.c index f2c6d15e91..db459697db 100644 --- a/libnm-core/nm-setting-ethtool.c +++ b/src/libnm-core-impl/nm-setting-ethtool.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ethtool.h" diff --git a/libnm-core/nm-setting-generic.c b/src/libnm-core-impl/nm-setting-generic.c index 07dbd9b8f7..70752c07eb 100644 --- a/libnm-core/nm-setting-generic.c +++ b/src/libnm-core-impl/nm-setting-generic.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-generic.h" diff --git a/libnm-core/nm-setting-gsm.c b/src/libnm-core-impl/nm-setting-gsm.c index c4eda96918..a148e139f6 100644 --- a/libnm-core/nm-setting-gsm.c +++ b/src/libnm-core-impl/nm-setting-gsm.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-gsm.h" diff --git a/libnm-core/nm-setting-hostname.c b/src/libnm-core-impl/nm-setting-hostname.c index 2396b7bdd1..248ae556e3 100644 --- a/libnm-core/nm-setting-hostname.c +++ b/src/libnm-core-impl/nm-setting-hostname.c @@ -3,7 +3,7 @@ * Copyright (C) 2020 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-hostname.h" diff --git a/libnm-core/nm-setting-infiniband.c b/src/libnm-core-impl/nm-setting-infiniband.c index c315843c69..11485dda06 100644 --- a/libnm-core/nm-setting-infiniband.c +++ b/src/libnm-core-impl/nm-setting-infiniband.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 - 2013 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-infiniband.h" diff --git a/libnm-core/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index 45ecbd8868..d55ebbf78f 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ip-config.h" diff --git a/libnm-core/nm-setting-ip-tunnel.c b/src/libnm-core-impl/nm-setting-ip-tunnel.c index 998b816bd3..5cdcdc81b1 100644 --- a/libnm-core/nm-setting-ip-tunnel.c +++ b/src/libnm-core-impl/nm-setting-ip-tunnel.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ip-tunnel.h" diff --git a/libnm-core/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c index 4e5ff0f471..e08bc52e19 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/src/libnm-core-impl/nm-setting-ip4-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ip4-config.h" diff --git a/libnm-core/nm-setting-ip6-config.c b/src/libnm-core-impl/nm-setting-ip6-config.c index 06463f82f7..4477436edb 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/src/libnm-core-impl/nm-setting-ip6-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2007 - 2014 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ip6-config.h" @@ -11,7 +11,7 @@ #include "nm-setting-private.h" #include "nm-core-enum-types.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /** * SECTION:nm-setting-ip6-config diff --git a/libnm-core/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c index d70696d95d..e2a87ffc18 100644 --- a/libnm-core/nm-setting-macsec.c +++ b/src/libnm-core-impl/nm-setting-macsec.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-macsec.h" @@ -12,7 +12,7 @@ #include "nm-glib-aux/nm-secret-utils.h" #include "nm-utils.h" -#include "nm-core-types-internal.h" +#include "libnm-core-intern/nm-core-types-internal.h" #include "nm-setting-connection.h" #include "nm-setting-private.h" #include "nm-setting-wired.h" diff --git a/libnm-core/nm-setting-macvlan.c b/src/libnm-core-impl/nm-setting-macvlan.c index 8c8c6279be..0e6414bce2 100644 --- a/libnm-core/nm-setting-macvlan.c +++ b/src/libnm-core-impl/nm-setting-macvlan.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-macvlan.h" diff --git a/libnm-core/nm-setting-match.c b/src/libnm-core-impl/nm-setting-match.c index 108aba95f2..fbc02c574e 100644 --- a/libnm-core/nm-setting-match.c +++ b/src/libnm-core-impl/nm-setting-match.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-match.h" diff --git a/libnm-core/nm-setting-olpc-mesh.c b/src/libnm-core-impl/nm-setting-olpc-mesh.c index ef0b5d603d..04e24ffc36 100644 --- a/libnm-core/nm-setting-olpc-mesh.c +++ b/src/libnm-core-impl/nm-setting-olpc-mesh.c @@ -5,7 +5,7 @@ * Copyright (C) 2009 One Laptop per Child */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-olpc-mesh.h" diff --git a/libnm-core/nm-setting-ovs-bridge.c b/src/libnm-core-impl/nm-setting-ovs-bridge.c index 07d24d7bf0..9d67231b93 100644 --- a/libnm-core/nm-setting-ovs-bridge.c +++ b/src/libnm-core-impl/nm-setting-ovs-bridge.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ovs-bridge.h" diff --git a/libnm-core/nm-setting-ovs-dpdk.c b/src/libnm-core-impl/nm-setting-ovs-dpdk.c index 6d27d78c4d..957b0f5716 100644 --- a/libnm-core/nm-setting-ovs-dpdk.c +++ b/src/libnm-core-impl/nm-setting-ovs-dpdk.c @@ -3,7 +3,7 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ovs-dpdk.h" diff --git a/libnm-core/nm-setting-ovs-external-ids.c b/src/libnm-core-impl/nm-setting-ovs-external-ids.c index 16becb7272..b73c1af497 100644 --- a/libnm-core/nm-setting-ovs-external-ids.c +++ b/src/libnm-core-impl/nm-setting-ovs-external-ids.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 - 2020 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ovs-external-ids.h" diff --git a/libnm-core/nm-setting-ovs-interface.c b/src/libnm-core-impl/nm-setting-ovs-interface.c index 0c04a66cbb..1fde96050a 100644 --- a/libnm-core/nm-setting-ovs-interface.c +++ b/src/libnm-core-impl/nm-setting-ovs-interface.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ovs-interface.h" diff --git a/libnm-core/nm-setting-ovs-patch.c b/src/libnm-core-impl/nm-setting-ovs-patch.c index 18a62d2eb4..a226a26d47 100644 --- a/libnm-core/nm-setting-ovs-patch.c +++ b/src/libnm-core-impl/nm-setting-ovs-patch.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ovs-patch.h" diff --git a/libnm-core/nm-setting-ovs-port.c b/src/libnm-core-impl/nm-setting-ovs-port.c index 63da66fca1..821f29ab14 100644 --- a/libnm-core/nm-setting-ovs-port.c +++ b/src/libnm-core-impl/nm-setting-ovs-port.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ovs-port.h" diff --git a/libnm-core/nm-setting-ppp.c b/src/libnm-core-impl/nm-setting-ppp.c index 36fe84c34b..cddd83420f 100644 --- a/libnm-core/nm-setting-ppp.c +++ b/src/libnm-core-impl/nm-setting-ppp.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-ppp.h" diff --git a/libnm-core/nm-setting-pppoe.c b/src/libnm-core-impl/nm-setting-pppoe.c index ef1d9ba1a9..218bf94e7e 100644 --- a/libnm-core/nm-setting-pppoe.c +++ b/src/libnm-core-impl/nm-setting-pppoe.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-pppoe.h" diff --git a/libnm-core/nm-setting-private.h b/src/libnm-core-impl/nm-setting-private.h index 7edb5cb2ab..bf59a3c802 100644 --- a/libnm-core/nm-setting-private.h +++ b/src/libnm-core-impl/nm-setting-private.h @@ -15,7 +15,7 @@ #include "nm-connection.h" #include "nm-core-enum-types.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm-core/nm-setting-proxy.c b/src/libnm-core-impl/nm-setting-proxy.c index 10cebc7370..1e7eca8238 100644 --- a/libnm-core/nm-setting-proxy.c +++ b/src/libnm-core-impl/nm-setting-proxy.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Atul Anand <atulhjp@gmail.com>. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-proxy.h" diff --git a/libnm-core/nm-setting-serial.c b/src/libnm-core-impl/nm-setting-serial.c index 1e5418a149..1df87b638d 100644 --- a/libnm-core/nm-setting-serial.c +++ b/src/libnm-core-impl/nm-setting-serial.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-serial.h" diff --git a/libnm-core/nm-setting-sriov.c b/src/libnm-core-impl/nm-setting-sriov.c index 47625a4109..70e542d1cd 100644 --- a/libnm-core/nm-setting-sriov.c +++ b/src/libnm-core-impl/nm-setting-sriov.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-sriov.h" diff --git a/libnm-core/nm-setting-tc-config.c b/src/libnm-core-impl/nm-setting-tc-config.c index 33df6d34e5..c5b28b502d 100644 --- a/libnm-core/nm-setting-tc-config.c +++ b/src/libnm-core-impl/nm-setting-tc-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-tc-config.h" diff --git a/libnm-core/nm-setting-team-port.c b/src/libnm-core-impl/nm-setting-team-port.c index ea8115a74a..f3e3adb50b 100644 --- a/libnm-core/nm-setting-team-port.c +++ b/src/libnm-core-impl/nm-setting-team-port.c @@ -4,7 +4,7 @@ * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-team-port.h" diff --git a/libnm-core/nm-setting-team.c b/src/libnm-core-impl/nm-setting-team.c index f89a3031f3..d05f04cfab 100644 --- a/libnm-core/nm-setting-team.c +++ b/src/libnm-core-impl/nm-setting-team.c @@ -4,7 +4,7 @@ * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-team.h" diff --git a/libnm-core/nm-setting-tun.c b/src/libnm-core-impl/nm-setting-tun.c index 1208a62bad..412292a2e4 100644 --- a/libnm-core/nm-setting-tun.c +++ b/src/libnm-core-impl/nm-setting-tun.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-tun.h" diff --git a/libnm-core/nm-setting-user.c b/src/libnm-core-impl/nm-setting-user.c index f62b8babbc..0f99baa221 100644 --- a/libnm-core/nm-setting-user.c +++ b/src/libnm-core-impl/nm-setting-user.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-user.h" diff --git a/libnm-core/nm-setting-veth.c b/src/libnm-core-impl/nm-setting-veth.c index 6270afb38d..70cfe50b42 100644 --- a/libnm-core/nm-setting-veth.c +++ b/src/libnm-core-impl/nm-setting-veth.c @@ -3,7 +3,7 @@ * Copyright (C) 2020 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-veth.h" diff --git a/libnm-core/nm-setting-vlan.c b/src/libnm-core-impl/nm-setting-vlan.c index 123c11919c..e0cad6a614 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/src/libnm-core-impl/nm-setting-vlan.c @@ -3,15 +3,15 @@ * Copyright (C) 2011 - 2014 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-vlan.h" #include <stdlib.h> -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "nm-utils.h" -#include "nm-core-types-internal.h" +#include "libnm-core-intern/nm-core-types-internal.h" #include "nm-setting-connection.h" #include "nm-setting-private.h" #include "nm-setting-wired.h" diff --git a/libnm-core/nm-setting-vpn.c b/src/libnm-core-impl/nm-setting-vpn.c index 8ee5c2b972..19aafd4f19 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/src/libnm-core-impl/nm-setting-vpn.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-vpn.h" diff --git a/libnm-core/nm-setting-vrf.c b/src/libnm-core-impl/nm-setting-vrf.c index d4198a7b78..a5ee739592 100644 --- a/libnm-core/nm-setting-vrf.c +++ b/src/libnm-core-impl/nm-setting-vrf.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-vrf.h" diff --git a/libnm-core/nm-setting-vxlan.c b/src/libnm-core-impl/nm-setting-vxlan.c index ea8d454681..ad7156f22f 100644 --- a/libnm-core/nm-setting-vxlan.c +++ b/src/libnm-core-impl/nm-setting-vxlan.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-vxlan.h" diff --git a/libnm-core/nm-setting-wifi-p2p.c b/src/libnm-core-impl/nm-setting-wifi-p2p.c index e026cb8fbb..8f677479d3 100644 --- a/libnm-core/nm-setting-wifi-p2p.c +++ b/src/libnm-core-impl/nm-setting-wifi-p2p.c @@ -3,14 +3,14 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-wifi-p2p.h" #include <net/ethernet.h> #include "nm-utils.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-wimax.c b/src/libnm-core-impl/nm-setting-wimax.c index dcb59412f4..3051405941 100644 --- a/libnm-core/nm-setting-wimax.c +++ b/src/libnm-core-impl/nm-setting-wimax.c @@ -4,7 +4,7 @@ * Copyright (C) 2009 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-wimax.h" diff --git a/libnm-core/nm-setting-wired.c b/src/libnm-core-impl/nm-setting-wired.c index 857f11b1f9..f56ab8b4c8 100644 --- a/libnm-core/nm-setting-wired.c +++ b/src/libnm-core-impl/nm-setting-wired.c @@ -4,14 +4,14 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-wired.h" #include <net/ethernet.h> #include "nm-utils.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-wireguard.c b/src/libnm-core-impl/nm-setting-wireguard.c index 3a36dabafb..ea723a5b2e 100644 --- a/libnm-core/nm-setting-wireguard.c +++ b/src/libnm-core-impl/nm-setting-wireguard.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 - 2019 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-wireguard.h" diff --git a/libnm-core/nm-setting-wireless-security.c b/src/libnm-core-impl/nm-setting-wireless-security.c index 162f92202c..f5bbe185f3 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/src/libnm-core-impl/nm-setting-wireless-security.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-wireless-security.h" diff --git a/libnm-core/nm-setting-wireless.c b/src/libnm-core-impl/nm-setting-wireless.c index 232bc7a05d..54c12c818a 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/src/libnm-core-impl/nm-setting-wireless.c @@ -4,14 +4,14 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-wireless.h" #include <net/ethernet.h> #include "nm-utils.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-wpan.c b/src/libnm-core-impl/nm-setting-wpan.c index 13bd368469..28a6478f16 100644 --- a/libnm-core/nm-setting-wpan.c +++ b/src/libnm-core-impl/nm-setting-wpan.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk> */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-wpan.h" diff --git a/libnm-core/nm-setting.c b/src/libnm-core-impl/nm-setting.c index 45644ac341..22ec0f6d34 100644 --- a/libnm-core/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -4,13 +4,13 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting.h" #include "nm-setting-private.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-utils-private.h" #include "nm-property-compare.h" diff --git a/libnm-core/nm-simple-connection.c b/src/libnm-core-impl/nm-simple-connection.c index 6f1e3a9b3f..6834c41e23 100644 --- a/libnm-core/nm-simple-connection.c +++ b/src/libnm-core-impl/nm-simple-connection.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2014 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-simple-connection.h" diff --git a/libnm-core/nm-team-utils.c b/src/libnm-core-impl/nm-team-utils.c index b7da35aae2..9546ababfd 100644 --- a/libnm-core/nm-team-utils.c +++ b/src/libnm-core-impl/nm-team-utils.c @@ -5,14 +5,14 @@ #define NM_VALUE_TYPE_DEFINE_FUNCTIONS -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-team-utils.h" #include "nm-errors.h" #include "nm-utils-private.h" #include "nm-glib-aux/nm-json-aux.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-team.h" #include "nm-setting-team-port.h" diff --git a/libnm-core/nm-team-utils.h b/src/libnm-core-impl/nm-team-utils.h index 77a34e5fdb..1488eb9da5 100644 --- a/libnm-core/nm-team-utils.h +++ b/src/libnm-core-impl/nm-team-utils.h @@ -11,7 +11,7 @@ #endif #include "nm-glib-aux/nm-value-type.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" struct _NMSetting; diff --git a/libnm-core/nm-utils-private.h b/src/libnm-core-impl/nm-utils-private.h index eb545d0fa8..eb545d0fa8 100644 --- a/libnm-core/nm-utils-private.h +++ b/src/libnm-core-impl/nm-utils-private.h diff --git a/libnm-core/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 6ceef1e402..d4ab51df5f 100644 --- a/libnm-core/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2005 - 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-utils.h" @@ -24,7 +24,7 @@ #include "nm-glib-aux/nm-time-utils.h" #include "nm-glib-aux/nm-secret-utils.h" #include "systemd/nm-sd-utils-shared.h" -#include "nm-libnm-core-intern/nm-common-macros.h" +#include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" #include "nm-crypto.h" diff --git a/libnm-core/nm-vpn-editor-plugin.c b/src/libnm-core-impl/nm-vpn-editor-plugin.c index e68bdc24ee..468ddcead5 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/src/libnm-core-impl/nm-vpn-editor-plugin.c @@ -5,14 +5,14 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-vpn-editor-plugin.h" #include <dlfcn.h> #include <gmodule.h> -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm-core/nm-vpn-plugin-info.c b/src/libnm-core-impl/nm-vpn-plugin-info.c index cb739510f1..dc77dfd025 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/src/libnm-core-impl/nm-vpn-plugin-info.c @@ -3,14 +3,14 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-vpn-plugin-info.h" #include <sys/stat.h> #include "nm-errors.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #define DEFAULT_DIR_ETC NMCONFDIR "/VPN" #define DEFAULT_DIR_LIB NMLIBDIR "/VPN" diff --git a/libnm-core/tests/certs/ca-no-ending-newline.pem b/src/libnm-core-impl/tests/certs/ca-no-ending-newline.pem index 664e299aa7..664e299aa7 100644 --- a/libnm-core/tests/certs/ca-no-ending-newline.pem +++ b/src/libnm-core-impl/tests/certs/ca-no-ending-newline.pem diff --git a/libnm-core/tests/certs/pkcs8-decrypted.der b/src/libnm-core-impl/tests/certs/pkcs8-decrypted.der Binary files differindex 2cbdeb5e30..2cbdeb5e30 100644 --- a/libnm-core/tests/certs/pkcs8-decrypted.der +++ b/src/libnm-core-impl/tests/certs/pkcs8-decrypted.der diff --git a/libnm-core/tests/certs/pkcs8-enc-key.pem b/src/libnm-core-impl/tests/certs/pkcs8-enc-key.pem index 0d08f2d299..0d08f2d299 100644 --- a/libnm-core/tests/certs/pkcs8-enc-key.pem +++ b/src/libnm-core-impl/tests/certs/pkcs8-enc-key.pem diff --git a/libnm-core/tests/certs/pkcs8-noenc-key.pem b/src/libnm-core-impl/tests/certs/pkcs8-noenc-key.pem index f73fb55ab2..f73fb55ab2 100644 --- a/libnm-core/tests/certs/pkcs8-noenc-key.pem +++ b/src/libnm-core-impl/tests/certs/pkcs8-noenc-key.pem diff --git a/libnm-core/tests/certs/test-aes-128-key.pem b/src/libnm-core-impl/tests/certs/test-aes-128-key.pem index aab8f463ca..aab8f463ca 100644 --- a/libnm-core/tests/certs/test-aes-128-key.pem +++ b/src/libnm-core-impl/tests/certs/test-aes-128-key.pem diff --git a/libnm-core/tests/certs/test-aes-256-key.pem b/src/libnm-core-impl/tests/certs/test-aes-256-key.pem index e51bafd3d6..e51bafd3d6 100644 --- a/libnm-core/tests/certs/test-aes-256-key.pem +++ b/src/libnm-core-impl/tests/certs/test-aes-256-key.pem diff --git a/libnm-core/tests/certs/test-ca-cert.pem b/src/libnm-core-impl/tests/certs/test-ca-cert.pem index ef1be20d2b..ef1be20d2b 100644 --- a/libnm-core/tests/certs/test-ca-cert.pem +++ b/src/libnm-core-impl/tests/certs/test-ca-cert.pem diff --git a/libnm-core/tests/certs/test-cert.p12 b/src/libnm-core-impl/tests/certs/test-cert.p12 Binary files differindex ae4a683049..ae4a683049 100644 --- a/libnm-core/tests/certs/test-cert.p12 +++ b/src/libnm-core-impl/tests/certs/test-cert.p12 diff --git a/libnm-core/tests/certs/test-key-and-cert.pem b/src/libnm-core-impl/tests/certs/test-key-and-cert.pem index dec9aa1b8f..dec9aa1b8f 100644 --- a/libnm-core/tests/certs/test-key-and-cert.pem +++ b/src/libnm-core-impl/tests/certs/test-key-and-cert.pem diff --git a/libnm-core/tests/certs/test-key-only-decrypted.der b/src/libnm-core-impl/tests/certs/test-key-only-decrypted.der Binary files differindex c8652537a6..c8652537a6 100644 --- a/libnm-core/tests/certs/test-key-only-decrypted.der +++ b/src/libnm-core-impl/tests/certs/test-key-only-decrypted.der diff --git a/libnm-core/tests/certs/test-key-only-decrypted.pem b/src/libnm-core-impl/tests/certs/test-key-only-decrypted.pem index 1a25da5e7d..1a25da5e7d 100644 --- a/libnm-core/tests/certs/test-key-only-decrypted.pem +++ b/src/libnm-core-impl/tests/certs/test-key-only-decrypted.pem diff --git a/libnm-core/tests/certs/test-key-only.pem b/src/libnm-core-impl/tests/certs/test-key-only.pem index 5ef530e9ab..5ef530e9ab 100644 --- a/libnm-core/tests/certs/test-key-only.pem +++ b/src/libnm-core-impl/tests/certs/test-key-only.pem diff --git a/libnm-core/tests/certs/test-tpm2wrapped-key.pem b/src/libnm-core-impl/tests/certs/test-tpm2wrapped-key.pem index f3fd271c32..f3fd271c32 100644 --- a/libnm-core/tests/certs/test-tpm2wrapped-key.pem +++ b/src/libnm-core-impl/tests/certs/test-tpm2wrapped-key.pem diff --git a/libnm-core/tests/certs/test2-cert.p12 b/src/libnm-core-impl/tests/certs/test2-cert.p12 Binary files differindex 9d5732b0a9..9d5732b0a9 100644 --- a/libnm-core/tests/certs/test2-cert.p12 +++ b/src/libnm-core-impl/tests/certs/test2-cert.p12 diff --git a/libnm-core/tests/certs/test2_ca_cert.pem b/src/libnm-core-impl/tests/certs/test2_ca_cert.pem index 9a487ca4b4..9a487ca4b4 100644 --- a/libnm-core/tests/certs/test2_ca_cert.pem +++ b/src/libnm-core-impl/tests/certs/test2_ca_cert.pem diff --git a/libnm-core/tests/certs/test2_key_and_cert.pem b/src/libnm-core-impl/tests/certs/test2_key_and_cert.pem index a668596eef..a668596eef 100644 --- a/libnm-core/tests/certs/test2_key_and_cert.pem +++ b/src/libnm-core-impl/tests/certs/test2_key_and_cert.pem diff --git a/libnm-core/tests/certs/test_ca_cert.der b/src/libnm-core-impl/tests/certs/test_ca_cert.der Binary files differindex e844f65b2c..e844f65b2c 100644 --- a/libnm-core/tests/certs/test_ca_cert.der +++ b/src/libnm-core-impl/tests/certs/test_ca_cert.der diff --git a/libnm-core/tests/certs/test_ca_cert.pem b/src/libnm-core-impl/tests/certs/test_ca_cert.pem index faa3fc2905..faa3fc2905 100644 --- a/libnm-core/tests/certs/test_ca_cert.pem +++ b/src/libnm-core-impl/tests/certs/test_ca_cert.pem diff --git a/libnm-core/tests/certs/test_key_and_cert.pem b/src/libnm-core-impl/tests/certs/test_key_and_cert.pem index c00495d0b0..c00495d0b0 100644 --- a/libnm-core/tests/certs/test_key_and_cert.pem +++ b/src/libnm-core-impl/tests/certs/test_key_and_cert.pem diff --git a/libnm-core/tests/meson.build b/src/libnm-core-impl/tests/meson.build index df5209b4dc..80f8ea32e5 100644 --- a/libnm-core/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -4,7 +4,7 @@ enum_sources = gnome.mkenums_simple( 'nm-core-tests-enum-types', sources: 'test-general-enums.h', identifier_prefix: nm_id_prefix, - body_prefix: '#include "libnm-core/nm-default-libnm-core.h"', + body_prefix: '#include "libnm-core-impl/nm-default-libnm-core.h"', ) test_units = [ @@ -21,10 +21,14 @@ foreach test_unit: test_units exe = executable( 'libnm-core-' + test_unit, [test_unit + '.c'] + enum_sources, + include_directories: [ + libnm_core_impl_inc, + ], dependencies: [ - libnm_core_dep, - libnm_core_nm_default_dep, - libnm_base_dep, + libnm_core_public_dep, + libnm_core_intern_dep, + libnm_core_impl_dep_link, + libnm_base_dep_link, ], c_args: [ '-DG_LOG_DOMAIN="test"', diff --git a/libnm-core/tests/nm-core-tests-enum-types.c.template b/src/libnm-core-impl/tests/nm-core-tests-enum-types.c.template index 1160be86dc..1160be86dc 100644 --- a/libnm-core/tests/nm-core-tests-enum-types.c.template +++ b/src/libnm-core-impl/tests/nm-core-tests-enum-types.c.template diff --git a/libnm-core/tests/nm-core-tests-enum-types.h.template b/src/libnm-core-impl/tests/nm-core-tests-enum-types.h.template index 62e82b77ae..62e82b77ae 100644 --- a/libnm-core/tests/nm-core-tests-enum-types.h.template +++ b/src/libnm-core-impl/tests/nm-core-tests-enum-types.h.template diff --git a/libnm-core/tests/test-compare.c b/src/libnm-core-impl/tests/test-compare.c index 27049e875a..fb82c55910 100644 --- a/libnm-core/tests/test-compare.c +++ b/src/libnm-core-impl/tests/test-compare.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/libnm-core/tests/test-crypto.c b/src/libnm-core-impl/tests/test-crypto.c index 4e288b7b65..16082795cb 100644 --- a/libnm-core/tests/test-crypto.c +++ b/src/libnm-core-impl/tests/test-crypto.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2011 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include <unistd.h> #include <stdlib.h> @@ -13,11 +13,11 @@ #include "nm-crypto-impl.h" #include "nm-utils.h" #include "nm-errors.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-utils/nm-test-utils.h" -#define TEST_CERT_DIR NM_BUILD_SRCDIR "/libnm-core/tests/certs" +#define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs" #if 0 static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----"; diff --git a/libnm-core/tests/test-general-enums.h b/src/libnm-core-impl/tests/test-general-enums.h index b3163e2330..b3163e2330 100644 --- a/libnm-core/tests/test-general-enums.h +++ b/src/libnm-core-impl/tests/test-general-enums.h diff --git a/libnm-core/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index 885319fc16..80ec0e0c77 100644 --- a/libnm-core/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -5,7 +5,7 @@ #define NM_GLIB_COMPAT_H_TEST -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include <sys/types.h> #include <sys/stat.h> @@ -24,7 +24,7 @@ #include "nm-setting-private.h" #include "nm-utils.h" #include "nm-utils-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-core-tests-enum-types.h" #include "nm-team-utils.h" @@ -57,7 +57,7 @@ #include "nm-setting-wireless-security.h" #include "nm-setting-wpan.h" #include "nm-simple-connection.h" -#include "nm-keyfile-internal.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" diff --git a/libnm-core/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c index b3af6c4e4a..755a40ae29 100644 --- a/libnm-core/tests/test-keyfile.c +++ b/src/libnm-core-impl/tests/test-keyfile.c @@ -3,11 +3,11 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-glib-aux/nm-json-aux.h" -#include "nm-keyfile-utils.h" -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-utils.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #include "nm-simple-connection.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" @@ -18,7 +18,7 @@ #include "nm-utils/nm-test-utils.h" -#define TEST_CERT_DIR NM_BUILD_SRCDIR "/libnm-core/tests/certs" +#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" #define TEST_WIRED_TLS_PRIVKEY TEST_CERT_DIR "/test-key-and-cert.pem" #define TEST_WIRED_TLS_TPM2KEY TEST_CERT_DIR "/test-tpm2wrapped-key.pem" diff --git a/libnm-core/tests/test-secrets.c b/src/libnm-core-impl/tests/test-secrets.c index 42f1fd0a32..e2a58ded3f 100644 --- a/libnm-core/tests/test-secrets.c +++ b/src/libnm-core-impl/tests/test-secrets.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" @@ -18,11 +18,11 @@ #include "nm-setting-wireless.h" #include "nm-simple-connection.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-utils/nm-test-utils.h" -#define TEST_CERT_DIR NM_BUILD_SRCDIR "/libnm-core/tests/certs" +#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" #define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem" #define TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY TEST_CERT_DIR "/test_key_and_cert.pem" diff --git a/libnm-core/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c index 01cdb41cb2..1b08413f9c 100644 --- a/libnm-core/tests/test-setting.c +++ b/src/libnm-core-impl/tests/test-setting.c @@ -3,17 +3,17 @@ * Copyright (C) 2008 - 2017 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include <linux/pkt_sched.h> #include <net/if.h> #include "nm-glib-aux/nm-json-aux.h" #include "nm-base/nm-ethtool-utils-base.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-utils.h" #include "nm-utils-private.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-8021x.h" #include "nm-setting-bond.h" #include "nm-setting-dcb.h" @@ -26,11 +26,11 @@ #include "nm-simple-connection.h" #include "nm-setting-connection.h" #include "nm-errors.h" -#include "nm-keyfile-internal.h" +#include "libnm-core-intern/nm-keyfile-internal.h" #include "nm-utils/nm-test-utils.h" -#define TEST_CERT_DIR NM_BUILD_SRCDIR "/libnm-core/tests/certs" +#define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs" /*****************************************************************************/ diff --git a/libnm-core/tests/test-settings-defaults.c b/src/libnm-core-impl/tests/test-settings-defaults.c index 1e6acd3c5f..e04a55ec7a 100644 --- a/libnm-core/tests/test-settings-defaults.c +++ b/src/libnm-core-impl/tests/test-settings-defaults.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "libnm-core/nm-default-libnm-core.h" +#include "libnm-core-impl/nm-default-libnm-core.h" #include "nm-utils.h" #include "nm-setting-8021x.h" diff --git a/src/libnm-core-intern/README.md b/src/libnm-core-intern/README.md new file mode 100644 index 0000000000..f17cf4daf2 --- /dev/null +++ b/src/libnm-core-intern/README.md @@ -0,0 +1,19 @@ +libnm-core-intern +================= + +This contains header files only, which are also part of +the internal API of [`libnm-core-impl`](../libnm-core-impl). + +[`libnm-core-impl`](../libnm-core-impl) is a static library that (among others) implements +[`libnm-core-public`](../libnm-core-public) (which is a part of the public API of [`libnm`](../../libnm)). +This library gets statically linked into [`libnm`](../../libnm) and `NetworkManager`. +Hence, those components can also access internal (but not private) API of +[`libnm-core-impl`](../libnm-core-impl), and this API is in [`libnm-core-intern`](../libnm-core-intern). + +These headers can thus be included by anybody who statically links with +[`libnm-core-impl`](../libnm-core-impl) (including [`libnm-core-impl`](../libnm-core-impl) itself). + +The directory should not be added to the include search path, instead +users should explicitly `#include "libnm-core-intern/nm-core-internal.h"`) + +There is no source code here and no static library to link against. diff --git a/src/libnm-core-intern/meson.build b/src/libnm-core-intern/meson.build new file mode 100644 index 0000000000..0373452c20 --- /dev/null +++ b/src/libnm-core-intern/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_core_intern_inc = include_directories('.') + +libnm_core_intern_dep = declare_dependency( + dependencies: [ + libnm_core_public_dep, + glib_dep, + ], +) diff --git a/libnm-core/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index d9374fe5a7..4687e710cb 100644 --- a/libnm-core/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -78,7 +78,7 @@ #include "nm-utils.h" #include "nm-vpn-dbus-interface.h" #include "nm-vpn-editor-plugin.h" -#include "nm-libnm-core-intern/nm-libnm-core-utils.h" +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" /* IEEE 802.1D-1998 timer values */ #define NM_BRIDGE_HELLO_TIME_MIN 1u diff --git a/libnm-core/nm-core-types-internal.h b/src/libnm-core-intern/nm-core-types-internal.h index 346458d359..346458d359 100644 --- a/libnm-core/nm-core-types-internal.h +++ b/src/libnm-core-intern/nm-core-types-internal.h diff --git a/libnm-core/nm-keyfile-internal.h b/src/libnm-core-intern/nm-keyfile-internal.h index bb89214c5e..5140d8eb7c 100644 --- a/libnm-core/nm-keyfile-internal.h +++ b/src/libnm-core-intern/nm-keyfile-internal.h @@ -18,7 +18,7 @@ #include "nm-connection.h" #include "nm-setting-8021x.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" /*****************************************************************************/ diff --git a/libnm-core/nm-keyfile-utils.h b/src/libnm-core-intern/nm-keyfile-utils.h index 1555c11244..1555c11244 100644 --- a/libnm-core/nm-keyfile-utils.h +++ b/src/libnm-core-intern/nm-keyfile-utils.h diff --git a/libnm-core/nm-meta-setting-base-impl.h b/src/libnm-core-intern/nm-meta-setting-base-impl.h index 94b14e844f..94b14e844f 100644 --- a/libnm-core/nm-meta-setting-base-impl.h +++ b/src/libnm-core-intern/nm-meta-setting-base-impl.h diff --git a/libnm-core/nm-meta-setting-base.h b/src/libnm-core-intern/nm-meta-setting-base.h index 72fa8e6602..72fa8e6602 100644 --- a/libnm-core/nm-meta-setting-base.h +++ b/src/libnm-core-intern/nm-meta-setting-base.h diff --git a/src/libnm-core-public/README.md b/src/libnm-core-public/README.md new file mode 100644 index 0000000000..0737269d1c --- /dev/null +++ b/src/libnm-core-public/README.md @@ -0,0 +1,24 @@ +libnm-core-public +================= + +This contains (mostly) header files only, which are also part of +the public API of [`libnm`](../../libnm). + +Also, this API is implemented by the static library [`libnm-core-impl`](../libnm-core-impl), +which in turn is statically linked into NetworkManager core and [`libnm`](../../libnm). + +These headers can be used by anybody who either: + +- links (statically) against [`libnm-core-impl`](../libnm-core-impl). +- links dynamically against [`libnm`](../../libnm). + +Note that there is also one source file: `nm-core-enum-types.c`. +This source file really belongs to [`libnm-core-impl`](../libnm-core-impl) but it is here +because it's a generated file and so far I couldn't figure out how +to generate `nm-core-enum-types.h` here while moving `nm-core-enum-types.c` +to [`libnm-core-impl`](../libnm-core-impl). + +Aside `nm-core-enum-types.c`, this directory only provides header files. +Users should add this directory (both srcdir and builddir) to the include +search path, because libnm users are used to include these headers unqualified +(like `#include "nm-setting.h`). diff --git a/src/libnm-core-public/meson.build b/src/libnm-core-public/meson.build new file mode 100644 index 0000000000..6b8dad0f28 --- /dev/null +++ b/src/libnm-core-public/meson.build @@ -0,0 +1,128 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_core_public_inc = include_directories('.') + +libnm_core_headers = files( + 'nm-connection.h', + 'nm-core-types.h', + 'nm-dbus-interface.h', + 'nm-errors.h', + 'nm-keyfile.h', + 'nm-setting-6lowpan.h', + 'nm-setting-8021x.h', + 'nm-setting-adsl.h', + 'nm-setting-bluetooth.h', + 'nm-setting-bond.h', + 'nm-setting-bridge-port.h', + 'nm-setting-bridge.h', + 'nm-setting-cdma.h', + 'nm-setting-connection.h', + 'nm-setting-dcb.h', + 'nm-setting-dummy.h', + 'nm-setting-ethtool.h', + 'nm-setting-generic.h', + 'nm-setting-gsm.h', + 'nm-setting-hostname.h', + 'nm-setting-infiniband.h', + 'nm-setting-ip-config.h', + 'nm-setting-ip-tunnel.h', + 'nm-setting-ip4-config.h', + 'nm-setting-ip6-config.h', + 'nm-setting-macsec.h', + 'nm-setting-macvlan.h', + 'nm-setting-match.h', + 'nm-setting-olpc-mesh.h', + 'nm-setting-ovs-bridge.h', + 'nm-setting-ovs-dpdk.h', + 'nm-setting-ovs-external-ids.h', + 'nm-setting-ovs-interface.h', + 'nm-setting-ovs-patch.h', + 'nm-setting-ovs-port.h', + 'nm-setting-ppp.h', + 'nm-setting-pppoe.h', + 'nm-setting-proxy.h', + 'nm-setting-serial.h', + 'nm-setting-sriov.h', + 'nm-setting-tc-config.h', + 'nm-setting-team-port.h', + 'nm-setting-team.h', + 'nm-setting-tun.h', + 'nm-setting-user.h', + 'nm-setting-veth.h', + 'nm-setting-vlan.h', + 'nm-setting-vpn.h', + 'nm-setting-vrf.h', + 'nm-setting-vxlan.h', + 'nm-setting-wifi-p2p.h', + 'nm-setting-wimax.h', + 'nm-setting-wired.h', + 'nm-setting-wireguard.h', + 'nm-setting-wireless-security.h', + 'nm-setting-wireless.h', + 'nm-setting-wpan.h', + 'nm-setting.h', + 'nm-simple-connection.h', + 'nm-utils.h', + 'nm-version.h', + 'nm-vpn-dbus-interface.h', + 'nm-vpn-editor-plugin.h', + 'nm-vpn-plugin-info.h', +) + +nm_version_macro_header = configure_file( + input: 'nm-version-macros.h.in', + output: '@BASENAME@', + configuration: data_conf, +) + +libnm_core_public_enum_sources = gnome.mkenums_simple( + 'nm-core-enum-types', + sources: libnm_core_headers + [nm_version_macro_header], + identifier_prefix: nm_id_prefix, + body_prefix: '#include "libnm-core-impl/nm-default-libnm-core.h"', + install_header: true, + install_dir: libnm_pkgincludedir, +) + +libnm_core_public_dep = declare_dependency( + sources: libnm_core_headers + [ + libnm_core_public_enum_sources[1], + nm_version_macro_header, + ], + include_directories: [ + libnm_core_public_inc, + src_inc, + top_inc, + ], + dependencies: [ + glib_dep, + ], +) + +docbooks = [ + ['nm-dbus-types', 'nm-dbus-interface.h', 'NetworkManager D-Bus API Types'], + ['nm-vpn-dbus-types', 'nm-vpn-dbus-interface.h', 'VPN Plugin D-Bus API Types'], +] + +foreach docbook: docbooks + output = docbook[0] + '.xml' + + xml = custom_target( + output, + input: docbook[1], + output: output, + capture: true, + command: [ + perl, + join_paths(source_root, 'tools', 'enums-to-docbook.pl'), + docbook[0], + docbook[2], + '@INPUT@', + ], + # FIXME: gtkdoc does not depend directly on this. + # https://github.com/mesonbuild/meson/pull/2806 + build_by_default: true, + ) + + content_files += xml.full_path() +endforeach diff --git a/libnm-core/nm-connection.h b/src/libnm-core-public/nm-connection.h index 19034e790a..19034e790a 100644 --- a/libnm-core/nm-connection.h +++ b/src/libnm-core-public/nm-connection.h diff --git a/libnm-core/nm-core-types.h b/src/libnm-core-public/nm-core-types.h index bf0c2a9966..bf0c2a9966 100644 --- a/libnm-core/nm-core-types.h +++ b/src/libnm-core-public/nm-core-types.h diff --git a/libnm-core/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h index 295a22a177..295a22a177 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/src/libnm-core-public/nm-dbus-interface.h diff --git a/libnm-core/nm-errors.h b/src/libnm-core-public/nm-errors.h index 639c508e3e..639c508e3e 100644 --- a/libnm-core/nm-errors.h +++ b/src/libnm-core-public/nm-errors.h diff --git a/libnm-core/nm-keyfile.h b/src/libnm-core-public/nm-keyfile.h index 28c052f999..28c052f999 100644 --- a/libnm-core/nm-keyfile.h +++ b/src/libnm-core-public/nm-keyfile.h diff --git a/libnm-core/nm-setting-6lowpan.h b/src/libnm-core-public/nm-setting-6lowpan.h index 5a7c39866b..5a7c39866b 100644 --- a/libnm-core/nm-setting-6lowpan.h +++ b/src/libnm-core-public/nm-setting-6lowpan.h diff --git a/libnm-core/nm-setting-8021x.h b/src/libnm-core-public/nm-setting-8021x.h index 30b725be59..30b725be59 100644 --- a/libnm-core/nm-setting-8021x.h +++ b/src/libnm-core-public/nm-setting-8021x.h diff --git a/libnm-core/nm-setting-adsl.h b/src/libnm-core-public/nm-setting-adsl.h index 3d8e99c9f1..3d8e99c9f1 100644 --- a/libnm-core/nm-setting-adsl.h +++ b/src/libnm-core-public/nm-setting-adsl.h diff --git a/libnm-core/nm-setting-bluetooth.h b/src/libnm-core-public/nm-setting-bluetooth.h index 4f001ef7fe..4f001ef7fe 100644 --- a/libnm-core/nm-setting-bluetooth.h +++ b/src/libnm-core-public/nm-setting-bluetooth.h diff --git a/libnm-core/nm-setting-bond.h b/src/libnm-core-public/nm-setting-bond.h index 25ae8c36e7..25ae8c36e7 100644 --- a/libnm-core/nm-setting-bond.h +++ b/src/libnm-core-public/nm-setting-bond.h diff --git a/libnm-core/nm-setting-bridge-port.h b/src/libnm-core-public/nm-setting-bridge-port.h index 679131d287..679131d287 100644 --- a/libnm-core/nm-setting-bridge-port.h +++ b/src/libnm-core-public/nm-setting-bridge-port.h diff --git a/libnm-core/nm-setting-bridge.h b/src/libnm-core-public/nm-setting-bridge.h index cda1861294..cda1861294 100644 --- a/libnm-core/nm-setting-bridge.h +++ b/src/libnm-core-public/nm-setting-bridge.h diff --git a/libnm-core/nm-setting-cdma.h b/src/libnm-core-public/nm-setting-cdma.h index 67784e8963..67784e8963 100644 --- a/libnm-core/nm-setting-cdma.h +++ b/src/libnm-core-public/nm-setting-cdma.h diff --git a/libnm-core/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h index 34b40a4ff0..34b40a4ff0 100644 --- a/libnm-core/nm-setting-connection.h +++ b/src/libnm-core-public/nm-setting-connection.h diff --git a/libnm-core/nm-setting-dcb.h b/src/libnm-core-public/nm-setting-dcb.h index a33c13ad99..a33c13ad99 100644 --- a/libnm-core/nm-setting-dcb.h +++ b/src/libnm-core-public/nm-setting-dcb.h diff --git a/libnm-core/nm-setting-dummy.h b/src/libnm-core-public/nm-setting-dummy.h index 504428e717..504428e717 100644 --- a/libnm-core/nm-setting-dummy.h +++ b/src/libnm-core-public/nm-setting-dummy.h diff --git a/libnm-core/nm-setting-ethtool.h b/src/libnm-core-public/nm-setting-ethtool.h index d2310b408e..d2310b408e 100644 --- a/libnm-core/nm-setting-ethtool.h +++ b/src/libnm-core-public/nm-setting-ethtool.h diff --git a/libnm-core/nm-setting-generic.h b/src/libnm-core-public/nm-setting-generic.h index 5c0195f2db..5c0195f2db 100644 --- a/libnm-core/nm-setting-generic.h +++ b/src/libnm-core-public/nm-setting-generic.h diff --git a/libnm-core/nm-setting-gsm.h b/src/libnm-core-public/nm-setting-gsm.h index ed939e7cd2..ed939e7cd2 100644 --- a/libnm-core/nm-setting-gsm.h +++ b/src/libnm-core-public/nm-setting-gsm.h diff --git a/libnm-core/nm-setting-hostname.h b/src/libnm-core-public/nm-setting-hostname.h index 02b4e373e4..02b4e373e4 100644 --- a/libnm-core/nm-setting-hostname.h +++ b/src/libnm-core-public/nm-setting-hostname.h diff --git a/libnm-core/nm-setting-infiniband.h b/src/libnm-core-public/nm-setting-infiniband.h index 4a771aef9e..4a771aef9e 100644 --- a/libnm-core/nm-setting-infiniband.h +++ b/src/libnm-core-public/nm-setting-infiniband.h diff --git a/libnm-core/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h index 1cb1671714..1cb1671714 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/src/libnm-core-public/nm-setting-ip-config.h diff --git a/libnm-core/nm-setting-ip-tunnel.h b/src/libnm-core-public/nm-setting-ip-tunnel.h index 802f81e113..802f81e113 100644 --- a/libnm-core/nm-setting-ip-tunnel.h +++ b/src/libnm-core-public/nm-setting-ip-tunnel.h diff --git a/libnm-core/nm-setting-ip4-config.h b/src/libnm-core-public/nm-setting-ip4-config.h index b1c63a4f6e..b1c63a4f6e 100644 --- a/libnm-core/nm-setting-ip4-config.h +++ b/src/libnm-core-public/nm-setting-ip4-config.h diff --git a/libnm-core/nm-setting-ip6-config.h b/src/libnm-core-public/nm-setting-ip6-config.h index fca6961b86..fca6961b86 100644 --- a/libnm-core/nm-setting-ip6-config.h +++ b/src/libnm-core-public/nm-setting-ip6-config.h diff --git a/libnm-core/nm-setting-macsec.h b/src/libnm-core-public/nm-setting-macsec.h index bc33dd9dfb..bc33dd9dfb 100644 --- a/libnm-core/nm-setting-macsec.h +++ b/src/libnm-core-public/nm-setting-macsec.h diff --git a/libnm-core/nm-setting-macvlan.h b/src/libnm-core-public/nm-setting-macvlan.h index 05c0b36508..05c0b36508 100644 --- a/libnm-core/nm-setting-macvlan.h +++ b/src/libnm-core-public/nm-setting-macvlan.h diff --git a/libnm-core/nm-setting-match.h b/src/libnm-core-public/nm-setting-match.h index 9b3e29e7c0..9b3e29e7c0 100644 --- a/libnm-core/nm-setting-match.h +++ b/src/libnm-core-public/nm-setting-match.h diff --git a/libnm-core/nm-setting-olpc-mesh.h b/src/libnm-core-public/nm-setting-olpc-mesh.h index fdba4a4b9a..fdba4a4b9a 100644 --- a/libnm-core/nm-setting-olpc-mesh.h +++ b/src/libnm-core-public/nm-setting-olpc-mesh.h diff --git a/libnm-core/nm-setting-ovs-bridge.h b/src/libnm-core-public/nm-setting-ovs-bridge.h index b307871503..b307871503 100644 --- a/libnm-core/nm-setting-ovs-bridge.h +++ b/src/libnm-core-public/nm-setting-ovs-bridge.h diff --git a/libnm-core/nm-setting-ovs-dpdk.h b/src/libnm-core-public/nm-setting-ovs-dpdk.h index 72de2243c0..72de2243c0 100644 --- a/libnm-core/nm-setting-ovs-dpdk.h +++ b/src/libnm-core-public/nm-setting-ovs-dpdk.h diff --git a/libnm-core/nm-setting-ovs-external-ids.h b/src/libnm-core-public/nm-setting-ovs-external-ids.h index 906db392f1..906db392f1 100644 --- a/libnm-core/nm-setting-ovs-external-ids.h +++ b/src/libnm-core-public/nm-setting-ovs-external-ids.h diff --git a/libnm-core/nm-setting-ovs-interface.h b/src/libnm-core-public/nm-setting-ovs-interface.h index 47ad5817cd..47ad5817cd 100644 --- a/libnm-core/nm-setting-ovs-interface.h +++ b/src/libnm-core-public/nm-setting-ovs-interface.h diff --git a/libnm-core/nm-setting-ovs-patch.h b/src/libnm-core-public/nm-setting-ovs-patch.h index fd80d45a48..fd80d45a48 100644 --- a/libnm-core/nm-setting-ovs-patch.h +++ b/src/libnm-core-public/nm-setting-ovs-patch.h diff --git a/libnm-core/nm-setting-ovs-port.h b/src/libnm-core-public/nm-setting-ovs-port.h index 06d3a2aa0f..06d3a2aa0f 100644 --- a/libnm-core/nm-setting-ovs-port.h +++ b/src/libnm-core-public/nm-setting-ovs-port.h diff --git a/libnm-core/nm-setting-ppp.h b/src/libnm-core-public/nm-setting-ppp.h index 91c5347f07..91c5347f07 100644 --- a/libnm-core/nm-setting-ppp.h +++ b/src/libnm-core-public/nm-setting-ppp.h diff --git a/libnm-core/nm-setting-pppoe.h b/src/libnm-core-public/nm-setting-pppoe.h index 0a30f5a189..0a30f5a189 100644 --- a/libnm-core/nm-setting-pppoe.h +++ b/src/libnm-core-public/nm-setting-pppoe.h diff --git a/libnm-core/nm-setting-proxy.h b/src/libnm-core-public/nm-setting-proxy.h index 70227df169..70227df169 100644 --- a/libnm-core/nm-setting-proxy.h +++ b/src/libnm-core-public/nm-setting-proxy.h diff --git a/libnm-core/nm-setting-serial.h b/src/libnm-core-public/nm-setting-serial.h index abd232e8f1..abd232e8f1 100644 --- a/libnm-core/nm-setting-serial.h +++ b/src/libnm-core-public/nm-setting-serial.h diff --git a/libnm-core/nm-setting-sriov.h b/src/libnm-core-public/nm-setting-sriov.h index fe5fc3766f..fe5fc3766f 100644 --- a/libnm-core/nm-setting-sriov.h +++ b/src/libnm-core-public/nm-setting-sriov.h diff --git a/libnm-core/nm-setting-tc-config.h b/src/libnm-core-public/nm-setting-tc-config.h index a2bc9a0dae..a2bc9a0dae 100644 --- a/libnm-core/nm-setting-tc-config.h +++ b/src/libnm-core-public/nm-setting-tc-config.h diff --git a/libnm-core/nm-setting-team-port.h b/src/libnm-core-public/nm-setting-team-port.h index 4d4d9bdca0..4d4d9bdca0 100644 --- a/libnm-core/nm-setting-team-port.h +++ b/src/libnm-core-public/nm-setting-team-port.h diff --git a/libnm-core/nm-setting-team.h b/src/libnm-core-public/nm-setting-team.h index 3f40c8cb9b..3f40c8cb9b 100644 --- a/libnm-core/nm-setting-team.h +++ b/src/libnm-core-public/nm-setting-team.h diff --git a/libnm-core/nm-setting-tun.h b/src/libnm-core-public/nm-setting-tun.h index 3fbbf08253..3fbbf08253 100644 --- a/libnm-core/nm-setting-tun.h +++ b/src/libnm-core-public/nm-setting-tun.h diff --git a/libnm-core/nm-setting-user.h b/src/libnm-core-public/nm-setting-user.h index b151cd3ee6..b151cd3ee6 100644 --- a/libnm-core/nm-setting-user.h +++ b/src/libnm-core-public/nm-setting-user.h diff --git a/libnm-core/nm-setting-veth.h b/src/libnm-core-public/nm-setting-veth.h index 5dbc192742..5dbc192742 100644 --- a/libnm-core/nm-setting-veth.h +++ b/src/libnm-core-public/nm-setting-veth.h diff --git a/libnm-core/nm-setting-vlan.h b/src/libnm-core-public/nm-setting-vlan.h index 4b2ca429cf..4b2ca429cf 100644 --- a/libnm-core/nm-setting-vlan.h +++ b/src/libnm-core-public/nm-setting-vlan.h diff --git a/libnm-core/nm-setting-vpn.h b/src/libnm-core-public/nm-setting-vpn.h index 9e5d6e4be3..9e5d6e4be3 100644 --- a/libnm-core/nm-setting-vpn.h +++ b/src/libnm-core-public/nm-setting-vpn.h diff --git a/libnm-core/nm-setting-vrf.h b/src/libnm-core-public/nm-setting-vrf.h index afa044b830..afa044b830 100644 --- a/libnm-core/nm-setting-vrf.h +++ b/src/libnm-core-public/nm-setting-vrf.h diff --git a/libnm-core/nm-setting-vxlan.h b/src/libnm-core-public/nm-setting-vxlan.h index 9b987b660c..9b987b660c 100644 --- a/libnm-core/nm-setting-vxlan.h +++ b/src/libnm-core-public/nm-setting-vxlan.h diff --git a/libnm-core/nm-setting-wifi-p2p.h b/src/libnm-core-public/nm-setting-wifi-p2p.h index 029b75f065..029b75f065 100644 --- a/libnm-core/nm-setting-wifi-p2p.h +++ b/src/libnm-core-public/nm-setting-wifi-p2p.h diff --git a/libnm-core/nm-setting-wimax.h b/src/libnm-core-public/nm-setting-wimax.h index 7279e043b5..7279e043b5 100644 --- a/libnm-core/nm-setting-wimax.h +++ b/src/libnm-core-public/nm-setting-wimax.h diff --git a/libnm-core/nm-setting-wired.h b/src/libnm-core-public/nm-setting-wired.h index acabd70646..acabd70646 100644 --- a/libnm-core/nm-setting-wired.h +++ b/src/libnm-core-public/nm-setting-wired.h diff --git a/libnm-core/nm-setting-wireguard.h b/src/libnm-core-public/nm-setting-wireguard.h index 3f046fc713..3f046fc713 100644 --- a/libnm-core/nm-setting-wireguard.h +++ b/src/libnm-core-public/nm-setting-wireguard.h diff --git a/libnm-core/nm-setting-wireless-security.h b/src/libnm-core-public/nm-setting-wireless-security.h index 62a3c6e526..62a3c6e526 100644 --- a/libnm-core/nm-setting-wireless-security.h +++ b/src/libnm-core-public/nm-setting-wireless-security.h diff --git a/libnm-core/nm-setting-wireless.h b/src/libnm-core-public/nm-setting-wireless.h index f97e236ce7..f97e236ce7 100644 --- a/libnm-core/nm-setting-wireless.h +++ b/src/libnm-core-public/nm-setting-wireless.h diff --git a/libnm-core/nm-setting-wpan.h b/src/libnm-core-public/nm-setting-wpan.h index 2a09d49bbd..2a09d49bbd 100644 --- a/libnm-core/nm-setting-wpan.h +++ b/src/libnm-core-public/nm-setting-wpan.h diff --git a/libnm-core/nm-setting.h b/src/libnm-core-public/nm-setting.h index e5cf753dc6..e5cf753dc6 100644 --- a/libnm-core/nm-setting.h +++ b/src/libnm-core-public/nm-setting.h diff --git a/libnm-core/nm-simple-connection.h b/src/libnm-core-public/nm-simple-connection.h index 38473b6287..38473b6287 100644 --- a/libnm-core/nm-simple-connection.h +++ b/src/libnm-core-public/nm-simple-connection.h diff --git a/libnm-core/nm-utils.h b/src/libnm-core-public/nm-utils.h index 0f8dcda09e..0f8dcda09e 100644 --- a/libnm-core/nm-utils.h +++ b/src/libnm-core-public/nm-utils.h diff --git a/libnm-core/nm-version-macros.h.in b/src/libnm-core-public/nm-version-macros.h.in index 4a6f46e9f0..4a6f46e9f0 100644 --- a/libnm-core/nm-version-macros.h.in +++ b/src/libnm-core-public/nm-version-macros.h.in diff --git a/libnm-core/nm-version.h b/src/libnm-core-public/nm-version.h index 3f1ad3f2eb..3f1ad3f2eb 100644 --- a/libnm-core/nm-version.h +++ b/src/libnm-core-public/nm-version.h diff --git a/libnm-core/nm-vpn-dbus-interface.h b/src/libnm-core-public/nm-vpn-dbus-interface.h index c0e23f6fc1..c0e23f6fc1 100644 --- a/libnm-core/nm-vpn-dbus-interface.h +++ b/src/libnm-core-public/nm-vpn-dbus-interface.h diff --git a/libnm-core/nm-vpn-editor-plugin.h b/src/libnm-core-public/nm-vpn-editor-plugin.h index e318da07b8..e318da07b8 100644 --- a/libnm-core/nm-vpn-editor-plugin.h +++ b/src/libnm-core-public/nm-vpn-editor-plugin.h diff --git a/libnm-core/nm-vpn-plugin-info.h b/src/libnm-core-public/nm-vpn-plugin-info.h index 1e9870c88e..1e9870c88e 100644 --- a/libnm-core/nm-vpn-plugin-info.h +++ b/src/libnm-core-public/nm-vpn-plugin-info.h diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000000..c4bcd14d63 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +src_inc = include_directories('.') + +subdir('libnm-core-public') +subdir('libnm-core-intern') +subdir('libnm-core-aux-intern') +subdir('libnm-core-impl') +subdir('libnm-core-aux-extern') +subdir('core') diff --git a/tools/check-docs.sh b/tools/check-docs.sh index f4f05b91b1..a7526fcb45 100755 --- a/tools/check-docs.sh +++ b/tools/check-docs.sh @@ -23,7 +23,7 @@ same_lines() { libnm_headers() { ( - ls -1 "$1/libnm"/*.h "$1/libnm-core"/*.h | \ + ls -1 "$1/libnm"/*.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" @@ -31,7 +31,7 @@ libnm_headers() { cat fi if [ -n "$2" ]; then - ls -1 "$2/libnm"/*.h "$2/libnm-core"/*.h + ls -1 "$2/libnm"/*.h "$2/src/libnm-core-public"/*.h fi ) | sort | uniq } diff --git a/tools/check-tree.sh b/tools/check-tree.sh index cff85c3e16..cc6c80ef23 100755 --- a/tools/check-tree.sh +++ b/tools/check-tree.sh @@ -20,5 +20,5 @@ check_cmp() { } check_cmp shared/nm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h -check_cmp libnm-core/nm-meta-setting-base-impl.h clients/common/nm-meta-setting-base-impl.h -check_cmp libnm-core/nm-meta-setting-base-impl.c clients/common/nm-meta-setting-base-impl.c +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/generate-docs-nm-property-infos.pl b/tools/generate-docs-nm-property-infos.pl index f850ee7429..7d33d140b4 100755 --- a/tools/generate-docs-nm-property-infos.pl +++ b/tools/generate-docs-nm-property-infos.pl @@ -65,7 +65,8 @@ close $fo; # get setting name from NM_SETTING_*_SETTING_NAME constant in C header file sub get_setting_name { my $path = $_[0]; - $path =~ s/c$/h/; # use header file to find out setting name + $path =~ s/\/libnm-core-impl\/nm-setting-(.*)\.c$/\/libnm-core-public\/nm-setting-$1.h/; # use header file to find out setting name + $path =~ s/\.c$/.h/; # use header file to find out setting name open my $fh, '<', $path or die "Can't open $path: $!"; while (my $line = <$fh>) { if ($line =~ /NM_SETTING_.+SETTING_NAME\s+\"(\S+)\"/) { |