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.
2025-12-20 04:40:04 +01:00 · 2021-02-19 15:23:34 +01:00 · 2021-02-19 15:23:34 +01:00 · 9bba4871f3
commit 9bba4871f3
parent b53c50e778
239 changed files with 697 additions and 653 deletions
--- 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
--- a/Makefile.am
+++ b/Makefile.am
--- 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 = \
--- 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>
--- 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"
--- 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"

--- 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"

--- 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>

--- 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"

--- 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,
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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,
  ],
 )

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"
--- 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,
--- 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

--- 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,
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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>

--- 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"
--- 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>
--- 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"

--- 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"

--- 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"

--- 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"
--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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>
--- 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"
--- 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"

--- 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
--- 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"

--- 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>

--- 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"

--- 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"
--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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>
--- 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"

--- 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>

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"
--- 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"

--- 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>

--- 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>

--- 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>

--- 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"

--- 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"

--- 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"

--- 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>
--- 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"
--- 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"

--- 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"
--- 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>
--- 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>
--- 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"

--- 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"

--- 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"

--- 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>

--- 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>

--- 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"

--- 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"
--- 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
--- 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,
  ],
 )

--- 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"

--- 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>
--- 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>
--- 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)

--- a/Show more
+++ b/Show more