all: add "libnm/nm-default-client.h" as replacement for "nm-default.h"

2024-07-22 10:46:59 +00:00 · 2021-02-04 11:05:19 +01:00 · 2021-02-04 11:05:19 +01:00 · 606612ea59
parent 8f4f91b667
commit 606612ea59
106 changed files with 136 additions and 125 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -703,7 +703,6 @@ libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""libnmc"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(NULL)

 libnm_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \
@ -1506,14 +1505,15 @@ libnm_lib_h_pub_real = \
 libnm_lib_h_pub_mkenums = \
 	libnm/nm-enum-types.h
 libnm_lib_h_priv = \
-	libnm/nm-libnm-utils.h \
 	libnm/nm-dbus-helpers.h \
+	libnm/nm-default-client.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 \
 	$(NULL)
@ -1874,8 +1874,7 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	-I$(builddir)/libnm \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(NULL)

 libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
@ -4384,7 +4383,6 @@ dispatcher_cppflags = \
 	-I$(builddir)/dispatcher \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(NULL)

 dispatcher_libnm_dispatcher_core_la_SOURCES = \
@ -4465,8 +4463,7 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/dispatcher \
 	-I$(builddir)/dispatcher \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(INTROSPECTION_EXTRA_CFLAGS) \
@ -4522,7 +4519,6 @@ clients_nm_online_CPPFLAGS = \
 	-I$(builddir)/libnm \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-online"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(NULL)

 clients_nm_online_LDFLAGS = \
@ -4558,7 +4554,6 @@ clients_cppflags = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/clients/common \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
@ -4653,7 +4648,7 @@ endif
 clients_common_tests_test_clients_common_CPPFLAGS = \
 	-I$(srcdir)/clients/common/tests \
 	$(clients_cppflags) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(NULL)

 clients_common_tests_test_clients_common_LDFLAGS = \
@ -4694,8 +4689,7 @@ clients_common_tests_test_libnm_core_aux_CPPFLAGS = \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/libnm \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@ -3,7 +3,7 @@
 * Copyright (C) 2014 Red Hat, Inc.
 */

-#include "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "common.h"

--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@ -3,7 +3,7 @@
 * Copyright (C) 2010 - 2018 Red Hat, Inc.
 */

-#include "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "nm-meta-setting-desc.h"

--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@ -29,7 +29,6 @@ executable(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="nmcli"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
@ -50,7 +49,6 @@ generate_docs_nm_settings_nmcli = executable(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="nmcli"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@ -4,7 +4,7 @@
 * Copyright (C) 2010 - 2018 Red Hat, Inc.
 */

-#include "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "utils.h"

--- a/clients/cloud-setup/main.c
+++ b/clients/cloud-setup/main.c
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */

-#include "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "nm-libnm-aux/nm-libnm-aux.h"

--- a/clients/cloud-setup/meson.build
+++ b/clients/cloud-setup/meson.build
@ -40,7 +40,6 @@ executable(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="nm-cloud-setup"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
  link_with: libnm_systemd_logging_stub,
  link_args: ldflags_linker_script_binary,
--- 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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "nmcs-provider.h"

--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@ -16,7 +16,6 @@ libnmc_base = static_library(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="libnmc"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
 )

@ -73,7 +72,6 @@ libnmc = static_library(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="libnmc"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
  link_depends: settings_docs_source,
 )
--- 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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "nm-vpn-helpers.h"

--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@ -8,8 +8,7 @@ exe = executable(
    libnmc_dep,
  ],
  c_args: [
-    '-DNETWORKMANAGER_COMPILATION_TEST',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
+    '-DG_LOG_DOMAIN="test"',
  ],
 )

@ -28,8 +27,7 @@ exe = executable(
    libnm_nm_default_dep,
  ],
  c_args: [
-    '-DNETWORKMANAGER_COMPILATION_TEST',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
+    '-DG_LOG_DOMAIN="test"',
  ],
  link_with: libnm_systemd_logging_stub,
 )
--- 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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "nm-libnm-core-aux/nm-libnm-core-aux.h"
 #include "nm-libnm-core-intern/nm-libnm-core-utils.h"
--- a/clients/meson.build
+++ b/clients/meson.build
@ -10,7 +10,6 @@ executable(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="nm-online"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@ -16,7 +16,7 @@
 * Robert Love <rml@novell.com>
 */

-#include "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include <stdio.h>
 #include <stdlib.h>
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@ -54,7 +54,6 @@ executable(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="nmtui"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
  link_with: libnm_systemd_logging_stub,
  link_args: ldflags_linker_script_binary,
--- a/clients/tui/newt/meson.build
+++ b/clients/tui/newt/meson.build
@ -30,7 +30,6 @@ libnmt_newt = static_library(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="nmtui"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
 )

--- 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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "nmt-newt.h"

--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@ -11,7 +11,7 @@
 * nmtui_edit(), and nmtui_hostname().
 */

-#include "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include "nmtui.h"

--- a/dispatcher/meson.build
+++ b/dispatcher/meson.build
@ -24,7 +24,6 @@ libnm_dispatcher_core = static_library(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="nm-dispatcher"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
 )

@ -45,7 +44,6 @@ executable(
  ],
  c_args: [
    '-DG_LOG_DOMAIN="nm-dispatcher"',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
  ],
  link_with: libnm_dispatcher_core,
  link_args: ldflags_linker_script_binary,
--- a/dispatcher/nm-dispatcher-utils.c
+++ b/dispatcher/nm-dispatcher-utils.c
@ -3,7 +3,7 @@
 * Copyright (C) 2008 - 2011 Red Hat, Inc.
 */

-#include "nm-default.h"
+#include "libnm/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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include <syslog.h>
 #include <stdio.h>
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@ -12,8 +12,7 @@ exe = executable(
    libnm_glib_aux_dep,
  ],
  c_args: [
-    '-DNETWORKMANAGER_COMPILATION_TEST',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
+    '-DG_LOG_DOMAIN="test"',
  ] + introspection_extra_cflags,
  link_with: libnm_dispatcher_core,
 )
--- 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 "nm-default.h"
+#include "libnm/nm-default-client.h"

 #include <arpa/inet.h>
 #include <stdlib.h>
--- a/libnm/meson.build
+++ b/libnm/meson.build
@ -300,8 +300,7 @@ libnm_libnm_aux = static_library(
    'nm-libnm-aux/nm-libnm-aux.c',
  ),
  c_args: [
-    '-DG_LOG_DOMAIN="@0@"'.format('libnmc'),
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
+    '-DG_LOG_DOMAIN="libnmc"',
  ],
  dependencies: [
    libnm_core_nm_default_dep,
--- a/Show more
+++ b/Show more