diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-02-19 15:23:34 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-02-24 12:48:37 +0100 |
| commit | 9bba4871f3d46a3eccec84ac63e053e1dd1775b9 (patch) | |
| tree | 45a7c0786e32220ff5100a171f5c9efb889b0621 | |
| parent | b53c50e7786c6a5015fae0fc7538ccdd460ef985 (diff) | |
| download | NetworkManager-9bba4871f3d46a3eccec84ac63e053e1dd1775b9.tar.gz | |
build: move "libnm/" to "src/" and split it
Like with "libnm-core/", split "libnm/" into different directories for
the public headers, for the implementation and for the helper "aux"
library.
239 files changed, 699 insertions, 655 deletions
diff --git a/.gitignore b/.gitignore index 9161e5d6a9..2a0a1d2a4b 100644 --- a/.gitignore +++ b/.gitignore @@ -152,15 +152,15 @@ test-*.trs /src/libnm-glib-aux/tests/test-shared-general /src/libnm-platform/tests/test-nm-platform -/libnm/nm-property-infos-dbus.xml -/libnm/nm-property-infos-ifcfg-rh.xml -/libnm/nm-property-infos-keyfile.xml -/libnm/nm-property-infos-nmcli.xml -/libnm/nm-settings-docs-gir.xml -/libnm/tests/test-libnm -/libnm/tests/test-nm-client -/libnm/tests/test-remote-settings-client -/libnm/tests/test-secret-agent +/src/libnm-client-impl/nm-property-infos-dbus.xml +/src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml +/src/libnm-client-impl/nm-property-infos-keyfile.xml +/src/libnm-client-impl/nm-property-infos-nmcli.xml +/src/libnm-client-impl/nm-settings-docs-gir.xml +/src/libnm-client-impl/tests/test-libnm +/src/libnm-client-impl/tests/test-nm-client +/src/libnm-client-impl/tests/test-remote-settings-client +/src/libnm-client-impl/tests/test-secret-agent /clients/cli/generate-docs-nm-settings-nmcli /clients/cli/generate-docs-nm-settings-nmcli.xml @@ -351,13 +351,22 @@ test-*.trs /libnm/nm-ifcfg-rh-docs.xml /libnm/nm-keyfile-docs.xml /libnm/nm-property-docs.xml +/libnm/nm-property-infos-dbus.xml +/libnm/nm-property-infos-ifcfg-rh.xml +/libnm/nm-property-infos-keyfile.xml +/libnm/nm-property-infos-nmcli.xml /libnm/nm-setting-docs-overrides.xml /libnm/nm-setting-docs.xml +/libnm/nm-settings-docs-gir.xml /libnm/nm-settings-docs-overrides.xml /libnm/nm-settings-docs.xml /libnm/nm-settings-ifcfg-rh-docs.xml /libnm/nm-settings-keyfile-docs.xml /libnm/tests/test-general +/libnm/tests/test-libnm +/libnm/tests/test-nm-client +/libnm/tests/test-remote-settings-client +/libnm/tests/test-secret-agent /policy/org.freedesktop.NetworkManager.policy /policy/org.freedesktop.NetworkManager.policy.in /shared/nm-glib-aux/tests/test-json-aux diff --git a/Makefile.am b/Makefile.am index e034c79c36..3adc16a8d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,6 +124,8 @@ src/libnm-udev-aux/.dirstamp: config-extra.h src/libnm-systemd-shared/.dirstamp: config-extra.h src/libnm-systemd-shared/src/basic/.dirstamp: config-extra.h src/libnm-systemd-shared/src/shared/.dirstamp: config-extra.h +src/libnm-client-public/.dirstamp: config-extra.h +src/libnm-client-public/.dirstamp: config-extra.h src/core/dhcp/.dirstamp: config-extra.h ############################################################################### @@ -705,41 +707,44 @@ EXTRA_DIST += \ ############################################################################### -noinst_LTLIBRARIES += libnm/nm-libnm-aux/libnm-libnm-aux.la +noinst_LTLIBRARIES += src/libnm-client-aux-extern/libnm-client-aux-extern.la -libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \ +src_libnm_client_aux_extern_libnm_client_aux_extern_la_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(srcdir)/src \ -I$(builddir)/src \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -libnm_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \ - libnm/nm-libnm-aux/nm-libnm-aux.c \ - libnm/nm-libnm-aux/nm-libnm-aux.h \ +src_libnm_client_aux_extern_libnm_client_aux_extern_la_SOURCES = \ + src/libnm-client-aux-extern/nm-libnm-aux.c \ + src/libnm-client-aux-extern/nm-libnm-aux.h \ $(NULL) -libnm_nm_libnm_aux_libnm_libnm_aux_la_LDFLAGS = \ +src_libnm_client_aux_extern_libnm_client_aux_extern_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -libnm_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \ +src_libnm_client_aux_extern_libnm_client_aux_extern_la_LIBADD = \ $(GLIB_LIBS) \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(NULL) -$(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(src_libnm_client_aux_extern_libnm_client_aux_extern_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_aux_extern_libnm_client_aux_extern_la_OBJECTS): $(src_libnm_client_public_mkenums_h) -EXTRA_DIST += libnm/nm-libnm-aux/README.md +EXTRA_DIST += \ + src/libnm-client-aux-extern/README.md \ + src/libnm-client-aux-extern/meson.build \ + $(NULL) ############################################################################### @@ -1041,8 +1046,8 @@ dbusinterfaces_DATA = \ CLEANFILES += $(introspection_sources) CLEANFILES += $(DBUS_INTERFACE_DOCS) -$(libnm_libnm_static_la_OBJECTS): $(introspection_sources) -$(libnm_libnm_la_OBJECTS): $(introspection_sources) +$(src_libnm_client_impl_libnm_client_impl_la_OBJECTS): $(introspection_sources) +$(src_libnm_client_impl_libnm_la_OBJECTS): $(introspection_sources) EXTRA_DIST += \ $(dbusinterfaces_DATA) \ @@ -1248,6 +1253,9 @@ dflt_cppflags_libnm_core = \ noinst_LTLIBRARIES += src/libnm-core-impl/libnm-core-impl.la +src/libnm-client-public/nm-enum-types.h.stamp: src/libnm-client-public/.dirstamp +src/libnm-client-public/nm-enum-types.c.stamp: src/libnm-client-public/.dirstamp + GLIB_GENERATED += \ $(src_libnm_core_public_mkenums_h) \ $(src_libnm_core_public_mkenums_c) \ @@ -1262,8 +1270,8 @@ src/libnm-core-public/nm-core-enum-types.c.stamp: src/ $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) $(dispatcher_nm_dispatcher_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_core_impl_libnm_core_impl_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_libnm_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_impl_libnm_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_impl_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) @@ -1487,157 +1495,160 @@ EXTRA_DIST += \ ############################################################################### libnm_lib_h_pub_real = \ - libnm/NetworkManager.h \ - libnm/nm-access-point.h \ - libnm/nm-active-connection.h \ - libnm/nm-autoptr.h \ - libnm/nm-checkpoint.h \ - libnm/nm-client.h \ - libnm/nm-device-6lowpan.h \ - libnm/nm-device-adsl.h \ - libnm/nm-device-bond.h \ - libnm/nm-device-bridge.h \ - libnm/nm-device-bt.h \ - libnm/nm-device-dummy.h \ - libnm/nm-device-ethernet.h \ - libnm/nm-device-generic.h \ - libnm/nm-device-infiniband.h \ - libnm/nm-device-ip-tunnel.h \ - libnm/nm-device-macsec.h \ - libnm/nm-device-macvlan.h \ - libnm/nm-device-modem.h \ - libnm/nm-device-olpc-mesh.h \ - libnm/nm-device-ovs-bridge.h \ - libnm/nm-device-ovs-interface.h \ - libnm/nm-device-ovs-port.h \ - libnm/nm-device-ppp.h \ - libnm/nm-device-team.h \ - libnm/nm-device-tun.h \ - libnm/nm-device-veth.h \ - libnm/nm-device-vlan.h \ - libnm/nm-device-vrf.h \ - libnm/nm-device-vxlan.h \ - libnm/nm-device-wifi-p2p.h \ - libnm/nm-device-wifi.h \ - libnm/nm-device-wimax.h \ - libnm/nm-device-wireguard.h \ - libnm/nm-device-wpan.h \ - libnm/nm-device.h \ - libnm/nm-dhcp-config.h \ - libnm/nm-ethtool-utils.h \ - libnm/nm-ip-config.h \ - libnm/nm-object.h \ - libnm/nm-remote-connection.h \ - libnm/nm-secret-agent-old.h \ - libnm/nm-types.h \ - libnm/nm-vpn-connection.h \ - libnm/nm-vpn-editor.h \ - libnm/nm-vpn-plugin-old.h \ - libnm/nm-vpn-service-plugin.h \ - libnm/nm-wifi-p2p-peer.h \ - libnm/nm-wimax-nsp.h -libnm_lib_h_pub_mkenums = \ - libnm/nm-enum-types.h + src/libnm-client-public/NetworkManager.h \ + src/libnm-client-public/nm-access-point.h \ + src/libnm-client-public/nm-active-connection.h \ + src/libnm-client-public/nm-autoptr.h \ + src/libnm-client-public/nm-checkpoint.h \ + src/libnm-client-public/nm-client.h \ + src/libnm-client-public/nm-device-6lowpan.h \ + src/libnm-client-public/nm-device-adsl.h \ + src/libnm-client-public/nm-device-bond.h \ + src/libnm-client-public/nm-device-bridge.h \ + src/libnm-client-public/nm-device-bt.h \ + src/libnm-client-public/nm-device-dummy.h \ + src/libnm-client-public/nm-device-ethernet.h \ + src/libnm-client-public/nm-device-generic.h \ + src/libnm-client-public/nm-device-infiniband.h \ + src/libnm-client-public/nm-device-ip-tunnel.h \ + src/libnm-client-public/nm-device-macsec.h \ + src/libnm-client-public/nm-device-macvlan.h \ + src/libnm-client-public/nm-device-modem.h \ + src/libnm-client-public/nm-device-olpc-mesh.h \ + src/libnm-client-public/nm-device-ovs-bridge.h \ + src/libnm-client-public/nm-device-ovs-interface.h \ + src/libnm-client-public/nm-device-ovs-port.h \ + src/libnm-client-public/nm-device-ppp.h \ + src/libnm-client-public/nm-device-team.h \ + src/libnm-client-public/nm-device-tun.h \ + src/libnm-client-public/nm-device-veth.h \ + src/libnm-client-public/nm-device-vlan.h \ + src/libnm-client-public/nm-device-vrf.h \ + src/libnm-client-public/nm-device-vxlan.h \ + src/libnm-client-public/nm-device-wifi-p2p.h \ + src/libnm-client-public/nm-device-wifi.h \ + src/libnm-client-public/nm-device-wimax.h \ + src/libnm-client-public/nm-device-wireguard.h \ + src/libnm-client-public/nm-device-wpan.h \ + src/libnm-client-public/nm-device.h \ + src/libnm-client-public/nm-dhcp-config.h \ + src/libnm-client-public/nm-ethtool-utils.h \ + src/libnm-client-public/nm-ip-config.h \ + src/libnm-client-public/nm-object.h \ + src/libnm-client-public/nm-remote-connection.h \ + src/libnm-client-public/nm-secret-agent-old.h \ + src/libnm-client-public/nm-types.h \ + src/libnm-client-public/nm-vpn-connection.h \ + src/libnm-client-public/nm-vpn-editor.h \ + src/libnm-client-public/nm-vpn-plugin-old.h \ + src/libnm-client-public/nm-vpn-service-plugin.h \ + src/libnm-client-public/nm-wifi-p2p-peer.h \ + src/libnm-client-public/nm-wimax-nsp.h \ + $(NULL) +src_libnm_client_public_mkenums_h = \ + src/libnm-client-public/nm-enum-types.h \ + $(NULL) libnm_lib_h_priv = \ - libnm/nm-dbus-helpers.h \ - libnm/nm-default-client.h \ - libnm/nm-default-libnm.h \ - libnm/nm-device-private.h \ - libnm/nm-dhcp4-config.h \ - libnm/nm-dhcp6-config.h \ - libnm/nm-dns-manager.h \ - libnm/nm-ip4-config.h \ - libnm/nm-ip6-config.h \ - libnm/nm-libnm-utils.h \ - libnm/nm-object-private.h \ - libnm/nm-remote-connection-private.h \ + src/libnm-client-impl/nm-dbus-helpers.h \ + src/libnm-client-aux-extern/nm-default-client.h \ + src/libnm-client-impl/nm-default-libnm.h \ + src/libnm-client-impl/nm-device-private.h \ + src/libnm-client-impl/nm-dhcp4-config.h \ + src/libnm-client-impl/nm-dhcp6-config.h \ + src/libnm-client-impl/nm-dns-manager.h \ + src/libnm-client-impl/nm-ip4-config.h \ + src/libnm-client-impl/nm-ip6-config.h \ + src/libnm-client-impl/nm-libnm-utils.h \ + src/libnm-client-impl/nm-object-private.h \ + src/libnm-client-impl/nm-remote-connection-private.h \ $(NULL) libnm_lib_c_real = \ - libnm/nm-client.c \ - libnm/nm-object.c \ - libnm/nm-device.c \ - libnm/nm-active-connection.c \ + src/libnm-client-impl/nm-client.c \ + src/libnm-client-impl/nm-object.c \ + src/libnm-client-impl/nm-device.c \ + src/libnm-client-impl/nm-active-connection.c \ \ - libnm/nm-access-point.c \ - libnm/nm-checkpoint.c \ - libnm/nm-dbus-helpers.c \ - libnm/nm-device-6lowpan.c \ - libnm/nm-device-adsl.c \ - libnm/nm-device-bond.c \ - libnm/nm-device-bridge.c \ - libnm/nm-device-bt.c \ - libnm/nm-device-dummy.c \ - libnm/nm-device-ethernet.c \ - libnm/nm-device-generic.c \ - libnm/nm-device-infiniband.c \ - libnm/nm-device-ip-tunnel.c \ - libnm/nm-device-macsec.c \ - libnm/nm-device-macvlan.c \ - libnm/nm-device-modem.c \ - libnm/nm-device-olpc-mesh.c \ - libnm/nm-device-ovs-bridge.c \ - libnm/nm-device-ovs-interface.c \ - libnm/nm-device-ovs-port.c \ - libnm/nm-device-ppp.c \ - libnm/nm-device-team.c \ - libnm/nm-device-tun.c \ - libnm/nm-device-veth.c \ - libnm/nm-device-vlan.c \ - libnm/nm-device-vrf.c \ - libnm/nm-device-vxlan.c \ - libnm/nm-device-wifi-p2p.c \ - libnm/nm-device-wifi.c \ - libnm/nm-device-wimax.c \ - libnm/nm-device-wireguard.c \ - libnm/nm-device-wpan.c \ - libnm/nm-dhcp-config.c \ - libnm/nm-dhcp4-config.c \ - libnm/nm-dhcp6-config.c \ - libnm/nm-dns-manager.c \ - libnm/nm-ip-config.c \ - libnm/nm-ip4-config.c \ - libnm/nm-ip6-config.c \ - libnm/nm-libnm-utils.c \ - libnm/nm-remote-connection.c \ - libnm/nm-secret-agent-old.c \ - libnm/nm-vpn-connection.c \ - libnm/nm-vpn-editor.c \ - libnm/nm-vpn-plugin-old.c \ - libnm/nm-vpn-service-plugin.c \ - libnm/nm-wifi-p2p-peer.c \ - libnm/nm-wimax-nsp.c \ - $(NULL) -libnm_lib_c_mkenums = \ - libnm/nm-enum-types.c + src/libnm-client-impl/nm-access-point.c \ + src/libnm-client-impl/nm-checkpoint.c \ + src/libnm-client-impl/nm-dbus-helpers.c \ + src/libnm-client-impl/nm-device-6lowpan.c \ + src/libnm-client-impl/nm-device-adsl.c \ + src/libnm-client-impl/nm-device-bond.c \ + src/libnm-client-impl/nm-device-bridge.c \ + src/libnm-client-impl/nm-device-bt.c \ + src/libnm-client-impl/nm-device-dummy.c \ + src/libnm-client-impl/nm-device-ethernet.c \ + src/libnm-client-impl/nm-device-generic.c \ + src/libnm-client-impl/nm-device-infiniband.c \ + src/libnm-client-impl/nm-device-ip-tunnel.c \ + src/libnm-client-impl/nm-device-macsec.c \ + src/libnm-client-impl/nm-device-macvlan.c \ + src/libnm-client-impl/nm-device-modem.c \ + src/libnm-client-impl/nm-device-olpc-mesh.c \ + src/libnm-client-impl/nm-device-ovs-bridge.c \ + src/libnm-client-impl/nm-device-ovs-interface.c \ + src/libnm-client-impl/nm-device-ovs-port.c \ + src/libnm-client-impl/nm-device-ppp.c \ + src/libnm-client-impl/nm-device-team.c \ + src/libnm-client-impl/nm-device-tun.c \ + src/libnm-client-impl/nm-device-veth.c \ + src/libnm-client-impl/nm-device-vlan.c \ + src/libnm-client-impl/nm-device-vrf.c \ + src/libnm-client-impl/nm-device-vxlan.c \ + src/libnm-client-impl/nm-device-wifi-p2p.c \ + src/libnm-client-impl/nm-device-wifi.c \ + src/libnm-client-impl/nm-device-wimax.c \ + src/libnm-client-impl/nm-device-wireguard.c \ + src/libnm-client-impl/nm-device-wpan.c \ + src/libnm-client-impl/nm-dhcp-config.c \ + src/libnm-client-impl/nm-dhcp4-config.c \ + src/libnm-client-impl/nm-dhcp6-config.c \ + src/libnm-client-impl/nm-dns-manager.c \ + src/libnm-client-impl/nm-ip-config.c \ + src/libnm-client-impl/nm-ip4-config.c \ + src/libnm-client-impl/nm-ip6-config.c \ + src/libnm-client-impl/nm-libnm-utils.c \ + src/libnm-client-impl/nm-remote-connection.c \ + src/libnm-client-impl/nm-secret-agent-old.c \ + src/libnm-client-impl/nm-vpn-connection.c \ + src/libnm-client-impl/nm-vpn-editor.c \ + src/libnm-client-impl/nm-vpn-plugin-old.c \ + src/libnm-client-impl/nm-vpn-service-plugin.c \ + src/libnm-client-impl/nm-wifi-p2p-peer.c \ + src/libnm-client-impl/nm-wimax-nsp.c \ + $(NULL) +src_libnm_client_public_mkenums_c = \ + src/libnm-client-public/nm-enum-types.c \ + $(NULL) libnminclude_HEADERS += \ $(libnm_lib_h_pub_real) nodist_libnminclude_HEADERS += \ - $(libnm_lib_h_pub_mkenums) + $(src_libnm_client_public_mkenums_h) ############################################################################### -noinst_LTLIBRARIES += libnm/libnm_static.la +noinst_LTLIBRARIES += src/libnm-client-impl/libnm-client-impl.la -libnm_libnm_static_la_CPPFLAGS = \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ +src_libnm_client_impl_libnm_client_impl_la_CPPFLAGS = \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ $(dflt_cppflags_libnm_core) \ $(INTROSPECTION_CFLAGS) \ $(NULL) -libnm_libnm_static_la_SOURCES = \ +src_libnm_client_impl_libnm_client_impl_la_SOURCES = \ $(libnm_lib_c_real) \ $(NULL) -nodist_libnm_libnm_static_la_SOURCES = \ - $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_c_mkenums) \ +nodist_src_libnm_client_impl_libnm_client_impl_la_SOURCES = \ + $(src_libnm_client_public_mkenums_h) \ + $(src_libnm_client_public_mkenums_c) \ $(NULL) -libnm_libnm_static_la_LIBADD = \ +src_libnm_client_impl_libnm_client_impl_la_LIBADD = \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-impl/libnm-core-impl.la \ $(libnm_crypto_lib) \ @@ -1656,108 +1667,108 @@ libnm_libnm_static_la_LIBADD = \ $(LIBUDEV_LIBS) \ $(NULL) -$(libnm_libnm_static_la_OBJECTS) : $(libnm_lib_h_pub_mkenums) -$(libnm_libnm_static_la_OBJECTS) : $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_impl_libnm_client_impl_la_OBJECTS) : $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_libnm_client_impl_la_OBJECTS) : $(src_libnm_core_public_mkenums_h) ############################################################################### -lib_LTLIBRARIES += libnm/libnm.la +lib_LTLIBRARIES += src/libnm-client-impl/libnm.la GLIB_GENERATED += \ - $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_c_mkenums) + $(src_libnm_client_public_mkenums_h) \ + $(src_libnm_client_public_mkenums_c) nm_enum_types_sources = \ - $(libnm_lib_h_pub_mkenums) \ + $(src_libnm_client_public_mkenums_h) \ $(libnm_lib_h_pub_real) nm_enum_types_MKENUMS_H_FLAGS = --fhead '\#include "nm-core-enum-types.h"\n' -nm_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "libnm/nm-default-libnm.h"\n' +nm_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "libnm-client-impl/nm-default-libnm.h"\n' -$(dispatcher_nm_dispatcher_OBJECTS): $(libnm_lib_h_pub_mkenums) -$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_lib_h_pub_mkenums) -$(libnm_libnm_la_OBJECTS): $(libnm_lib_h_pub_mkenums) -$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(dispatcher_nm_dispatcher_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_libnm_la_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -libnm_libnm_la_CPPFLAGS = \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ +src_libnm_client_impl_libnm_la_CPPFLAGS = \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ $(dflt_cppflags_libnm_core) \ $(LIBUDEV_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -libnm_libnm_la_SOURCES = \ +src_libnm_client_impl_libnm_la_SOURCES = \ $(libnm_lib_h_pub_real) \ $(libnm_lib_h_priv) \ $(NULL) -EXTRA_libnm_libnm_la_DEPENDENCIES = \ - libnm/libnm.ver +EXTRA_src_libnm_client_impl_libnm_la_DEPENDENCIES = \ + src/libnm-client-impl/libnm.ver -libnm_libnm_la_LIBADD = \ - libnm/libnm_static.la \ +src_libnm_client_impl_libnm_la_LIBADD = \ + src/libnm-client-impl/libnm-client-impl.la \ $(NULL) -libnm_libnm_la_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ +src_libnm_client_impl_libnm_la_LDFLAGS = \ + -Wl,--version-script="$(srcdir)/src/libnm-client-impl/libnm.ver" \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ -version-info "1:0:1" -check-local-exports-libnm: libnm/libnm.la - $(srcdir)/tools/check-exports.sh "$(builddir)/libnm/.libs/libnm.so" "$(srcdir)/libnm/libnm.ver" +check-local-exports-libnm: src/libnm-client-impl/libnm.la + $(srcdir)/tools/check-exports.sh "$(builddir)/src/libnm-client-impl/.libs/libnm.so" "$(srcdir)/src/libnm-client-impl/libnm.ver" check_local += check-local-exports-libnm -pkgconfig_DATA += libnm/libnm.pc +pkgconfig_DATA += src/libnm-client-impl/libnm.pc DISTCLEANFILES += \ - libnm/libnm.pc + src/libnm-client-impl/libnm.pc EXTRA_DIST += \ - libnm/nm-enum-types.c.template \ - libnm/nm-enum-types.h.template \ + src/libnm-client-public/nm-enum-types.c.template \ + src/libnm-client-public/nm-enum-types.h.template \ \ - libnm/libnm.pc.in \ - libnm/libnm.ver + src/libnm-client-impl/libnm.pc.in \ + src/libnm-client-impl/libnm.ver -libnm_NM_1_0_typelib = +src_libnm_client_impl_NM_1_0_typelib = if HAVE_INTROSPECTION -libnm_NM_1_0_typelib += libnm/NM-1.0.typelib - -libnm/NM-1.0.gir: libnm/libnm.la -libnm_NM_1_0_gir_INCLUDES = Gio-2.0 -libnm_NM_1_0_gir_PACKAGES = gio-2.0 -libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm -libnm_NM_1_0_gir_CFLAGS = \ - $(libnm_libnm_la_CPPFLAGS) \ +src_libnm_client_impl_NM_1_0_typelib += src/libnm-client-impl/NM-1.0.typelib + +src/libnm-client-impl/NM-1.0.gir: src/libnm-client-impl/libnm.la +src_libnm_client_impl_NM_1_0_gir_INCLUDES = Gio-2.0 +src_libnm_client_impl_NM_1_0_gir_PACKAGES = gio-2.0 +src_libnm_client_impl_NM_1_0_gir_EXPORT_PACKAGES = libnm +src_libnm_client_impl_NM_1_0_gir_CFLAGS = \ + $(src_libnm_client_impl_libnm_la_CPPFLAGS) \ -DNETWORKMANAGER_COMPILATION \ $(NULL) -libnm_NM_1_0_gir_LIBS = libnm/libnm.la -libnm_NM_1_0_gir_FILES = \ +src_libnm_client_impl_NM_1_0_gir_LIBS = src/libnm-client-impl/libnm.la +src_libnm_client_impl_NM_1_0_gir_FILES = \ $(src_libnm_core_public_mkenums_h) \ $(src_libnm_core_impl_lib_h_pub_real) \ $(src_libnm_core_public_mkenums_c) \ $(src_libnm_core_impl_lib_c_real) \ - $(libnm_lib_h_pub_mkenums) \ + $(src_libnm_client_public_mkenums_h) \ $(libnm_lib_h_pub_real) \ - $(libnm_lib_c_mkenums) \ + $(src_libnm_client_public_mkenums_c) \ $(libnm_lib_c_real) -libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm +src_libnm_client_impl_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm -libnm/libnm.typelib: libnm/libnm.gir - $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/src/libnm-core-public --includedir=$(builddir)/src/libnm-core-public --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ +src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir + $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/src/libnm-core-public --includedir=$(builddir)/src/libnm-core-public --includedir=$(srcdir)/libnm-client-public --includedir=$(builddir)/libnm-client-public $< -o $@ -INTROSPECTION_GIRS += libnm/NM-1.0.gir +INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir libnm_noinst_data = \ clients/cli/generate-docs-nm-settings-nmcli.xml \ - libnm/nm-property-infos-dbus.xml \ - libnm/nm-property-infos-ifcfg-rh.xml \ - libnm/nm-property-infos-keyfile.xml \ - libnm/nm-property-infos-nmcli.xml \ - libnm/nm-settings-docs-gir.xml \ + src/libnm-client-impl/nm-property-infos-dbus.xml \ + src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml \ + src/libnm-client-impl/nm-property-infos-keyfile.xml \ + src/libnm-client-impl/nm-property-infos-nmcli.xml \ + src/libnm-client-impl/nm-settings-docs-gir.xml \ man/nm-settings-docs-dbus.xml \ man/nm-settings-docs-nmcli.xml \ $(NULL) @@ -1781,26 +1792,26 @@ endif libnm_docs_sources = $(src_libnm_core_impl_lib_c_settings_real) -libnm/nm-property-infos-%.xml: tools/generate-docs-nm-property-infos.pl $(libnm_docs_sources) +src/libnm-client-impl/nm-property-infos-%.xml: tools/generate-docs-nm-property-infos.pl $(libnm_docs_sources) $(AM_V_GEN) $(srcdir)/tools/generate-docs-nm-property-infos.pl $(patsubst nm-property-infos-%.xml,%,$(notdir $@)) $@ $(filter-out $<,$^) -libnm/nm-settings-docs-gir.xml: tools/generate-docs-nm-settings-docs-gir.py libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la $(libnm_docs_sources) +src/libnm-client-impl/nm-settings-docs-gir.xml: tools/generate-docs-nm-settings-docs-gir.py src/libnm-client-impl/NM-1.0.gir src/libnm-client-impl/NM-1.0.typelib src/libnm-client-impl/libnm.la $(libnm_docs_sources) $(AM_V_GEN) \ - export GI_TYPELIB_PATH=$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ - export LD_LIBRARY_PATH=$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ - $(call set_sanitizer_env,$(abs_builddir)/libnm/.libs/libnm.so); \ + export GI_TYPELIB_PATH=$(abs_builddir)/src/libnm-client-impl$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ + export LD_LIBRARY_PATH=$(abs_builddir)/src/libnm-client-impl/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ + $(call set_sanitizer_env,$(abs_builddir)/src/libnm-client-impl/.libs/libnm.so); \ "$(PYTHON)" \ $(srcdir)/tools/generate-docs-nm-settings-docs-gir.py \ - --gir $(builddir)/libnm/NM-1.0.gir \ + --gir $(builddir)/src/libnm-client-impl/NM-1.0.gir \ --output $@ -man/nm-settings-docs-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli.xml libnm/nm-property-infos-nmcli.xml libnm/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent +man/nm-settings-docs-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli.xml src/libnm-client-impl/nm-property-infos-nmcli.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py --only-from-first $@ $(wordlist 1,3,$^) -clients/common/settings-docs-input.xml: libnm/nm-property-infos-nmcli.xml libnm/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py +clients/common/settings-docs-input.xml: src/libnm-client-impl/nm-property-infos-nmcli.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^) -man/nm-settings-docs-%.xml: libnm/nm-property-infos-%.xml libnm/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent +man/nm-settings-docs-%.xml: src/libnm-client-impl/nm-property-infos-%.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^) EXTRA_DIST += $(libnm_noinst_data) @@ -1812,115 +1823,115 @@ EXTRA_DIST += \ tools/generate-docs-nm-property-infos.pl \ tools/generate-docs-nm-settings-docs-merge.py \ tools/generate-docs-nm-settings-docs-gir.py \ - libnm/meson.build \ + src/libnm-client-impl/meson.build \ $(NULL) ############################################################################### -check_programs += libnm/tests/test-libnm +check_programs += src/libnm-client-impl/tests/test-libnm -libnm_tests_programs_req_introspection = \ - libnm/tests/test-nm-client \ - libnm/tests/test-remote-settings-client \ - libnm/tests/test-secret-agent +src_libnm_client_impl_tests_programs_req_introspection = \ + src/libnm-client-impl/tests/test-nm-client \ + src/libnm-client-impl/tests/test-remote-settings-client \ + src/libnm-client-impl/tests/test-secret-agent if HAVE_INTROSPECTION -check_programs += $(libnm_tests_programs_req_introspection) +check_programs += $(src_libnm_client_impl_tests_programs_req_introspection) else -check_programs_norun += $(libnm_tests_programs_req_introspection) +check_programs_norun += $(src_libnm_client_impl_tests_programs_req_introspection) endif -libnm_tests_cppflags = \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ +src_libnm_client_impl_tests_cppflags = \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(dflt_cppflags_libnm_core) \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) -libnm_tests_ldadd = \ - libnm/libnm_static.la \ +src_libnm_client_impl_tests_ldadd = \ + src/libnm-client-impl/libnm-client-impl.la \ $(GLIB_LIBS) \ $(NULL) -libnm_tests_ldflags = \ +src_libnm_client_impl_tests_ldflags = \ $(SANITIZER_EXEC_LDFLAGS) -libnm_tests_test_libnm_CPPFLAGS = $(libnm_tests_cppflags) -libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags) -libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags) -libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags) +src_libnm_client_impl_tests_test_libnm_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags) +src_libnm_client_impl_tests_test_nm_client_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags) +src_libnm_client_impl_tests_test_remote_settings_client_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags) +src_libnm_client_impl_tests_test_secret_agent_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags) -libnm_tests_test_libnm_SOURCES = \ +src_libnm_client_impl_tests_test_libnm_SOURCES = \ shared/nm-utils/nm-compat.c \ - libnm/tests/test-libnm.c \ + src/libnm-client-impl/tests/test-libnm.c \ $(NULL) -libnm_tests_test_nm_client_SOURCES = \ +src_libnm_client_impl_tests_test_nm_client_SOURCES = \ shared/nm-test-utils-impl.c \ shared/nm-test-libnm-utils.h \ - libnm/tests/test-nm-client.c + src/libnm-client-impl/tests/test-nm-client.c -libnm_tests_test_remote_settings_client_SOURCES = \ +src_libnm_client_impl_tests_test_remote_settings_client_SOURCES = \ shared/nm-test-utils-impl.c \ shared/nm-test-libnm-utils.h \ - libnm/tests/test-remote-settings-client.c + src/libnm-client-impl/tests/test-remote-settings-client.c -libnm_tests_test_secret_agent_SOURCES = \ +src_libnm_client_impl_tests_test_secret_agent_SOURCES = \ shared/nm-test-utils-impl.c \ shared/nm-test-libnm-utils.h \ - libnm/tests/test-secret-agent.c + src/libnm-client-impl/tests/test-secret-agent.c -libnm_tests_test_libnm_LDADD = $(libnm_tests_ldadd) -libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd) -libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd) -libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd) +src_libnm_client_impl_tests_test_libnm_LDADD = $(src_libnm_client_impl_tests_ldadd) +src_libnm_client_impl_tests_test_nm_client_LDADD = $(src_libnm_client_impl_tests_ldadd) +src_libnm_client_impl_tests_test_remote_settings_client_LDADD = $(src_libnm_client_impl_tests_ldadd) +src_libnm_client_impl_tests_test_secret_agent_LDADD = $(src_libnm_client_impl_tests_ldadd) -libnm_tests_test_libnm_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags) +src_libnm_client_impl_tests_test_libnm_LDFLAGS = $(src_libnm_client_impl_tests_ldflags) +src_libnm_client_impl_tests_test_nm_client_LDFLAGS = $(src_libnm_client_impl_tests_ldflags) +src_libnm_client_impl_tests_test_remote_settings_client_LDFLAGS = $(src_libnm_client_impl_tests_ldflags) +src_libnm_client_impl_tests_test_secret_agent_LDFLAGS = $(src_libnm_client_impl_tests_ldflags) -$(libnm_tests_test_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) -$(libnm_tests_test_nm_client_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) -$(libnm_tests_test_remote_settings_client_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) -$(libnm_tests_test_secret_agent_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) +$(src_libnm_client_impl_tests_test_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_tests_test_nm_client_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_tests_test_remote_settings_client_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) +$(src_libnm_client_impl_tests_test_secret_agent_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) # tools/test-networkmanager-service.py uses libnm's typelib. Ensure it # is built first. -$(libnm_tests_test_nm_client_OBJECTS): $(libnm_NM_1_0_typelib) -$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib) -$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_NM_1_0_typelib) +$(src_libnm_client_impl_tests_test_nm_client_OBJECTS): $(src_libnm_client_impl_NM_1_0_typelib) +$(src_libnm_client_impl_tests_test_remote_settings_client_OBJECTS): $(src_libnm_client_impl_NM_1_0_typelib) +$(src_libnm_client_impl_tests_test_secret_agent_OBJECTS): $(src_libnm_client_impl_NM_1_0_typelib) ############################################################################### # just test, that we can build "nm-vpn-plugin-utils.c" -check_ltlibraries += libnm/tests/libnm-vpn-plugin-utils-test.la +check_ltlibraries += src/libnm-client-impl/tests/libnm-vpn-plugin-utils-test.la -libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \ +src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \ shared/nm-utils/nm-vpn-plugin-utils.c \ shared/nm-utils/nm-vpn-plugin-utils.h \ $(NULL) -libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ +src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(srcdir)/src \ -I$(builddir)/src \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) -libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ +src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) EXTRA_DIST += \ - libnm/tests/meson.build + src/libnm-client-impl/tests/meson.build ############################################################################### # src/core/ @@ -4393,8 +4404,8 @@ dispatcher_cppflags = \ -I$(srcdir)/dispatcher \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ $(GLIB_CFLAGS) \ $(NULL) @@ -4407,7 +4418,7 @@ dispatcher_libnm_dispatcher_core_la_SOURCES = \ dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags) dispatcher_libnm_dispatcher_core_la_LIBADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) dispatcher_nm_dispatcher_SOURCES = \ @@ -4423,7 +4434,7 @@ dispatcher_nm_dispatcher_LDFLAGS = \ dispatcher_nm_dispatcher_LDADD = \ dispatcher/libnm-dispatcher-core.la \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ @@ -4474,8 +4485,8 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -I$(builddir)/dispatcher \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ -I$(srcdir)/src \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ @@ -4490,7 +4501,7 @@ nodist_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispa $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources) $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_client_public_mkenums_h) dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ @@ -4501,7 +4512,7 @@ dispatcher_tests_test_dispatcher_envp_LDADD = \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) @@ -4531,8 +4542,8 @@ clients_nm_online_CPPFLAGS = \ -I$(builddir)/src \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(GLIB_CFLAGS) \ $(NULL) @@ -4542,8 +4553,8 @@ clients_nm_online_LDFLAGS = \ $(NULL) clients_nm_online_LDADD = \ - libnm/libnm.la \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-impl/libnm.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ @@ -4551,7 +4562,7 @@ clients_nm_online_LDADD = \ $(NULL) $(clients_nm_online_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_nm_online_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_nm_online_OBJECTS): $(src_libnm_client_public_mkenums_h) EXTRA_DIST += \ clients/meson.build @@ -4567,8 +4578,8 @@ clients_cppflags = \ -I$(srcdir)/clients/common \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ @@ -4596,12 +4607,12 @@ clients_common_libnmc_base_la_CPPFLAGS = \ $(NULL) clients_common_libnmc_base_la_LIBADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) $(clients_common_libnmc_base_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_common_libnmc_base_la_OBJECTS): $(src_libnm_client_public_mkenums_h) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp clients_common_settings_doc_h = clients/common/settings-docs.h @@ -4643,12 +4654,12 @@ clients_common_libnmc_la_CPPFLAGS = \ $(NULL) clients_common_libnmc_la_LIBADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) $(clients_common_libnmc_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_libnmc_la_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_common_libnmc_la_OBJECTS): $(src_libnm_client_public_mkenums_h) $(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h) $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp @@ -4677,11 +4688,11 @@ clients_common_tests_test_clients_common_LDADD = \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) $(clients_common_tests_test_clients_common_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_tests_test_clients_common_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_common_tests_test_clients_common_OBJECTS): $(src_libnm_client_public_mkenums_h) ############################################################################### @@ -4699,11 +4710,13 @@ check_programs += clients/common/tests/test-libnm-core-aux clients_common_tests_test_libnm_core_aux_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ - -I$(builddir)/src/libnm-core-public \ + -I$(builddir)/shared \ -I$(srcdir)/src/libnm-core-public \ - -I$(builddir)/libnm \ - -I$(srcdir)/libnm \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ -I$(srcdir)/src \ + -I$(builddir)/src \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ @@ -4720,12 +4733,12 @@ clients_common_tests_test_libnm_core_aux_LDADD = \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) $(clients_common_tests_test_libnm_core_aux_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(src_libnm_client_public_mkenums_h) ############################################################################### # clients/cli @@ -4768,8 +4781,8 @@ clients_cli_nmcli_LDADD = \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ - libnm/libnm.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(READLINE_LIBS) @@ -4778,7 +4791,7 @@ clients_cli_nmcli_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) $(clients_cli_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cli_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cli_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h) install-data-hook-nmcli: $(mkinstalldirs) $(DESTDIR)$(completiondir) @@ -4809,11 +4822,11 @@ clients_cli_generate_docs_nm_settings_nmcli_CPPFLAGS = \ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \ clients/common/libnmc.la \ clients/common/libnmc-base.la \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ src/libnm-base/libnm-base.la \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ @@ -4826,7 +4839,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDFLAGS = \ $(NULL) $(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h) ############################################################################### @@ -4896,7 +4909,7 @@ clients_tui_newt_libnmt_newt_a_CPPFLAGS = \ $(NULL) $(clients_tui_newt_libnmt_newt_a_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(src_libnm_client_public_mkenums_h) bin_PROGRAMS += clients/tui/nmtui @@ -4999,20 +5012,20 @@ clients_tui_nmtui_LDADD = \ clients/tui/newt/libnmt-newt.a \ clients/common/libnmc.la \ clients/common/libnmc-base.la \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ src/libnm-base/libnm-base.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NEWT_LIBS) \ $(NULL) $(clients_tui_nmtui_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_tui_nmtui_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_tui_nmtui_OBJECTS): $(src_libnm_client_public_mkenums_h) nmtui_links = nmtui-edit nmtui-connect nmtui-hostname @@ -5065,7 +5078,7 @@ clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS = \ $(NULL) $(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(src_libnm_client_public_mkenums_h) libexec_PROGRAMS += clients/cloud-setup/nm-cloud-setup @@ -5085,20 +5098,20 @@ clients_cloud_setup_nm_cloud_setup_LDFLAGS = \ clients_cloud_setup_nm_cloud_setup_LDADD = \ clients/cloud-setup/libnm-cloud-setup-core.a \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ src/libnm-base/libnm-base.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(LIBCURL_LIBS) \ $(NULL) $(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(src_libnm_client_public_mkenums_h) if HAVE_SYSTEMD @@ -5150,20 +5163,20 @@ clients_cloud_setup_tests_test_cloud_setup_general_LDFLAGS = \ clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \ clients/cloud-setup/libnm-cloud-setup-core.a \ - libnm/nm-libnm-aux/libnm-libnm-aux.la \ + src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ src/libnm-base/libnm-base.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(LIBCURL_LIBS) \ $(NULL) $(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(libnm_lib_h_pub_mkenums) +$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_client_public_mkenums_h) endif @@ -5174,8 +5187,8 @@ endif check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-client.py mkdir -p "$(builddir)/clients/tests/" "$(builddir)/clients/cli/nmcli" --version - GI_TYPELIB_PATH="$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \ - LD_LIBRARY_PATH="$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \ + GI_TYPELIB_PATH="$(abs_builddir)/src/libnm-client-impl$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \ + LD_LIBRARY_PATH="$(abs_builddir)/src/libnm-client-impl/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \ NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \ NM_TEST_CLIENT_NMCLI_PATH=clients/cli/nmcli \ "$(PYTHON)" \ @@ -5305,9 +5318,9 @@ if HAVE_INTROSPECTION man/nm-settings-%.xml: man/nm-settings-%.xsl man/nm-settings-docs-%.xml man/common.ent $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $< $(word 2,$^) -man/nm-settings-keyfile.xml: man/nm-settings-keyfile.xsl libnm/nm-property-infos-keyfile.xml man/common.ent +man/nm-settings-keyfile.xml: man/nm-settings-keyfile.xsl src/libnm-client-impl/nm-property-infos-keyfile.xml man/common.ent $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $< $(word 2,$^) -man/nm-settings-ifcfg-rh.xml: man/nm-settings-ifcfg-rh.xsl libnm/nm-property-infos-ifcfg-rh.xml man/common.ent +man/nm-settings-ifcfg-rh.xml: man/nm-settings-ifcfg-rh.xsl src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml man/common.ent $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $< $(word 2,$^) CLEANFILES += $(man_nm_settings_xml) @@ -5408,10 +5421,10 @@ if ENABLE_VAPIGEN VAPIGEN_VAPIS += \ vapi/libnm.vapi -vapi/libnm.vapi: $(builddir)/libnm/NM-1.0.gir vapi/libnm.deps vapi/NM-1.0.metadata +vapi/libnm.vapi: $(builddir)/src/libnm-client-impl/NM-1.0.gir vapi/libnm.deps vapi/NM-1.0.metadata vapi_libnm_vapi_METADATADIRS = $(srcdir)/vapi -vapi_libnm_vapi_FILES = $(builddir)/libnm/NM-1.0.gir +vapi_libnm_vapi_FILES = $(builddir)/src/libnm-client-impl/NM-1.0.gir vapi_libnm_vapi_DEPS = gio-2.0 vapi_DATA += \ diff --git a/Makefile.examples b/Makefile.examples index e157b0a95d..d427397830 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -3,10 +3,10 @@ ############################################################################### examples_C_glib_cppflags = \ - -I$(top_builddir)/src/libnm-core-public \ -I$(top_srcdir)/src/libnm-core-public \ - -I$(top_builddir)/libnm \ - -I$(top_srcdir)/libnm \ + -I$(top_builddir)/src/libnm-core-public \ + -I$(top_srcdir)/src/libnm-client-public \ + -I$(top_builddir)/src/libnm-client-public \ $(GLIB_CFLAGS) examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) @@ -26,24 +26,24 @@ examples_C_glib_add_connection_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus examples_C_glib_add_connection_gdbus_LDADD = \ $(GLIB_LIBS) \ $(UUID_LIBS) -$(examples_C_glib_add_connection_gdbus_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) +$(examples_C_glib_add_connection_gdbus_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_add_connection_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) examples_C_glib_add_connection_libnm_LDADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) -$(examples_C_glib_add_connection_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) +$(examples_C_glib_add_connection_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_get_active_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_get_active_connections_gdbus_LDADD = \ $(GLIB_LIBS) -$(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) +$(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_get_ap_info_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) examples_C_glib_get_ap_info_libnm_LDADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) -$(examples_C_glib_get_ap_info_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) +$(examples_C_glib_get_ap_info_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_list_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_list_connections_gdbus_LDADD = \ @@ -51,9 +51,9 @@ examples_C_glib_list_connections_gdbus_LDADD = \ examples_C_glib_list_connections_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) examples_C_glib_list_connections_libnm_LDADD = \ - libnm/libnm.la \ + src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) -$(examples_C_glib_list_connections_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(libnm_lib_h_pub_mkenums) +$(examples_C_glib_list_connections_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h) examples_C_glib_monitor_nm_running_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) examples_C_glib_monitor_nm_running_gdbus_LDADD = \ diff --git a/clients/cli/agent.c b/clients/cli/agent.c index a3c60c46e7..fbbf9790cf 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdio.h> #include <stdlib.h> diff --git a/clients/cli/common.c b/clients/cli/common.c index 9414a81299..6e21559f99 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "common.h" @@ -13,7 +13,7 @@ #include <readline/readline.h> #include <readline/history.h> -#include "nm-libnm-aux/nm-libnm-aux.h" +#include "libnm-client-aux-extern/nm-libnm-aux.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" diff --git a/clients/cli/connections.c b/clients/cli/connections.c index ee7b8fbbe9..97c50f5ba7 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "connections.h" diff --git a/clients/cli/devices.c b/clients/cli/devices.c index baee44d250..dd231448b7 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "devices.h" diff --git a/clients/cli/general.c b/clients/cli/general.c index 8094ad7c71..960d635874 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/cli/generate-docs-nm-settings-nmcli.c b/clients/cli/generate-docs-nm-settings-nmcli.c index d277b132e4..da2eed6d79 100644 --- a/clients/cli/generate-docs-nm-settings-nmcli.c +++ b/clients/cli/generate-docs-nm-settings-nmcli.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-meta-setting-desc.h" diff --git a/clients/cli/meson.build b/clients/cli/meson.build index cef0b880ff..8feaefd8e4 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -24,7 +24,7 @@ executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, @@ -46,7 +46,7 @@ generate_docs_nm_settings_nmcli = executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 3945721105..49ade6827b 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -4,7 +4,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcli.h" diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 2f07a2751e..9f5de2077f 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "polkit-agent.h" diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 4de1a37ebf..5258c03f3a 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2015 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "settings.h" diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 0a62c35cfa..537cf1f35a 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -4,7 +4,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "utils.h" diff --git a/clients/cloud-setup/main.c b/clients/cloud-setup/main.c index 7cee355d75..04db9e9d4d 100644 --- a/clients/cloud-setup/main.c +++ b/clients/cloud-setup/main.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" -#include "nm-libnm-aux/nm-libnm-aux.h" +#include "libnm-client-aux-extern/nm-libnm-aux.h" #include "nm-cloud-setup-utils.h" #include "nmcs-provider-ec2.h" diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index a013bade78..e8b74b7a03 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -35,7 +35,7 @@ libnm_cloud_setup_core = static_library( libnmc_base_dep, libnmc_dep, libcurl_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, ], ) diff --git a/clients/cloud-setup/nm-cloud-setup-utils.c b/clients/cloud-setup/nm-cloud-setup-utils.c index 1eb644a7f0..1cb14a8349 100644 --- a/clients/cloud-setup/nm-cloud-setup-utils.c +++ b/clients/cloud-setup/nm-cloud-setup-utils.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-cloud-setup-utils.h" diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c index a2f24059c8..618ab1be10 100644 --- a/clients/cloud-setup/nm-http-client.c +++ b/clients/cloud-setup/nm-http-client.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-http-client.h" diff --git a/clients/cloud-setup/nmcs-provider-azure.c b/clients/cloud-setup/nmcs-provider-azure.c index 0a5d522cc3..a46f56a40d 100644 --- a/clients/cloud-setup/nmcs-provider-azure.c +++ b/clients/cloud-setup/nmcs-provider-azure.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcs-provider-azure.h" diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c index 1e060034f5..f716827db8 100644 --- a/clients/cloud-setup/nmcs-provider-ec2.c +++ b/clients/cloud-setup/nmcs-provider-ec2.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcs-provider-ec2.h" diff --git a/clients/cloud-setup/nmcs-provider-gcp.c b/clients/cloud-setup/nmcs-provider-gcp.c index 1deaea10f3..eacfd5e248 100644 --- a/clients/cloud-setup/nmcs-provider-gcp.c +++ b/clients/cloud-setup/nmcs-provider-gcp.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcs-provider-gcp.h" diff --git a/clients/cloud-setup/nmcs-provider.c b/clients/cloud-setup/nmcs-provider.c index c700d8e1a3..678152aa95 100644 --- a/clients/cloud-setup/nmcs-provider.c +++ b/clients/cloud-setup/nmcs-provider.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmcs-provider.h" diff --git a/clients/cloud-setup/tests/test-cloud-setup-general.c b/clients/cloud-setup/tests/test-cloud-setup-general.c index 88f2cb74ad..82ec7adf62 100644 --- a/clients/cloud-setup/tests/test-cloud-setup-general.c +++ b/clients/cloud-setup/tests/test-cloud-setup-general.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-cloud-setup-utils.h" #include "libnm-core-aux-intern/nm-libnm-core-utils.h" diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index db0ddec242..701f8e1834 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2017 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-client-utils.h" diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c index dd493f28ae..cd4cbdd548 100644 --- a/clients/common/nm-meta-setting-access.c +++ b/clients/common/nm-meta-setting-access.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2017 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-meta-setting-access.h" diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 233626b879..c814066719 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-meta-setting-desc.h" diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index b0e200757a..29c25b4e67 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -18,7 +18,7 @@ * https://github.com/lxde/lxqt-policykit/tree/master/src */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-polkit-listener.h" diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 04f43885e9..69617d0fee 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -16,7 +16,7 @@ * replace ShellNetworkAgent. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-secret-agent-simple.h" diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index 4038ca7b21..72691e34c2 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -8,7 +8,7 @@ * @short_description: VPN-related utilities */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-vpn-helpers.h" diff --git a/clients/common/tests/test-clients-common.c b/clients/common/tests/test-clients-common.c index 9d24d1f021..f06b01208c 100644 --- a/clients/common/tests/test-clients-common.c +++ b/clients/common/tests/test-clients-common.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-meta-setting-access.h" #include "nm-vpn-helpers.h" diff --git a/clients/common/tests/test-libnm-core-aux.c b/clients/common/tests/test-libnm-core-aux.c index a9bbe105bd..c4db4d6a39 100644 --- a/clients/common/tests/test-libnm-core-aux.c +++ b/clients/common/tests/test-libnm-core-aux.c @@ -3,7 +3,7 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "libnm-core-aux-extern/nm-libnm-core-aux.h" #include "libnm-core-aux-intern/nm-libnm-core-utils.h" diff --git a/clients/meson.build b/clients/meson.build index 428dee462a..3d360e0f1a 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -6,7 +6,7 @@ executable( dependencies: [ libnm_dep, libnm_nm_default_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, libnm_glib_aux_dep_link, ], link_args: ldflags_linker_script_binary, diff --git a/clients/nm-online.c b/clients/nm-online.c index c5cdeb38a0..6c807a6084 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -16,14 +16,14 @@ * Robert Love <rml@novell.com> */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdio.h> #include <stdlib.h> #include <getopt.h> #include <locale.h> -#include "nm-libnm-aux/nm-libnm-aux.h" +#include "libnm-client-aux-extern/nm-libnm-aux.h" #define PROGRESS_STEPS 15 diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 603d0eb4ea..d421238869 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -50,7 +50,7 @@ executable( libnmc_base_dep, libnmc_dep, libnmt_newt_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c index 212d04afa2..d86a154cb2 100644 --- a/clients/tui/newt/nmt-newt-button-box.c +++ b/clients/tui/newt/nmt-newt-button-box.c @@ -16,7 +16,7 @@ * within each of the two sections. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-button-box.h" diff --git a/clients/tui/newt/nmt-newt-button.c b/clients/tui/newt/nmt-newt-button.c index 1a30a63d4c..09ca1648a8 100644 --- a/clients/tui/newt/nmt-newt-button.c +++ b/clients/tui/newt/nmt-newt-button.c @@ -10,7 +10,7 @@ * #NmtNewtButton implements a button widget. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-button.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-checkbox.c b/clients/tui/newt/nmt-newt-checkbox.c index f806494277..cf825e08d9 100644 --- a/clients/tui/newt/nmt-newt-checkbox.c +++ b/clients/tui/newt/nmt-newt-checkbox.c @@ -10,7 +10,7 @@ * #NmtNewtCheckbox implements a checkbox widget. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-checkbox.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-component.c b/clients/tui/newt/nmt-newt-component.c index 64648ea6bb..8d7a9005c9 100644 --- a/clients/tui/newt/nmt-newt-component.c +++ b/clients/tui/newt/nmt-newt-component.c @@ -11,7 +11,7 @@ * wrap a (single) #newtComponent. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-component.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c index dfb5891661..4cc8db242a 100644 --- a/clients/tui/newt/nmt-newt-container.c +++ b/clients/tui/newt/nmt-newt-container.c @@ -13,7 +13,7 @@ * #NmtNewtGrid is the most generic container type. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-container.h" diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c index c08ad00a24..7e8edd6cad 100644 --- a/clients/tui/newt/nmt-newt-entry-numeric.c +++ b/clients/tui/newt/nmt-newt-entry-numeric.c @@ -13,7 +13,7 @@ * #NmtNewtEntryValidator functions, so you should not set your own. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c index 2c2ee13535..76a96df2f2 100644 --- a/clients/tui/newt/nmt-newt-entry.c +++ b/clients/tui/newt/nmt-newt-entry.c @@ -13,7 +13,7 @@ * See also #NmtNewtEntryNumeric, for numeric-only entries. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-entry.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c index 23118e3403..825f7cfe61 100644 --- a/clients/tui/newt/nmt-newt-form.c +++ b/clients/tui/newt/nmt-newt-form.c @@ -11,7 +11,7 @@ * "form" (aka dialog) to the user. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <fcntl.h> #include <unistd.h> diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c index 9fdd615a72..a68a496bce 100644 --- a/clients/tui/newt/nmt-newt-grid.c +++ b/clients/tui/newt/nmt-newt-grid.c @@ -27,7 +27,7 @@ * must be implemented by the container... */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-grid.h" diff --git a/clients/tui/newt/nmt-newt-hacks.c b/clients/tui/newt/nmt-newt-hacks.c index 4120acbb3f..40114a29a7 100644 --- a/clients/tui/newt/nmt-newt-hacks.c +++ b/clients/tui/newt/nmt-newt-hacks.c @@ -11,7 +11,7 @@ * functions that were added after 0.52.15. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-hacks.h" diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c index 1902b57f2d..32c7809d4d 100644 --- a/clients/tui/newt/nmt-newt-label.c +++ b/clients/tui/newt/nmt-newt-label.c @@ -12,7 +12,7 @@ * See also #NmtNewtTextbox, for multiline. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-label.h" diff --git a/clients/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c index 7031fc0f99..cfe23647a1 100644 --- a/clients/tui/newt/nmt-newt-listbox.c +++ b/clients/tui/newt/nmt-newt-listbox.c @@ -18,7 +18,7 @@ * presses Return on a selection. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-listbox.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c index c8d8034dd9..1822c9d953 100644 --- a/clients/tui/newt/nmt-newt-popup.c +++ b/clients/tui/newt/nmt-newt-popup.c @@ -13,7 +13,7 @@ * #NmtNewtForm containing an #NmtNewtListbox to select from. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-popup.h" #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c index 6075563950..fa73ea4a07 100644 --- a/clients/tui/newt/nmt-newt-section.c +++ b/clients/tui/newt/nmt-newt-section.c @@ -22,7 +22,7 @@ * extent of the section. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-section.h" diff --git a/clients/tui/newt/nmt-newt-separator.c b/clients/tui/newt/nmt-newt-separator.c index c0dde744bc..70c505ca6b 100644 --- a/clients/tui/newt/nmt-newt-separator.c +++ b/clients/tui/newt/nmt-newt-separator.c @@ -12,7 +12,7 @@ * between widgets in containers that don't implement padding. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-separator.h" diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c index f3a2d1f0c4..e0fdb3b9a2 100644 --- a/clients/tui/newt/nmt-newt-stack.c +++ b/clients/tui/newt/nmt-newt-stack.c @@ -16,7 +16,7 @@ * children. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-stack.h" diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c index c8e3d576e5..128e539b91 100644 --- a/clients/tui/newt/nmt-newt-textbox.c +++ b/clients/tui/newt/nmt-newt-textbox.c @@ -11,7 +11,7 @@ * word-wrapping. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-textbox.h" diff --git a/clients/tui/newt/nmt-newt-toggle-button.c b/clients/tui/newt/nmt-newt-toggle-button.c index cbc813fb30..c48931e5d7 100644 --- a/clients/tui/newt/nmt-newt-toggle-button.c +++ b/clients/tui/newt/nmt-newt-toggle-button.c @@ -10,7 +10,7 @@ * #NmtNewtToggleButton implements a two-state toggle button. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index af24824558..1216b8d356 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -8,7 +8,7 @@ * @short_description: Utility functions */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdarg.h> #include <unistd.h> diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c index 902949527a..8b5647aa9b 100644 --- a/clients/tui/newt/nmt-newt-widget.c +++ b/clients/tui/newt/nmt-newt-widget.c @@ -21,7 +21,7 @@ * FIXME: need RTL support */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt-widget.h" #include "nmt-newt-form.h" diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index 01f22f64ca..162e8b1b38 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -12,7 +12,7 @@ * shared between nmtui, nm-connection-editor, and gnome-control-center. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-editor-bindings.h" diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 21dc3aef92..fd73cd8312 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -12,7 +12,7 @@ * nm-connection-editor, and gnome-control-center. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-editor-utils.h" #if 0 diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c index bb3651d956..265457d658 100644 --- a/clients/tui/nmt-address-list.c +++ b/clients/tui/nmt-address-list.c @@ -15,7 +15,7 @@ * functions. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index e8a90d0a31..5d0596728a 100644 --- a/clients/tui/nmt-connect-connection-list.c +++ b/clients/tui/nmt-connect-connection-list.c @@ -11,7 +11,7 @@ * access points displayed by "nmtui connect". */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c index dcc2c6d24d..e831f4e474 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -21,7 +21,7 @@ * to implement that then we should make it just an #NmtNewtEntry. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-device-entry.h" diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c index 52535e077c..9b31e06f79 100644 --- a/clients/tui/nmt-edit-connection-list.c +++ b/clients/tui/nmt-edit-connection-list.c @@ -11,7 +11,7 @@ * "nmtui edit". */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmtui.h" #include "nmtui-edit.h" diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c index 9bd07066c9..8c79e8d967 100644 --- a/clients/tui/nmt-editor-grid.c +++ b/clients/tui/nmt-editor-grid.c @@ -24,7 +24,7 @@ * section border into account as well. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor-grid.h" diff --git a/clients/tui/nmt-editor-page-device.c b/clients/tui/nmt-editor-page-device.c index 18f886bda5..950f4db12f 100644 --- a/clients/tui/nmt-editor-page-device.c +++ b/clients/tui/nmt-editor-page-device.c @@ -15,7 +15,7 @@ * an actual page type. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor-page-device.h" diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c index 24ff9bebca..6d90d71e99 100644 --- a/clients/tui/nmt-editor-page.c +++ b/clients/tui/nmt-editor-page.c @@ -11,7 +11,7 @@ * A "page" is a set of related #NmtEditorSections. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor-page.h" diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c index 0b85cd2935..c95fc6ff9c 100644 --- a/clients/tui/nmt-editor-section.c +++ b/clients/tui/nmt-editor-section.c @@ -10,7 +10,7 @@ * #NmtEditorSection is the abstract base class for #NmtEditor sections. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor-section.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index 2f5a09b097..69b5e3398a 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -10,7 +10,7 @@ * #NmtEditor is the top-level form for editing a connection. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-editor.h" diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c index e6d1306d5c..b801eec4c7 100644 --- a/clients/tui/nmt-ip-entry.c +++ b/clients/tui/nmt-ip-entry.c @@ -14,7 +14,7 @@ * contains a valid IP address. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 1f4cab9384..3f71f4c9e4 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -13,7 +13,7 @@ * on whether it currently contains a valid hardware address. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-mac-entry.h" diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c index 7b1c0f3be1..eab25a23c1 100644 --- a/clients/tui/nmt-mtu-entry.c +++ b/clients/tui/nmt-mtu-entry.c @@ -17,7 +17,7 @@ * indicating the units used by the entry. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index 8dfc38f861..d3fab1ffda 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -12,7 +12,7 @@ * can't just use #GBinding. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-bond.h" diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c index 228acc20c0..30163d1524 100644 --- a/clients/tui/nmt-page-bridge-port.c +++ b/clients/tui/nmt-page-bridge-port.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Bridge ports */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-bridge-port.h" diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c index 7fc85eb2ed..52af8db127 100644 --- a/clients/tui/nmt-page-bridge.c +++ b/clients/tui/nmt-page-bridge.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Bridge connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-bridge.h" diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c index 8e1e69f3f2..d7e0d144b5 100644 --- a/clients/tui/nmt-page-dsl.c +++ b/clients/tui/nmt-page-dsl.c @@ -8,7 +8,7 @@ * @short_description: The editor page for DSL connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-dsl.h" #include "nmt-page-ethernet.h" diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c index 61ef811ca8..f5dc91194a 100644 --- a/clients/tui/nmt-page-ethernet.c +++ b/clients/tui/nmt-page-ethernet.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Ethernet connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-ethernet.h" diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c index 0529caf367..c0e3611bdc 100644 --- a/clients/tui/nmt-page-infiniband.c +++ b/clients/tui/nmt-page-infiniband.c @@ -8,7 +8,7 @@ * @short_description: The editor page for InfiniBand connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-infiniband.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-ip-tunnel.c b/clients/tui/nmt-page-ip-tunnel.c index ab58038989..da6d12b9cc 100644 --- a/clients/tui/nmt-page-ip-tunnel.c +++ b/clients/tui/nmt-page-ip-tunnel.c @@ -7,7 +7,7 @@ * @short_description: The editor page for IP tunnel connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-ip-tunnel.h" diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c index 1f01155bf4..ecd714473a 100644 --- a/clients/tui/nmt-page-ip4.c +++ b/clients/tui/nmt-page-ip4.c @@ -8,7 +8,7 @@ * @short_description: The editor page for IP4 configuration */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c index f4e4f3d0ea..f79c553db4 100644 --- a/clients/tui/nmt-page-ip6.c +++ b/clients/tui/nmt-page-ip6.c @@ -8,7 +8,7 @@ * @short_description: The editor page for IP6 configuration */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c index b60835af09..b7cb554092 100644 --- a/clients/tui/nmt-page-ppp.c +++ b/clients/tui/nmt-page-ppp.c @@ -8,7 +8,7 @@ * @short_description: The editor page for PPP configuration */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c index fd71140813..13bb84f069 100644 --- a/clients/tui/nmt-page-team-port.c +++ b/clients/tui/nmt-page-team-port.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Team ports. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-team-port.h" diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c index f0a3f839d7..3cda1257a7 100644 --- a/clients/tui/nmt-page-team.c +++ b/clients/tui/nmt-page-team.c @@ -8,7 +8,7 @@ * @short_description: The editor page for Team connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-page-team.h" diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c index 549156dd33..299a726721 100644 --- a/clients/tui/nmt-page-vlan.c +++ b/clients/tui/nmt-page-vlan.c @@ -8,7 +8,7 @@ * @short_description: The editor page for VLAN connections */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-editor-bindings.h" diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c index 817e23bde6..247a0e4e3e 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -12,7 +12,7 @@ * properties. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> #include <linux/if_ether.h> diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c index 679bf05229..5f68946b33 100644 --- a/clients/tui/nmt-password-dialog.c +++ b/clients/tui/nmt-password-dialog.c @@ -11,7 +11,7 @@ * secrets when activating a connection. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-password-dialog.h" #include "nm-secret-agent-simple.h" diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c index c4c54a26bf..45073c7e47 100644 --- a/clients/tui/nmt-password-fields.c +++ b/clients/tui/nmt-password-fields.c @@ -12,7 +12,7 @@ * "Show password" checkbox that toggles whether the password is visible. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-password-fields.h" diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c index d2e54122e7..ffccf38d2d 100644 --- a/clients/tui/nmt-route-editor.c +++ b/clients/tui/nmt-route-editor.c @@ -12,7 +12,7 @@ * wide to fit into the main window. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-route-editor.h" #include "nmt-route-table.h" diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c index 545eaf14ea..5cd150b087 100644 --- a/clients/tui/nmt-route-entry.c +++ b/clients/tui/nmt-route-entry.c @@ -13,7 +13,7 @@ * This is used as a building block by #NmtRouteTable. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c index e38149450a..fcb14e6a1d 100644 --- a/clients/tui/nmt-route-table.c +++ b/clients/tui/nmt-route-table.c @@ -11,7 +11,7 @@ * and buttons to add and remove entries. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <arpa/inet.h> #include <netinet/in.h> diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c index 9a2f6d241c..a6ce554de7 100644 --- a/clients/tui/nmt-slave-list.c +++ b/clients/tui/nmt-slave-list.c @@ -11,7 +11,7 @@ * slaves of a connection. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-slave-list.h" diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c index 39889e11c6..bac763f696 100644 --- a/clients/tui/nmt-utils.c +++ b/clients/tui/nmt-utils.c @@ -8,7 +8,7 @@ * @short_description: Miscellaneous nmtui-specific utilities */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-utils.h" diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c index d25c01c77e..9c8ac47519 100644 --- a/clients/tui/nmt-widget-list.c +++ b/clients/tui/nmt-widget-list.c @@ -17,7 +17,7 @@ * FIXME: The way this works is sort of weird. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-widget-list.h" diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 356badb011..23439ced73 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -11,7 +11,7 @@ * including presenting a password dialog if necessary. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index 8a88e1162a..534643a764 100644 --- a/clients/tui/nmtui-edit.c +++ b/clients/tui/nmtui-edit.c @@ -10,7 +10,7 @@ * nmtui-edit implements editing #NMConnections. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <stdlib.h> diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c index 07e0f6058c..1d93fd04ae 100644 --- a/clients/tui/nmtui-hostname.c +++ b/clients/tui/nmtui-hostname.c @@ -10,7 +10,7 @@ * nmtui-hostname implements the "set hostname" functionality */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-newt.h" diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 73ead40e8f..914b043470 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -11,14 +11,14 @@ * nmtui_edit(), and nmtui_hostname(). */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nmtui.h" #include <locale.h> #include <stdlib.h> -#include "nm-libnm-aux/nm-libnm-aux.h" +#include "libnm-client-aux-extern/nm-libnm-aux.h" #include "nmt-newt.h" #include "nm-editor-bindings.h" diff --git a/configure.ac b/configure.ac index ba64a95835..0489ff8072 100644 --- a/configure.ac +++ b/configure.ac @@ -1305,7 +1305,6 @@ AC_SUBST(AM_CFLAGS) AC_CONFIG_FILES([ Makefile -libnm/libnm.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile @@ -1313,6 +1312,7 @@ docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc +src/libnm-client-impl/libnm.pc src/libnm-core-public/nm-version-macros.h ]) AC_OUTPUT diff --git a/dispatcher/meson.build b/dispatcher/meson.build index d53cc19580..0bfa4590a5 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -20,7 +20,7 @@ libnm_dispatcher_core = static_library( dependencies: [ libnm_dep, libnm_nm_default_dep, - libnm_libnm_aux_dep, + libnm_client_aux_extern_dep, ], ) diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c index 78885712f2..f754a3fa70 100644 --- a/dispatcher/nm-dispatcher-utils.c +++ b/dispatcher/nm-dispatcher-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-dispatcher-utils.h" diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c index 06744ff3ab..3447f65ef3 100644 --- a/dispatcher/nm-dispatcher.c +++ b/dispatcher/nm-dispatcher.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <syslog.h> #include <stdio.h> diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c index 21fa5cf758..a25e921746 100644 --- a/dispatcher/tests/test-dispatcher-envp.c +++ b/dispatcher/tests/test-dispatcher-envp.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include <arpa/inet.h> #include <stdlib.h> diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index c868fff790..3de6976b70 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -17,8 +17,11 @@ DOC_SOURCE_DIR= \ $(top_srcdir)/src/libnm-core-public \ $(top_builddir)/src/libnm-core-impl \ $(top_srcdir)/src/libnm-core-impl \ - $(top_srcdir)/libnm \ - $(top_builddir)/libnm + $(top_srcdir)/src/libnm-client-public \ + $(top_builddir)/src/libnm-client-public \ + $(top_srcdir)/src/libnm-client-impl \ + $(top_builddir)/src/libnm-client-impl \ + $(NULL) # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators="NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?" @@ -30,8 +33,8 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml FIXXREF_OPTIONS= # Used for dependencies. -HFILE_GLOB=$(top_srcdir)/src/libnm-core-public/*.h $(top_srcdir)/libnm/*.h -CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/libnm/*.c +HFILE_GLOB=$(top_srcdir)/src/libnm-core-public/*.h $(top_srcdir)/src/libnm-client-public/*.h +CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/src/libnm-client-impl/*.c # Header files to ignore when scanning. IGNORE_HFILES= \ @@ -88,14 +91,14 @@ extra_files = libnm.png GTKDOC_CFLAGS = \ -I$(top_builddir)/src/libnm-core-public \ -I$(top_srcdir)/src/libnm-core-public \ - -I$(top_builddir)/libnm \ - -I$(top_srcdir)/libnm \ + -I$(top_srcdir)/src/libnm-client-public \ + -I$(top_builddir)/src/libnm-client-public \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/libnm/libnm.la \ + $(top_builddir)/src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(SANITIZER_EXEC_LDFLAGS) diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 7cb5c646ee..746335c4ce 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -54,7 +54,7 @@ gnome.gtkdoc( main_xml: libnm_name + '-docs.xml', src_dir: [ libnm_core_public_inc, - libnm_inc, + libnm_client_public_inc, ], dependencies: libnm_dep, scan_args: scan_args, diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build index 41c46ca806..cf26fdf4bf 100644 --- a/examples/C/glib/meson.build +++ b/examples/C/glib/meson.build @@ -1,9 +1,9 @@ # SPDX-License-Identifier: LGPL-2.1-or-later examples = [ - ['add-connection-gdbus', [libnm_enum_sources[1]], [uuid_dep]], + ['add-connection-gdbus', [libnm_client_public_enum_sources[1]], [uuid_dep]], ['add-connection-libnm', [], [libnm_dep]], - ['get-active-connections-gdbus', [libnm_enum_sources[1]], []], + ['get-active-connections-gdbus', [libnm_client_public_enum_sources[1]], []], ['get-ap-info-libnm', [], [libnm_dep]], ['list-connections-gdbus', [], []], ['list-connections-libnm', [], [libnm_dep]], diff --git a/meson.build b/meson.build index 1b114ef923..c6aaa20ad3 100644 --- a/meson.build +++ b/meson.build @@ -921,7 +921,6 @@ content_files = [] subdir('introspection') subdir('shared') subdir('src') -subdir('libnm') subdir('dispatcher') subdir('clients') subdir('data') diff --git a/po/POTFILES.in b/po/POTFILES.in index 588aa314d5..2314ab721b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -52,39 +52,6 @@ clients/tui/nmtui-edit.c clients/tui/nmtui-hostname.c clients/tui/nmtui.c data/org.freedesktop.NetworkManager.policy.in.in -libnm/nm-client.c -libnm/nm-device-6lowpan.c -libnm/nm-device-adsl.c -libnm/nm-device-bond.c -libnm/nm-device-bridge.c -libnm/nm-device-bt.c -libnm/nm-device-dummy.c -libnm/nm-device-ethernet.c -libnm/nm-device-generic.c -libnm/nm-device-infiniband.c -libnm/nm-device-ip-tunnel.c -libnm/nm-device-macvlan.c -libnm/nm-device-modem.c -libnm/nm-device-olpc-mesh.c -libnm/nm-device-ovs-bridge.c -libnm/nm-device-ovs-interface.c -libnm/nm-device-ovs-port.c -libnm/nm-device-team.c -libnm/nm-device-tun.c -libnm/nm-device-veth.c -libnm/nm-device-vlan.c -libnm/nm-device-vrf.c -libnm/nm-device-vxlan.c -libnm/nm-device-wifi-p2p.c -libnm/nm-device-wifi.c -libnm/nm-device-wimax.c -libnm/nm-device-wpan.c -libnm/nm-device.c -libnm/nm-object.c -libnm/nm-remote-connection.c -libnm/nm-secret-agent-old.c -libnm/nm-vpn-plugin-old.c -libnm/nm-vpn-service-plugin.c src/core/NetworkManagerUtils.c src/core/devices/adsl/nm-device-adsl.c src/core/devices/bluetooth/nm-bluez-manager.c @@ -120,6 +87,39 @@ src/core/nm-iface-helper.c src/core/nm-manager.c src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +src/libnm-client-impl/nm-client.c +src/libnm-client-impl/nm-device-6lowpan.c +src/libnm-client-impl/nm-device-adsl.c +src/libnm-client-impl/nm-device-bond.c +src/libnm-client-impl/nm-device-bridge.c +src/libnm-client-impl/nm-device-bt.c +src/libnm-client-impl/nm-device-dummy.c +src/libnm-client-impl/nm-device-ethernet.c +src/libnm-client-impl/nm-device-generic.c +src/libnm-client-impl/nm-device-infiniband.c +src/libnm-client-impl/nm-device-ip-tunnel.c +src/libnm-client-impl/nm-device-macvlan.c +src/libnm-client-impl/nm-device-modem.c +src/libnm-client-impl/nm-device-olpc-mesh.c +src/libnm-client-impl/nm-device-ovs-bridge.c +src/libnm-client-impl/nm-device-ovs-interface.c +src/libnm-client-impl/nm-device-ovs-port.c +src/libnm-client-impl/nm-device-team.c +src/libnm-client-impl/nm-device-tun.c +src/libnm-client-impl/nm-device-veth.c +src/libnm-client-impl/nm-device-vlan.c +src/libnm-client-impl/nm-device-vrf.c +src/libnm-client-impl/nm-device-vxlan.c +src/libnm-client-impl/nm-device-wifi-p2p.c +src/libnm-client-impl/nm-device-wifi.c +src/libnm-client-impl/nm-device-wimax.c +src/libnm-client-impl/nm-device-wpan.c +src/libnm-client-impl/nm-device.c +src/libnm-client-impl/nm-object.c +src/libnm-client-impl/nm-remote-connection.c +src/libnm-client-impl/nm-secret-agent-old.c +src/libnm-client-impl/nm-vpn-plugin-old.c +src/libnm-client-impl/nm-vpn-service-plugin.c src/libnm-core-aux-extern/nm-libnm-core-aux.c src/libnm-core-aux-intern/nm-libnm-core-utils.c src/libnm-core-impl/nm-connection.c diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c index c740126515..705718eb57 100644 --- a/shared/nm-test-utils-impl.c +++ b/shared/nm-test-utils-impl.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include <sys/wait.h> diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c index dad4822755..f15c29c9e6 100644 --- a/shared/nm-utils/nm-compat.c +++ b/shared/nm-utils/nm-compat.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-compat.h" diff --git a/shared/nm-utils/nm-vpn-plugin-utils.c b/shared/nm-utils/nm-vpn-plugin-utils.c index 89285ecd2f..b10695b74d 100644 --- a/shared/nm-utils/nm-vpn-plugin-utils.c +++ b/shared/nm-utils/nm-vpn-plugin-utils.c @@ -3,7 +3,7 @@ * Copyright (C) 2016, 2018 Red Hat, Inc. */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-vpn-plugin-utils.h" diff --git a/libnm/nm-libnm-aux/README.md b/src/libnm-client-aux-extern/README.md index 460b269e6d..460b269e6d 100644 --- a/libnm/nm-libnm-aux/README.md +++ b/src/libnm-client-aux-extern/README.md diff --git a/src/libnm-client-aux-extern/meson.build b/src/libnm-client-aux-extern/meson.build new file mode 100644 index 0000000000..2ad7428d22 --- /dev/null +++ b/src/libnm-client-aux-extern/meson.build @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_client_aux_extern = static_library( + 'nm-client-aux-extern', + sources: files( + 'nm-libnm-aux.c', + ), + dependencies: [ + libnm_core_aux_intern_dep, + libnm_dep, + ], +) + +libnm_client_aux_extern_dep = declare_dependency( + include_directories: [shared_inc], + link_with: [libnm_client_aux_extern], +) diff --git a/libnm/nm-default-client.h b/src/libnm-client-aux-extern/nm-default-client.h index a770ae567d..a770ae567d 100644 --- a/libnm/nm-default-client.h +++ b/src/libnm-client-aux-extern/nm-default-client.h diff --git a/libnm/nm-libnm-aux/nm-libnm-aux.c b/src/libnm-client-aux-extern/nm-libnm-aux.c index 2b8d2c2ef9..2d17241db3 100644 --- a/libnm/nm-libnm-aux/nm-libnm-aux.c +++ b/src/libnm-client-aux-extern/nm-libnm-aux.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-client.h" +#include "libnm-client-aux-extern/nm-default-client.h" #include "nm-libnm-aux.h" diff --git a/libnm/nm-libnm-aux/nm-libnm-aux.h b/src/libnm-client-aux-extern/nm-libnm-aux.h index c982eab7c9..c982eab7c9 100644 --- a/libnm/nm-libnm-aux/nm-libnm-aux.h +++ b/src/libnm-client-aux-extern/nm-libnm-aux.h diff --git a/libnm/libnm.pc.in b/src/libnm-client-impl/libnm.pc.in index afc5e4d9fe..afc5e4d9fe 100644 --- a/libnm/libnm.pc.in +++ b/src/libnm-client-impl/libnm.pc.in diff --git a/libnm/libnm.ver b/src/libnm-client-impl/libnm.ver index c61792c749..c61792c749 100644 --- a/libnm/libnm.ver +++ b/src/libnm-client-impl/libnm.ver diff --git a/libnm/meson.build b/src/libnm-client-impl/meson.build index deb57b8dcb..5af3ed1b15 100644 --- a/libnm/meson.build +++ b/src/libnm-client-impl/meson.build @@ -1,10 +1,8 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -libnm_inc = include_directories('.') - libnm_nm_default_dep = declare_dependency( include_directories: [ - libnm_inc, + libnm_client_public_inc, libnm_core_public_inc, top_inc, shared_inc, @@ -15,74 +13,7 @@ libnm_nm_default_dep = declare_dependency( ], ) -libnm_headers = files( - 'NetworkManager.h', - 'nm-access-point.h', - 'nm-active-connection.h', - 'nm-autoptr.h', - 'nm-checkpoint.h', - 'nm-client.h', - 'nm-device-6lowpan.h', - 'nm-device-adsl.h', - 'nm-device-bond.h', - 'nm-device-bridge.h', - 'nm-device-bt.h', - 'nm-device-dummy.h', - 'nm-device-ethernet.h', - 'nm-device-generic.h', - 'nm-device-infiniband.h', - 'nm-device-ip-tunnel.h', - 'nm-device-macsec.h', - 'nm-device-macvlan.h', - 'nm-device-modem.h', - 'nm-device-olpc-mesh.h', - 'nm-device-ovs-bridge.h', - 'nm-device-ovs-interface.h', - 'nm-device-ovs-port.h', - 'nm-device-ppp.h', - 'nm-device-team.h', - 'nm-device-tun.h', - 'nm-device-veth.h', - 'nm-device-vlan.h', - 'nm-device-vrf.h', - 'nm-device-vxlan.h', - 'nm-device-wifi-p2p.h', - 'nm-device-wifi.h', - 'nm-device-wimax.h', - 'nm-device-wireguard.h', - 'nm-device-wpan.h', - 'nm-device.h', - 'nm-dhcp-config.h', - 'nm-ethtool-utils.h', - 'nm-ip-config.h', - 'nm-object.h', - 'nm-remote-connection.h', - 'nm-secret-agent-old.h', - 'nm-types.h', - 'nm-vpn-connection.h', - 'nm-vpn-editor.h', - 'nm-vpn-plugin-old.h', - 'nm-vpn-service-plugin.h', - 'nm-wifi-p2p-peer.h', - 'nm-wimax-nsp.h', -) - -install_headers( - libnm_core_headers + libnm_headers + [nm_version_macro_header], - subdir: libnm_name, -) - -libnm_enum_sources = gnome.mkenums( - 'nm-enum-types', - sources: libnm_headers + [nm_version_macro_header], - identifier_prefix: nm_id_prefix, - c_template: 'nm-enum-types.c.template', - h_template: 'nm-enum-types.h.template', - install_header: true, - install_dir: libnm_pkgincludedir, -) - -libnm_sources = files( +libnm_client_impl_sources = files( 'nm-access-point.c', 'nm-active-connection.c', 'nm-checkpoint.c', @@ -137,9 +68,9 @@ libnm_sources = files( 'nm-wimax-nsp.c', ) -libnm_static = static_library( - 'nm-static', - sources: libnm_sources + libnm_enum_sources, +libnm_client_impl = static_library( + 'nm-client-impl', + sources: libnm_client_impl_sources + libnm_client_public_enum_sources, dependencies: [ libnmdbus_dep, libnm_core_aux_intern_dep, @@ -157,7 +88,7 @@ libnm = shared_library( version: libnm_version, dependencies: libnm_nm_default_dep, link_whole: [ - libnm_static, + libnm_client_impl, libnm_core_impl, libnmdbus, libnm_log_null, @@ -170,8 +101,8 @@ libnm = shared_library( ) libnm_dep = declare_dependency( - sources: libnm_enum_sources[1], - include_directories: libnm_inc, + sources: libnm_client_public_enum_sources[1], + include_directories: libnm_client_public_inc, link_with: libnm, ) @@ -189,17 +120,19 @@ pkg.generate( ], ) -test( - 'check-local-exports-' + libnm_name, - check_exports, - args: [libnm.full_path(), linker_script], -) +if enable_tests + test( + 'check-local-exports-' + libnm_name, + check_exports, + args: [libnm.full_path(), linker_script], + ) +endif if enable_introspection libnm_gir = gnome.generate_gir( libnm, - sources: libnm_core_settings_sources + libnm_core_impl_sources + libnm_core_public_enum_sources + libnm_core_headers + libnm_sources + libnm_headers + libnm_enum_sources + [nm_version_macro_header], + sources: libnm_core_settings_sources + libnm_core_impl_sources + libnm_core_public_enum_sources + libnm_core_headers + libnm_client_impl_sources + libnm_client_headers + libnm_client_public_enum_sources + [nm_version_macro_header], includes: 'Gio-2.0', include_directories: [ libnm_core_public_inc, @@ -297,23 +230,3 @@ if enable_introspection ) endif - -libnm_libnm_aux = static_library( - 'nm-libnm-aux', - sources: files( - 'nm-libnm-aux/nm-libnm-aux.c', - ), - dependencies: [ - libnm_core_aux_intern_dep, - libnm_dep, - ], -) - -libnm_libnm_aux_dep = declare_dependency( - include_directories: [shared_inc], - link_with: [libnm_libnm_aux], -) - -if enable_tests - subdir('tests') -endif diff --git a/libnm/nm-access-point.c b/src/libnm-client-impl/nm-access-point.c index abe1a5538a..3d12aa4588 100644 --- a/libnm/nm-access-point.c +++ b/src/libnm-client-impl/nm-access-point.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-access-point.h" diff --git a/libnm/nm-active-connection.c b/src/libnm-client-impl/nm-active-connection.c index 60c68f3478..aa96219c04 100644 --- a/libnm/nm-active-connection.c +++ b/src/libnm-client-impl/nm-active-connection.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-active-connection.h" diff --git a/libnm/nm-checkpoint.c b/src/libnm-client-impl/nm-checkpoint.c index 951e66229f..c1f6b09227 100644 --- a/libnm/nm-checkpoint.c +++ b/src/libnm-client-impl/nm-checkpoint.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-checkpoint.h" diff --git a/libnm/nm-client.c b/src/libnm-client-impl/nm-client.c index fafc72d0d5..211bc21a84 100644 --- a/libnm/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-client.h" diff --git a/libnm/nm-dbus-helpers.c b/src/libnm-client-impl/nm-dbus-helpers.c index b146185575..3b5f9ff88a 100644 --- a/libnm/nm-dbus-helpers.c +++ b/src/libnm-client-impl/nm-dbus-helpers.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dbus-helpers.h" diff --git a/libnm/nm-dbus-helpers.h b/src/libnm-client-impl/nm-dbus-helpers.h index e519f7330b..e519f7330b 100644 --- a/libnm/nm-dbus-helpers.h +++ b/src/libnm-client-impl/nm-dbus-helpers.h diff --git a/libnm/nm-default-libnm.h b/src/libnm-client-impl/nm-default-libnm.h index 5b3a8e5179..5b3a8e5179 100644 --- a/libnm/nm-default-libnm.h +++ b/src/libnm-client-impl/nm-default-libnm.h diff --git a/libnm/nm-device-6lowpan.c b/src/libnm-client-impl/nm-device-6lowpan.c index ccb8ae0103..e03b4a0037 100644 --- a/libnm/nm-device-6lowpan.c +++ b/src/libnm-client-impl/nm-device-6lowpan.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-6lowpan.h" diff --git a/libnm/nm-device-adsl.c b/src/libnm-client-impl/nm-device-adsl.c index ff64cd3a54..65f875454f 100644 --- a/libnm/nm-device-adsl.c +++ b/src/libnm-client-impl/nm-device-adsl.c @@ -4,7 +4,7 @@ * Copyright (C) 2009 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-adsl.h" diff --git a/libnm/nm-device-bond.c b/src/libnm-client-impl/nm-device-bond.c index caf9cdcaef..48dfd9b2b2 100644 --- a/libnm/nm-device-bond.c +++ b/src/libnm-client-impl/nm-device-bond.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-setting-bond.h" diff --git a/libnm/nm-device-bridge.c b/src/libnm-client-impl/nm-device-bridge.c index 2a7226e92b..9bc41ac896 100644 --- a/libnm/nm-device-bridge.c +++ b/src/libnm-client-impl/nm-device-bridge.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-setting-bridge.h" diff --git a/libnm/nm-device-bt.c b/src/libnm-client-impl/nm-device-bt.c index 55f0a942a2..074ada6622 100644 --- a/libnm/nm-device-bt.c +++ b/src/libnm-client-impl/nm-device-bt.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-bt.h" diff --git a/libnm/nm-device-dummy.c b/src/libnm-client-impl/nm-device-dummy.c index 6b92810230..d56f6cda85 100644 --- a/libnm/nm-device-dummy.c +++ b/src/libnm-client-impl/nm-device-dummy.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-dummy.h" diff --git a/libnm/nm-device-ethernet.c b/src/libnm-client-impl/nm-device-ethernet.c index b7173c806b..b32decde14 100644 --- a/libnm/nm-device-ethernet.c +++ b/src/libnm-client-impl/nm-device-ethernet.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ethernet.h" diff --git a/libnm/nm-device-generic.c b/src/libnm-client-impl/nm-device-generic.c index ebc73a7e9c..9dcc8c911d 100644 --- a/libnm/nm-device-generic.c +++ b/src/libnm-client-impl/nm-device-generic.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-generic.h" diff --git a/libnm/nm-device-infiniband.c b/src/libnm-client-impl/nm-device-infiniband.c index 820a4ab438..7e4cc054c0 100644 --- a/libnm/nm-device-infiniband.c +++ b/src/libnm-client-impl/nm-device-infiniband.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-infiniband.h" diff --git a/libnm/nm-device-ip-tunnel.c b/src/libnm-client-impl/nm-device-ip-tunnel.c index c370f79e20..14c7228209 100644 --- a/libnm/nm-device-ip-tunnel.c +++ b/src/libnm-client-impl/nm-device-ip-tunnel.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ip-tunnel.h" diff --git a/libnm/nm-device-macsec.c b/src/libnm-client-impl/nm-device-macsec.c index 3d6e1d388d..faa5be7e74 100644 --- a/libnm/nm-device-macsec.c +++ b/src/libnm-client-impl/nm-device-macsec.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-macsec.h" diff --git a/libnm/nm-device-macvlan.c b/src/libnm-client-impl/nm-device-macvlan.c index 773de99009..ddb36bab2b 100644 --- a/libnm/nm-device-macvlan.c +++ b/src/libnm-client-impl/nm-device-macvlan.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-setting-macvlan.h" diff --git a/libnm/nm-device-modem.c b/src/libnm-client-impl/nm-device-modem.c index 51b49feabe..57e09bc65d 100644 --- a/libnm/nm-device-modem.c +++ b/src/libnm-client-impl/nm-device-modem.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-modem.h" diff --git a/libnm/nm-device-olpc-mesh.c b/src/libnm-client-impl/nm-device-olpc-mesh.c index 697b3381e0..779990aad8 100644 --- a/libnm/nm-device-olpc-mesh.c +++ b/src/libnm-client-impl/nm-device-olpc-mesh.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-olpc-mesh.h" diff --git a/libnm/nm-device-ovs-bridge.c b/src/libnm-client-impl/nm-device-ovs-bridge.c index c95355161e..898a41fab5 100644 --- a/libnm/nm-device-ovs-bridge.c +++ b/src/libnm-client-impl/nm-device-ovs-bridge.c @@ -3,7 +3,7 @@ * Copyright (C) 2017, 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ovs-bridge.h" diff --git a/libnm/nm-device-ovs-interface.c b/src/libnm-client-impl/nm-device-ovs-interface.c index 1c757a5b49..8632057a91 100644 --- a/libnm/nm-device-ovs-interface.c +++ b/src/libnm-client-impl/nm-device-ovs-interface.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ovs-interface.h" diff --git a/libnm/nm-device-ovs-port.c b/src/libnm-client-impl/nm-device-ovs-port.c index b52fdf9b21..db30e1c7c8 100644 --- a/libnm/nm-device-ovs-port.c +++ b/src/libnm-client-impl/nm-device-ovs-port.c @@ -3,7 +3,7 @@ * Copyright (C) 2017, 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ovs-port.h" diff --git a/libnm/nm-device-ppp.c b/src/libnm-client-impl/nm-device-ppp.c index a1c1f74184..1dd275cf79 100644 --- a/libnm/nm-device-ppp.c +++ b/src/libnm-client-impl/nm-device-ppp.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-ppp.h" diff --git a/libnm/nm-device-private.h b/src/libnm-client-impl/nm-device-private.h index e69de29bb2..e69de29bb2 100644 --- a/libnm/nm-device-private.h +++ b/src/libnm-client-impl/nm-device-private.h diff --git a/libnm/nm-device-team.c b/src/libnm-client-impl/nm-device-team.c index 4af9f8e60a..ca29c9f7b9 100644 --- a/libnm/nm-device-team.c +++ b/src/libnm-client-impl/nm-device-team.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-team.h" diff --git a/libnm/nm-device-tun.c b/src/libnm-client-impl/nm-device-tun.c index 0445da9aa4..8b8ca0fe29 100644 --- a/libnm/nm-device-tun.c +++ b/src/libnm-client-impl/nm-device-tun.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-tun.h" diff --git a/libnm/nm-device-veth.c b/src/libnm-client-impl/nm-device-veth.c index 9a9f768011..f35f09b198 100644 --- a/libnm/nm-device-veth.c +++ b/src/libnm-client-impl/nm-device-veth.c @@ -3,7 +3,7 @@ * Copyright (C) 2020 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-veth.h" diff --git a/libnm/nm-device-vlan.c b/src/libnm-client-impl/nm-device-vlan.c index e7419b23ee..4c2a435bd5 100644 --- a/libnm/nm-device-vlan.c +++ b/src/libnm-client-impl/nm-device-vlan.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-vlan.h" diff --git a/libnm/nm-device-vrf.c b/src/libnm-client-impl/nm-device-vrf.c index 73f2770723..bbf37810c5 100644 --- a/libnm/nm-device-vrf.c +++ b/src/libnm-client-impl/nm-device-vrf.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-vrf.h" diff --git a/libnm/nm-device-vxlan.c b/src/libnm-client-impl/nm-device-vxlan.c index 36d95f91f3..6fac3b715e 100644 --- a/libnm/nm-device-vxlan.c +++ b/src/libnm-client-impl/nm-device-vxlan.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-vxlan.h" diff --git a/libnm/nm-device-wifi-p2p.c b/src/libnm-client-impl/nm-device-wifi-p2p.c index adc86a8d0d..05c430f7d3 100644 --- a/libnm/nm-device-wifi-p2p.c +++ b/src/libnm-client-impl/nm-device-wifi-p2p.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 - 2019 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wifi-p2p.h" diff --git a/libnm/nm-device-wifi.c b/src/libnm-client-impl/nm-device-wifi.c index 55951ba47d..84c3a069dc 100644 --- a/libnm/nm-device-wifi.c +++ b/src/libnm-client-impl/nm-device-wifi.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wifi.h" diff --git a/libnm/nm-device-wimax.c b/src/libnm-client-impl/nm-device-wimax.c index 9b42354c7a..b9db20bb67 100644 --- a/libnm/nm-device-wimax.c +++ b/src/libnm-client-impl/nm-device-wimax.c @@ -4,7 +4,7 @@ * Copyright (C) 2009 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wimax.h" diff --git a/libnm/nm-device-wireguard.c b/src/libnm-client-impl/nm-device-wireguard.c index a4baec4f17..cbbd904bbc 100644 --- a/libnm/nm-device-wireguard.c +++ b/src/libnm-client-impl/nm-device-wireguard.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Javier Arteaga <jarteaga@jbeta.is> */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wireguard.h" diff --git a/libnm/nm-device-wpan.c b/src/libnm-client-impl/nm-device-wpan.c index 7218a8c604..30c1ea16ea 100644 --- a/libnm/nm-device-wpan.c +++ b/src/libnm-client-impl/nm-device-wpan.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk> */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device-wpan.h" diff --git a/libnm/nm-device.c b/src/libnm-client-impl/nm-device.c index f825f84532..8632b0c316 100644 --- a/libnm/nm-device.c +++ b/src/libnm-client-impl/nm-device.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-device.h" diff --git a/libnm/nm-dhcp-config.c b/src/libnm-client-impl/nm-dhcp-config.c index ec7da6ded0..c7f9a87a07 100644 --- a/libnm/nm-dhcp-config.c +++ b/src/libnm-client-impl/nm-dhcp-config.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dhcp-config.h" diff --git a/libnm/nm-dhcp4-config.c b/src/libnm-client-impl/nm-dhcp4-config.c index 25219d45f3..8ce8415f71 100644 --- a/libnm/nm-dhcp4-config.c +++ b/src/libnm-client-impl/nm-dhcp4-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dhcp4-config.h" diff --git a/libnm/nm-dhcp4-config.h b/src/libnm-client-impl/nm-dhcp4-config.h index d0ea2b4604..d0ea2b4604 100644 --- a/libnm/nm-dhcp4-config.h +++ b/src/libnm-client-impl/nm-dhcp4-config.h diff --git a/libnm/nm-dhcp6-config.c b/src/libnm-client-impl/nm-dhcp6-config.c index 2574b36cfd..7db0264075 100644 --- a/libnm/nm-dhcp6-config.c +++ b/src/libnm-client-impl/nm-dhcp6-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dhcp6-config.h" diff --git a/libnm/nm-dhcp6-config.h b/src/libnm-client-impl/nm-dhcp6-config.h index 253594e654..253594e654 100644 --- a/libnm/nm-dhcp6-config.h +++ b/src/libnm-client-impl/nm-dhcp6-config.h diff --git a/libnm/nm-dns-manager.c b/src/libnm-client-impl/nm-dns-manager.c index 9c5f0cf0f7..f7c564ffeb 100644 --- a/libnm/nm-dns-manager.c +++ b/src/libnm-client-impl/nm-dns-manager.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-dns-manager.h" diff --git a/libnm/nm-dns-manager.h b/src/libnm-client-impl/nm-dns-manager.h index 8053b243d4..8053b243d4 100644 --- a/libnm/nm-dns-manager.h +++ b/src/libnm-client-impl/nm-dns-manager.h diff --git a/libnm/nm-ip-config.c b/src/libnm-client-impl/nm-ip-config.c index 4c336213c9..099dd088fa 100644 --- a/libnm/nm-ip-config.c +++ b/src/libnm-client-impl/nm-ip-config.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 - 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-ip-config.h" diff --git a/libnm/nm-ip4-config.c b/src/libnm-client-impl/nm-ip4-config.c index 6c4a4ab3ad..0f2fdb0494 100644 --- a/libnm/nm-ip4-config.c +++ b/src/libnm-client-impl/nm-ip4-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-ip4-config.h" diff --git a/libnm/nm-ip4-config.h b/src/libnm-client-impl/nm-ip4-config.h index b9297dc08b..b9297dc08b 100644 --- a/libnm/nm-ip4-config.h +++ b/src/libnm-client-impl/nm-ip4-config.h diff --git a/libnm/nm-ip6-config.c b/src/libnm-client-impl/nm-ip6-config.c index 19c869c6f6..78e0b7dcb2 100644 --- a/libnm/nm-ip6-config.c +++ b/src/libnm-client-impl/nm-ip6-config.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-ip6-config.h" diff --git a/libnm/nm-ip6-config.h b/src/libnm-client-impl/nm-ip6-config.h index 0c7c2a9f0a..0c7c2a9f0a 100644 --- a/libnm/nm-ip6-config.h +++ b/src/libnm-client-impl/nm-ip6-config.h diff --git a/libnm/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c index 27ff704136..fe1b911b68 100644 --- a/libnm/nm-libnm-utils.c +++ b/src/libnm-client-impl/nm-libnm-utils.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2018 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-libnm-utils.h" diff --git a/libnm/nm-libnm-utils.h b/src/libnm-client-impl/nm-libnm-utils.h index 3fd3b679e8..3fd3b679e8 100644 --- a/libnm/nm-libnm-utils.h +++ b/src/libnm-client-impl/nm-libnm-utils.h diff --git a/libnm/nm-object-private.h b/src/libnm-client-impl/nm-object-private.h index 9f78304d49..9f78304d49 100644 --- a/libnm/nm-object-private.h +++ b/src/libnm-client-impl/nm-object-private.h diff --git a/libnm/nm-object.c b/src/libnm-client-impl/nm-object.c index eaf178e7db..2e7de8c266 100644 --- a/libnm/nm-object.c +++ b/src/libnm-client-impl/nm-object.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-object.h" diff --git a/libnm/nm-remote-connection-private.h b/src/libnm-client-impl/nm-remote-connection-private.h index 3ca934bf16..3ca934bf16 100644 --- a/libnm/nm-remote-connection-private.h +++ b/src/libnm-client-impl/nm-remote-connection-private.h diff --git a/libnm/nm-remote-connection.c b/src/libnm-client-impl/nm-remote-connection.c index b2686010de..007da3aa87 100644 --- a/libnm/nm-remote-connection.c +++ b/src/libnm-client-impl/nm-remote-connection.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-remote-connection.h" diff --git a/libnm/nm-secret-agent-old.c b/src/libnm-client-impl/nm-secret-agent-old.c index 54caa8631d..881dfd54ce 100644 --- a/libnm/nm-secret-agent-old.c +++ b/src/libnm-client-impl/nm-secret-agent-old.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-secret-agent-old.h" diff --git a/libnm/nm-vpn-connection.c b/src/libnm-client-impl/nm-vpn-connection.c index cdbaefc032..fb0615328a 100644 --- a/libnm/nm-vpn-connection.c +++ b/src/libnm-client-impl/nm-vpn-connection.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-vpn-connection.h" diff --git a/libnm/nm-vpn-editor.c b/src/libnm-client-impl/nm-vpn-editor.c index e326958881..57aa8b02ba 100644 --- a/libnm/nm-vpn-editor.c +++ b/src/libnm-client-impl/nm-vpn-editor.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-vpn-editor.h" diff --git a/libnm/nm-vpn-plugin-old.c b/src/libnm-client-impl/nm-vpn-plugin-old.c index 2ff83efa3c..be4e1cf292 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/src/libnm-client-impl/nm-vpn-plugin-old.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2008 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-vpn-plugin-old.h" diff --git a/libnm/nm-vpn-service-plugin.c b/src/libnm-client-impl/nm-vpn-service-plugin.c index a3da796fb7..8262981d70 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/src/libnm-client-impl/nm-vpn-service-plugin.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 - 2015 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-vpn-service-plugin.h" diff --git a/libnm/nm-wifi-p2p-peer.c b/src/libnm-client-impl/nm-wifi-p2p-peer.c index cab4648ecf..1d6b7c9541 100644 --- a/libnm/nm-wifi-p2p-peer.c +++ b/src/libnm-client-impl/nm-wifi-p2p-peer.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 - 2019 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-wifi-p2p-peer.h" diff --git a/libnm/nm-wimax-nsp.c b/src/libnm-client-impl/nm-wimax-nsp.c index 421fe9e7ab..62181d6bc6 100644 --- a/libnm/nm-wimax-nsp.c +++ b/src/libnm-client-impl/nm-wimax-nsp.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-wimax-nsp.h" diff --git a/libnm/tests/meson.build b/src/libnm-client-impl/tests/meson.build index d2e5fe7ef6..4a58b4b5cd 100644 --- a/libnm/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -13,14 +13,17 @@ foreach test_unit: test_units [ test_unit + '.c', nm_test_utils_impl_source, - libnm_enum_sources[1], + libnm_client_public_enum_sources[1], + ], + include_directories: [ + libnm_client_public_inc, ], dependencies: [ libnm_core_impl_dep_link, libnm_nm_default_dep, ], link_with: [ - libnm_static, + libnm_client_impl, libnm_base, ], ) @@ -36,7 +39,7 @@ endforeach # just test, that we can build "nm-vpn-plugin-utils.c" libnm_vpn_plugin_utils_test = static_library( 'nm-vpn-plugin-utils-test', - sources: nm_vpn_plugin_utils_source + [libnm_enum_sources[1]], - include_directories: libnm_inc, + sources: nm_vpn_plugin_utils_source + [libnm_client_public_enum_sources[1]], + include_directories: libnm_client_public_inc, dependencies: libnm_nm_default_dep, ) diff --git a/libnm/tests/test-libnm.c b/src/libnm-client-impl/tests/test-libnm.c index 0f590a04c4..fab36cb416 100644 --- a/libnm/tests/test-libnm.c +++ b/src/libnm-client-impl/tests/test-libnm.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #if defined(HAVE_DECL_MEMFD_CREATE) && HAVE_DECL_MEMFD_CREATE #include <linux/memfd.h> @@ -14,12 +14,12 @@ #include "NetworkManager.h" #include "nm-access-point.h" #include "nm-checkpoint.h" -#include "nm-dhcp4-config.h" -#include "nm-dhcp6-config.h" -#include "nm-dns-manager.h" -#include "nm-ip4-config.h" -#include "nm-ip6-config.h" -#include "nm-libnm-utils.h" +#include "libnm-client-impl/nm-dhcp4-config.h" +#include "libnm-client-impl/nm-dhcp6-config.h" +#include "libnm-client-impl/nm-dns-manager.h" +#include "libnm-client-impl/nm-ip4-config.h" +#include "libnm-client-impl/nm-ip6-config.h" +#include "libnm-client-impl/nm-libnm-utils.h" #include "nm-object.h" #include "nm-vpn-service-plugin.h" #include "libnm-core-aux-intern/nm-libnm-core-utils.h" diff --git a/libnm/tests/test-nm-client.c b/src/libnm-client-impl/tests/test-nm-client.c index 5452c623b2..6085f3c53c 100644 --- a/libnm/tests/test-nm-client.c +++ b/src/libnm-client-impl/tests/test-nm-client.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include <sys/types.h> #include <signal.h> diff --git a/libnm/tests/test-remote-settings-client.c b/src/libnm-client-impl/tests/test-remote-settings-client.c index 93df340922..a9a5ccd9aa 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/src/libnm-client-impl/tests/test-remote-settings-client.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2011 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include <sys/types.h> #include <signal.h> diff --git a/libnm/tests/test-secret-agent.c b/src/libnm-client-impl/tests/test-secret-agent.c index 08c77f8c87..d3cfe80890 100644 --- a/libnm/tests/test-secret-agent.c +++ b/src/libnm-client-impl/tests/test-secret-agent.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 - 2014 Red Hat, Inc. */ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include <sys/types.h> #include <signal.h> diff --git a/libnm/NetworkManager.h b/src/libnm-client-public/NetworkManager.h index f9cc856555..f9cc856555 100644 --- a/libnm/NetworkManager.h +++ b/src/libnm-client-public/NetworkManager.h diff --git a/src/libnm-client-public/meson.build b/src/libnm-client-public/meson.build new file mode 100644 index 0000000000..1a1e612255 --- /dev/null +++ b/src/libnm-client-public/meson.build @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_client_public_inc = include_directories('.') + +libnm_client_headers = files( + 'NetworkManager.h', + 'nm-access-point.h', + 'nm-active-connection.h', + 'nm-autoptr.h', + 'nm-checkpoint.h', + 'nm-client.h', + 'nm-device-6lowpan.h', + 'nm-device-adsl.h', + 'nm-device-bond.h', + 'nm-device-bridge.h', + 'nm-device-bt.h', + 'nm-device-dummy.h', + 'nm-device-ethernet.h', + 'nm-device-generic.h', + 'nm-device-infiniband.h', + 'nm-device-ip-tunnel.h', + 'nm-device-macsec.h', + 'nm-device-macvlan.h', + 'nm-device-modem.h', + 'nm-device-olpc-mesh.h', + 'nm-device-ovs-bridge.h', + 'nm-device-ovs-interface.h', + 'nm-device-ovs-port.h', + 'nm-device-ppp.h', + 'nm-device-team.h', + 'nm-device-tun.h', + 'nm-device-veth.h', + 'nm-device-vlan.h', + 'nm-device-vrf.h', + 'nm-device-vxlan.h', + 'nm-device-wifi-p2p.h', + 'nm-device-wifi.h', + 'nm-device-wimax.h', + 'nm-device-wireguard.h', + 'nm-device-wpan.h', + 'nm-device.h', + 'nm-dhcp-config.h', + 'nm-ethtool-utils.h', + 'nm-ip-config.h', + 'nm-object.h', + 'nm-remote-connection.h', + 'nm-secret-agent-old.h', + 'nm-types.h', + 'nm-vpn-connection.h', + 'nm-vpn-editor.h', + 'nm-vpn-plugin-old.h', + 'nm-vpn-service-plugin.h', + 'nm-wifi-p2p-peer.h', + 'nm-wimax-nsp.h', +) + +libnm_client_public_enum_sources = gnome.mkenums( + 'nm-enum-types', + sources: libnm_client_headers + [nm_version_macro_header], + identifier_prefix: nm_id_prefix, + c_template: 'nm-enum-types.c.template', + h_template: 'nm-enum-types.h.template', + install_header: true, + install_dir: libnm_pkgincludedir, +) + +install_headers( + libnm_core_headers + libnm_client_headers + [nm_version_macro_header], + subdir: libnm_name, +) + +libnm_client_public_dep = declare_dependency( + sources: libnm_client_public_enum_sources[1], + include_directories: [ + libnm_client_public_inc, + src_inc, + top_inc, + ], + dependencies: [ + libnm_core_public_dep, + glib_dep, + ], +) diff --git a/libnm/nm-access-point.h b/src/libnm-client-public/nm-access-point.h index 0460ea0a73..0460ea0a73 100644 --- a/libnm/nm-access-point.h +++ b/src/libnm-client-public/nm-access-point.h diff --git a/libnm/nm-active-connection.h b/src/libnm-client-public/nm-active-connection.h index 44b715c7ee..44b715c7ee 100644 --- a/libnm/nm-active-connection.h +++ b/src/libnm-client-public/nm-active-connection.h diff --git a/libnm/nm-autoptr.h b/src/libnm-client-public/nm-autoptr.h index f37e2cfc44..f37e2cfc44 100644 --- a/libnm/nm-autoptr.h +++ b/src/libnm-client-public/nm-autoptr.h diff --git a/libnm/nm-checkpoint.h b/src/libnm-client-public/nm-checkpoint.h index 3bc28f6f06..3bc28f6f06 100644 --- a/libnm/nm-checkpoint.h +++ b/src/libnm-client-public/nm-checkpoint.h diff --git a/libnm/nm-client.h b/src/libnm-client-public/nm-client.h index 5a9770881e..5a9770881e 100644 --- a/libnm/nm-client.h +++ b/src/libnm-client-public/nm-client.h diff --git a/libnm/nm-device-6lowpan.h b/src/libnm-client-public/nm-device-6lowpan.h index d46e6db457..d46e6db457 100644 --- a/libnm/nm-device-6lowpan.h +++ b/src/libnm-client-public/nm-device-6lowpan.h diff --git a/libnm/nm-device-adsl.h b/src/libnm-client-public/nm-device-adsl.h index 92eaf369f2..92eaf369f2 100644 --- a/libnm/nm-device-adsl.h +++ b/src/libnm-client-public/nm-device-adsl.h diff --git a/libnm/nm-device-bond.h b/src/libnm-client-public/nm-device-bond.h index 91c023a4b5..91c023a4b5 100644 --- a/libnm/nm-device-bond.h +++ b/src/libnm-client-public/nm-device-bond.h diff --git a/libnm/nm-device-bridge.h b/src/libnm-client-public/nm-device-bridge.h index a6c50658a0..a6c50658a0 100644 --- a/libnm/nm-device-bridge.h +++ b/src/libnm-client-public/nm-device-bridge.h diff --git a/libnm/nm-device-bt.h b/src/libnm-client-public/nm-device-bt.h index a7cfc79682..a7cfc79682 100644 --- a/libnm/nm-device-bt.h +++ b/src/libnm-client-public/nm-device-bt.h diff --git a/libnm/nm-device-dummy.h b/src/libnm-client-public/nm-device-dummy.h index ad34b65e55..ad34b65e55 100644 --- a/libnm/nm-device-dummy.h +++ b/src/libnm-client-public/nm-device-dummy.h diff --git a/libnm/nm-device-ethernet.h b/src/libnm-client-public/nm-device-ethernet.h index 877930e6ad..877930e6ad 100644 --- a/libnm/nm-device-ethernet.h +++ b/src/libnm-client-public/nm-device-ethernet.h diff --git a/libnm/nm-device-generic.h b/src/libnm-client-public/nm-device-generic.h index 5c1f308418..5c1f308418 100644 --- a/libnm/nm-device-generic.h +++ b/src/libnm-client-public/nm-device-generic.h diff --git a/libnm/nm-device-infiniband.h b/src/libnm-client-public/nm-device-infiniband.h index be9a26e50f..be9a26e50f 100644 --- a/libnm/nm-device-infiniband.h +++ b/src/libnm-client-public/nm-device-infiniband.h diff --git a/libnm/nm-device-ip-tunnel.h b/src/libnm-client-public/nm-device-ip-tunnel.h index 0d9c3e55a1..0d9c3e55a1 100644 --- a/libnm/nm-device-ip-tunnel.h +++ b/src/libnm-client-public/nm-device-ip-tunnel.h diff --git a/libnm/nm-device-macsec.h b/src/libnm-client-public/nm-device-macsec.h index 5a036601e8..5a036601e8 100644 --- a/libnm/nm-device-macsec.h +++ b/src/libnm-client-public/nm-device-macsec.h diff --git a/libnm/nm-device-macvlan.h b/src/libnm-client-public/nm-device-macvlan.h index b8d2706616..b8d2706616 100644 --- a/libnm/nm-device-macvlan.h +++ b/src/libnm-client-public/nm-device-macvlan.h diff --git a/libnm/nm-device-modem.h b/src/libnm-client-public/nm-device-modem.h index eced137aa8..eced137aa8 100644 --- a/libnm/nm-device-modem.h +++ b/src/libnm-client-public/nm-device-modem.h diff --git a/libnm/nm-device-olpc-mesh.h b/src/libnm-client-public/nm-device-olpc-mesh.h index d8b835fac8..d8b835fac8 100644 --- a/libnm/nm-device-olpc-mesh.h +++ b/src/libnm-client-public/nm-device-olpc-mesh.h diff --git a/libnm/nm-device-ovs-bridge.h b/src/libnm-client-public/nm-device-ovs-bridge.h index 50754e1109..50754e1109 100644 --- a/libnm/nm-device-ovs-bridge.h +++ b/src/libnm-client-public/nm-device-ovs-bridge.h diff --git a/libnm/nm-device-ovs-interface.h b/src/libnm-client-public/nm-device-ovs-interface.h index 6767ad4a0a..6767ad4a0a 100644 --- a/libnm/nm-device-ovs-interface.h +++ b/src/libnm-client-public/nm-device-ovs-interface.h diff --git a/libnm/nm-device-ovs-port.h b/src/libnm-client-public/nm-device-ovs-port.h index 1f69641bcc..1f69641bcc 100644 --- a/libnm/nm-device-ovs-port.h +++ b/src/libnm-client-public/nm-device-ovs-port.h diff --git a/libnm/nm-device-ppp.h b/src/libnm-client-public/nm-device-ppp.h index 7bd282d709..7bd282d709 100644 --- a/libnm/nm-device-ppp.h +++ b/src/libnm-client-public/nm-device-ppp.h diff --git a/libnm/nm-device-team.h b/src/libnm-client-public/nm-device-team.h index 921353b699..921353b699 100644 --- a/libnm/nm-device-team.h +++ b/src/libnm-client-public/nm-device-team.h diff --git a/libnm/nm-device-tun.h b/src/libnm-client-public/nm-device-tun.h index ee7342de96..ee7342de96 100644 --- a/libnm/nm-device-tun.h +++ b/src/libnm-client-public/nm-device-tun.h diff --git a/libnm/nm-device-veth.h b/src/libnm-client-public/nm-device-veth.h index 689762a714..689762a714 100644 --- a/libnm/nm-device-veth.h +++ b/src/libnm-client-public/nm-device-veth.h diff --git a/libnm/nm-device-vlan.h b/src/libnm-client-public/nm-device-vlan.h index 814305095a..814305095a 100644 --- a/libnm/nm-device-vlan.h +++ b/src/libnm-client-public/nm-device-vlan.h diff --git a/libnm/nm-device-vrf.h b/src/libnm-client-public/nm-device-vrf.h index f835dd2f6c..f835dd2f6c 100644 --- a/libnm/nm-device-vrf.h +++ b/src/libnm-client-public/nm-device-vrf.h diff --git a/libnm/nm-device-vxlan.h b/src/libnm-client-public/nm-device-vxlan.h index 9ef5eb2def..9ef5eb2def 100644 --- a/libnm/nm-device-vxlan.h +++ b/src/libnm-client-public/nm-device-vxlan.h diff --git a/libnm/nm-device-wifi-p2p.h b/src/libnm-client-public/nm-device-wifi-p2p.h index 374ef4bda2..374ef4bda2 100644 --- a/libnm/nm-device-wifi-p2p.h +++ b/src/libnm-client-public/nm-device-wifi-p2p.h diff --git a/libnm/nm-device-wifi.h b/src/libnm-client-public/nm-device-wifi.h index bf712bbc7f..bf712bbc7f 100644 --- a/libnm/nm-device-wifi.h +++ b/src/libnm-client-public/nm-device-wifi.h diff --git a/libnm/nm-device-wimax.h b/src/libnm-client-public/nm-device-wimax.h index 8a0fd901c5..8a0fd901c5 100644 --- a/libnm/nm-device-wimax.h +++ b/src/libnm-client-public/nm-device-wimax.h diff --git a/libnm/nm-device-wireguard.h b/src/libnm-client-public/nm-device-wireguard.h index f54695ee6c..f54695ee6c 100644 --- a/libnm/nm-device-wireguard.h +++ b/src/libnm-client-public/nm-device-wireguard.h diff --git a/libnm/nm-device-wpan.h b/src/libnm-client-public/nm-device-wpan.h index 7d50fd9eb0..7d50fd9eb0 100644 --- a/libnm/nm-device-wpan.h +++ b/src/libnm-client-public/nm-device-wpan.h diff --git a/libnm/nm-device.h b/src/libnm-client-public/nm-device.h index 0ee2c93bb4..0ee2c93bb4 100644 --- a/libnm/nm-device.h +++ b/src/libnm-client-public/nm-device.h diff --git a/libnm/nm-dhcp-config.h b/src/libnm-client-public/nm-dhcp-config.h index 7663fb9af3..7663fb9af3 100644 --- a/libnm/nm-dhcp-config.h +++ b/src/libnm-client-public/nm-dhcp-config.h diff --git a/libnm/nm-enum-types.c.template b/src/libnm-client-public/nm-enum-types.c.template index 396f61526c..c2627f447d 100644 --- a/libnm/nm-enum-types.c.template +++ b/src/libnm-client-public/nm-enum-types.c.template @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#include "libnm/nm-default-libnm.h" +#include "libnm-client-impl/nm-default-libnm.h" #include "nm-enum-types.h" diff --git a/libnm/nm-enum-types.h.template b/src/libnm-client-public/nm-enum-types.h.template index bc70af134a..bc70af134a 100644 --- a/libnm/nm-enum-types.h.template +++ b/src/libnm-client-public/nm-enum-types.h.template diff --git a/libnm/nm-ethtool-utils.h b/src/libnm-client-public/nm-ethtool-utils.h index d422724bab..d422724bab 100644 --- a/libnm/nm-ethtool-utils.h +++ b/src/libnm-client-public/nm-ethtool-utils.h diff --git a/libnm/nm-ip-config.h b/src/libnm-client-public/nm-ip-config.h index bdfebb6a57..bdfebb6a57 100644 --- a/libnm/nm-ip-config.h +++ b/src/libnm-client-public/nm-ip-config.h diff --git a/libnm/nm-object.h b/src/libnm-client-public/nm-object.h index 7b4a323294..7b4a323294 100644 --- a/libnm/nm-object.h +++ b/src/libnm-client-public/nm-object.h diff --git a/libnm/nm-remote-connection.h b/src/libnm-client-public/nm-remote-connection.h index e29bf07318..e29bf07318 100644 --- a/libnm/nm-remote-connection.h +++ b/src/libnm-client-public/nm-remote-connection.h diff --git a/libnm/nm-secret-agent-old.h b/src/libnm-client-public/nm-secret-agent-old.h index cc33c14ae4..cc33c14ae4 100644 --- a/libnm/nm-secret-agent-old.h +++ b/src/libnm-client-public/nm-secret-agent-old.h diff --git a/libnm/nm-types.h b/src/libnm-client-public/nm-types.h index 81ffe790d5..81ffe790d5 100644 --- a/libnm/nm-types.h +++ b/src/libnm-client-public/nm-types.h diff --git a/libnm/nm-vpn-connection.h b/src/libnm-client-public/nm-vpn-connection.h index aac259d5bb..aac259d5bb 100644 --- a/libnm/nm-vpn-connection.h +++ b/src/libnm-client-public/nm-vpn-connection.h diff --git a/libnm/nm-vpn-editor.h b/src/libnm-client-public/nm-vpn-editor.h index 8cd7805f4d..8cd7805f4d 100644 --- a/libnm/nm-vpn-editor.h +++ b/src/libnm-client-public/nm-vpn-editor.h diff --git a/libnm/nm-vpn-plugin-old.h b/src/libnm-client-public/nm-vpn-plugin-old.h index 116b8b9083..116b8b9083 100644 --- a/libnm/nm-vpn-plugin-old.h +++ b/src/libnm-client-public/nm-vpn-plugin-old.h diff --git a/libnm/nm-vpn-service-plugin.h b/src/libnm-client-public/nm-vpn-service-plugin.h index e45622aa7d..e45622aa7d 100644 --- a/libnm/nm-vpn-service-plugin.h +++ b/src/libnm-client-public/nm-vpn-service-plugin.h diff --git a/libnm/nm-wifi-p2p-peer.h b/src/libnm-client-public/nm-wifi-p2p-peer.h index 4ab7c0e6e6..4ab7c0e6e6 100644 --- a/libnm/nm-wifi-p2p-peer.h +++ b/src/libnm-client-public/nm-wifi-p2p-peer.h diff --git a/libnm/nm-wimax-nsp.h b/src/libnm-client-public/nm-wimax-nsp.h index 15b8daa04d..15b8daa04d 100644 --- a/libnm/nm-wimax-nsp.h +++ b/src/libnm-client-public/nm-wimax-nsp.h diff --git a/src/meson.build b/src/meson.build index 576de0b1a0..4e7e16a1a0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -103,10 +103,14 @@ subdir('libnm-core-intern') subdir('libnm-core-aux-intern') subdir('libnm-core-impl') subdir('libnm-core-aux-extern') +subdir('libnm-client-public') +subdir('libnm-client-impl') +subdir('libnm-client-aux-extern') subdir('core') if enable_tests subdir('libnm-glib-aux/tests') subdir('libnm-platform/tests') subdir('libnm-core-impl/tests') + subdir('libnm-client-impl/tests') endif diff --git a/tools/check-docs.sh b/tools/check-docs.sh index a7526fcb45..c2e6761d0d 100755 --- a/tools/check-docs.sh +++ b/tools/check-docs.sh @@ -23,15 +23,15 @@ same_lines() { libnm_headers() { ( - ls -1 "$1/libnm"/*.h "$1/src/libnm-core-public"/*.h | \ + ls -1 "$1/src/libnm-client-public"/*.h "$1/src/libnm-core-public"/*.h | \ if [ -n "$2" ]; then - grep -v -F "$1/libnm-core/nm-core-enum-types.h" | \ - grep -v -F "$1/libnm/nm-enum-types.h" + grep -v -F "$1/src/libnm-core-public/nm-core-enum-types.h" | \ + grep -v -F "$1/src/libnm-client-public/nm-enum-types.h" else cat fi if [ -n "$2" ]; then - ls -1 "$2/libnm"/*.h "$2/src/libnm-core-public"/*.h + ls -1 "$2/src/libnm-client-public"/*.h "$2/src/libnm-core-public"/*.h fi ) | sort | uniq } @@ -63,7 +63,7 @@ F1_EXTRA=" nm-core-enum-types nm-enum-types " -F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR/libnm/libnm.ver" | word_regex)" \ +F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR/src/libnm-client-impl/libnm.ver" | word_regex)" \ $(libnm_headers "$SOURCEDIR" "$BUILDDIR") \ | sed 's,.*/\([^/]\+\)\.h$,\1,')" F2_EXTRA=" diff --git a/tools/check-tree.sh b/tools/check-tree.sh index f08a8da613..1975b0931b 100755 --- a/tools/check-tree.sh +++ b/tools/check-tree.sh @@ -19,6 +19,6 @@ check_cmp() { die "files \"$a\" and \"$b\" differ!" } -check_cmp src/libnm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h +check_cmp src/libnm-base/nm-ethtool-utils-base.h src/libnm-client-public/nm-ethtool-utils.h check_cmp src/libnm-core-intern/nm-meta-setting-base-impl.h clients/common/nm-meta-setting-base-impl.h check_cmp src/libnm-core-impl/nm-meta-setting-base-impl.c clients/common/nm-meta-setting-base-impl.c diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh index 6d835a8fb8..81b94ec648 100755 --- a/tools/run-nm-test.sh +++ b/tools/run-nm-test.sh @@ -216,8 +216,8 @@ else BUILDDIR="$(dirname "$BUILDDIR")" [[ "$BUILDDIR" == / ]] && BUILDDIR= [[ -z "$BUILDDIR" ]] && break - [[ -e "$BUILDDIR/libnm/.libs/libnm.so" ]] && break - [[ -e "$BUILDDIR/libnm/libnm.so" ]] && break + [[ -e "$BUILDDIR/src/libnm-client-impl/.libs/libnm.so" ]] && break + [[ -e "$BUILDDIR/src/libnm-client-impl/libnm.so" ]] && break done fi fi @@ -244,7 +244,7 @@ TEST_NAME="${TEST##*/}" if [ -z "${NMTST_LAUNCH_DBUS}" ]; then # autodetect whether to launch D-Bus based on the test path. - if [[ $TEST_PATH == */libnm/tests ]]; then + if [[ $TEST_PATH == */src/libnm-client-impl/tests ]]; then NMTST_LAUNCH_DBUS=1 else NMTST_LAUNCH_DBUS=0 @@ -270,12 +270,12 @@ fi [ -x "$TEST" ] || die "Cannot execute test \"$TEST\"" if [[ -n "$BUILDDIR" ]]; then - if [[ -d "$BUILDDIR/libnm" ]]; then - export GI_TYPELIB_PATH="$BUILDDIR/libnm/${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" - if [[ -d "$BUILDDIR/libnm/.libs" ]]; then - export LD_LIBRARY_PATH="$BUILDDIR/libnm/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + if [[ -d "$BUILDDIR/src/libnm-client-impl" ]]; then + export GI_TYPELIB_PATH="$BUILDDIR/src/libnm-client-impl/${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" + if [[ -d "$BUILDDIR/src/libnm-client-impl/.libs" ]]; then + export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" else - export LD_LIBRARY_PATH="$BUILDDIR/libnm${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" fi fi fi |