From 606612ea5938d3806fb73590b4c64eaeb78bb3e1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 4 Feb 2021 11:05:19 +0100 Subject: [PATCH] all: add "libnm/nm-default-client.h" as replacement for "nm-default.h" --- Makefile.am | 18 +++++---------- clients/cli/agent.c | 2 +- clients/cli/common.c | 2 +- clients/cli/connections.c | 2 +- clients/cli/devices.c | 2 +- clients/cli/general.c | 2 +- clients/cli/generate-docs-nm-settings-nmcli.c | 2 +- clients/cli/meson.build | 2 -- clients/cli/nmcli.c | 2 +- clients/cli/polkit-agent.c | 2 +- clients/cli/settings.c | 2 +- clients/cli/utils.c | 2 +- clients/cloud-setup/main.c | 2 +- clients/cloud-setup/meson.build | 1 - clients/cloud-setup/nm-cloud-setup-utils.c | 2 +- clients/cloud-setup/nm-http-client.c | 2 +- clients/cloud-setup/nmcs-provider-azure.c | 2 +- clients/cloud-setup/nmcs-provider-ec2.c | 2 +- clients/cloud-setup/nmcs-provider-gcp.c | 2 +- clients/cloud-setup/nmcs-provider.c | 2 +- clients/common/meson.build | 2 -- clients/common/nm-client-utils.c | 2 +- clients/common/nm-meta-setting-access.c | 2 +- clients/common/nm-meta-setting-desc.c | 2 +- clients/common/nm-polkit-listener.c | 2 +- clients/common/nm-secret-agent-simple.c | 2 +- clients/common/nm-vpn-helpers.c | 2 +- clients/common/tests/meson.build | 6 ++--- clients/common/tests/test-clients-common.c | 2 +- clients/common/tests/test-libnm-core-aux.c | 2 +- clients/meson.build | 1 - clients/nm-online.c | 2 +- clients/tui/meson.build | 1 - clients/tui/newt/meson.build | 1 - clients/tui/newt/nmt-newt-button-box.c | 2 +- clients/tui/newt/nmt-newt-button.c | 2 +- clients/tui/newt/nmt-newt-checkbox.c | 2 +- clients/tui/newt/nmt-newt-component.c | 2 +- clients/tui/newt/nmt-newt-container.c | 2 +- clients/tui/newt/nmt-newt-entry-numeric.c | 2 +- clients/tui/newt/nmt-newt-entry.c | 2 +- clients/tui/newt/nmt-newt-form.c | 2 +- clients/tui/newt/nmt-newt-grid.c | 2 +- clients/tui/newt/nmt-newt-hacks.c | 2 +- clients/tui/newt/nmt-newt-label.c | 2 +- clients/tui/newt/nmt-newt-listbox.c | 2 +- clients/tui/newt/nmt-newt-popup.c | 2 +- clients/tui/newt/nmt-newt-section.c | 2 +- clients/tui/newt/nmt-newt-separator.c | 2 +- clients/tui/newt/nmt-newt-stack.c | 2 +- clients/tui/newt/nmt-newt-textbox.c | 2 +- clients/tui/newt/nmt-newt-toggle-button.c | 2 +- clients/tui/newt/nmt-newt-utils.c | 2 +- clients/tui/newt/nmt-newt-widget.c | 2 +- clients/tui/nm-editor-bindings.c | 2 +- clients/tui/nm-editor-utils.c | 2 +- clients/tui/nmt-address-list.c | 2 +- clients/tui/nmt-connect-connection-list.c | 2 +- clients/tui/nmt-device-entry.c | 2 +- clients/tui/nmt-edit-connection-list.c | 2 +- clients/tui/nmt-editor-grid.c | 2 +- clients/tui/nmt-editor-page-device.c | 2 +- clients/tui/nmt-editor-page.c | 2 +- clients/tui/nmt-editor-section.c | 2 +- clients/tui/nmt-editor.c | 2 +- clients/tui/nmt-ip-entry.c | 2 +- clients/tui/nmt-mac-entry.c | 2 +- clients/tui/nmt-mtu-entry.c | 2 +- clients/tui/nmt-page-bond.c | 2 +- clients/tui/nmt-page-bridge-port.c | 2 +- clients/tui/nmt-page-bridge.c | 2 +- clients/tui/nmt-page-dsl.c | 2 +- clients/tui/nmt-page-ethernet.c | 2 +- clients/tui/nmt-page-infiniband.c | 2 +- clients/tui/nmt-page-ip-tunnel.c | 2 +- clients/tui/nmt-page-ip4.c | 2 +- clients/tui/nmt-page-ip6.c | 2 +- clients/tui/nmt-page-ppp.c | 2 +- clients/tui/nmt-page-team-port.c | 2 +- clients/tui/nmt-page-team.c | 2 +- clients/tui/nmt-page-vlan.c | 2 +- clients/tui/nmt-page-wifi.c | 2 +- clients/tui/nmt-password-dialog.c | 2 +- clients/tui/nmt-password-fields.c | 2 +- clients/tui/nmt-route-editor.c | 2 +- clients/tui/nmt-route-entry.c | 2 +- clients/tui/nmt-route-table.c | 2 +- clients/tui/nmt-slave-list.c | 2 +- clients/tui/nmt-utils.c | 2 +- clients/tui/nmt-widget-list.c | 2 +- clients/tui/nmtui-connect.c | 2 +- clients/tui/nmtui-edit.c | 2 +- clients/tui/nmtui-hostname.c | 2 +- clients/tui/nmtui.c | 2 +- dispatcher/meson.build | 2 -- dispatcher/nm-dispatcher-utils.c | 2 +- dispatcher/nm-dispatcher.c | 2 +- dispatcher/tests/meson.build | 3 +-- dispatcher/tests/test-dispatcher-envp.c | 2 +- libnm/meson.build | 3 +-- libnm/nm-default-client.h | 23 +++++++++++++++++++ libnm/nm-libnm-aux/nm-libnm-aux.c | 2 +- libnm/tests/meson.build | 3 +-- shared/nm-default.h | 2 +- shared/nm-meta-setting.c | 11 ++++++++- shared/nm-utils/nm-vpn-plugin-utils.c | 2 +- 106 files changed, 136 insertions(+), 125 deletions(-) create mode 100644 libnm/nm-default-client.h diff --git a/Makefile.am b/Makefile.am index c7348cb0cb..915a9a14a0 100644 --- 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) \ diff --git a/clients/cli/agent.c b/clients/cli/agent.c index c8ab2a607c..a3c60c46e7 100644 --- 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 #include diff --git a/clients/cli/common.c b/clients/cli/common.c index f60a7326fb..934ff70ef0 100644 --- 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" diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 805e765bb8..ee7b8fbbe9 100644 --- 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" diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 4051ff81ed..eea82653c0 100644 --- 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" diff --git a/clients/cli/general.c b/clients/cli/general.c index d1673beb3f..1dae57e116 100644 --- 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 diff --git a/clients/cli/generate-docs-nm-settings-nmcli.c b/clients/cli/generate-docs-nm-settings-nmcli.c index aa40268474..d277b132e4 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include "nm-meta-setting-desc.h" diff --git a/clients/cli/meson.build b/clients/cli/meson.build index f154e52082..f8e6a8236d 100644 --- 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, diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index c21e480e17..3945721105 100644 --- 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" diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index e66294267a..2f07a2751e 100644 --- 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" diff --git a/clients/cli/settings.c b/clients/cli/settings.c index c479fc5170..2c1037f222 100644 --- 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" diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 8278655c98..0a62c35cfa 100644 --- 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" diff --git a/clients/cloud-setup/main.c b/clients/cloud-setup/main.c index 235f25bef0..065901760a 100644 --- 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" diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index 681c53ea04..5b48229971 100644 --- 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, diff --git a/clients/cloud-setup/nm-cloud-setup-utils.c b/clients/cloud-setup/nm-cloud-setup-utils.c index 95a84d10f6..6d446343fc 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 "nm-default.h" +#include "libnm/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 529a77fe22..144513fce5 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 "nm-default.h" +#include "libnm/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 e55ecc9d28..0a5d522cc3 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 "nm-default.h" +#include "libnm/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 49b909bf77..1e060034f5 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 "nm-default.h" +#include "libnm/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 425621b43f..1deaea10f3 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 "nm-default.h" +#include "libnm/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 6512b76faf..c700d8e1a3 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include "nmcs-provider.h" diff --git a/clients/common/meson.build b/clients/common/meson.build index a95a8a0f4c..629ffdedc0 100644 --- 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, ) diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index f1ccc65d98..0e1a6bf5cf 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 "nm-default.h" +#include "libnm/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 873e59f1a5..dd493f28ae 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 "nm-default.h" +#include "libnm/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 785405aa4a..b6e3d671fa 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 "nm-default.h" +#include "libnm/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 84308907f2..db21abfc98 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 "nm-default.h" +#include "libnm/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 45060a438c..1857432538 100644 --- 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" diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index 43513a8e59..15c47c3ecc 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include "nm-vpn-helpers.h" diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index 401759d885..28b27ae9e0 100644 --- 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, ) diff --git a/clients/common/tests/test-clients-common.c b/clients/common/tests/test-clients-common.c index 7020e83339..4336f0d533 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 "nm-default.h" +#include "libnm/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 f5148d9456..bf639878c0 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 "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" diff --git a/clients/meson.build b/clients/meson.build index 3123f84a6d..2c92e29098 100644 --- 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, diff --git a/clients/nm-online.c b/clients/nm-online.c index b40d8b4945..c5cdeb38a0 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -16,7 +16,7 @@ * Robert Love */ -#include "nm-default.h" +#include "libnm/nm-default-client.h" #include #include diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 240e73e763..89f842e643 100644 --- 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, diff --git a/clients/tui/newt/meson.build b/clients/tui/newt/meson.build index 415227e1a4..0c89c0f681 100644 --- 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', ], ) diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c index 9dc8ee78d2..212d04afa2 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 "nm-default.h" +#include "libnm/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 050d6bd8c0..1a30a63d4c 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 "nm-default.h" +#include "libnm/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 304075e919..f806494277 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 "nm-default.h" +#include "libnm/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 687c1e6371..64648ea6bb 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 "nm-default.h" +#include "libnm/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 f6060c147b..dfb5891661 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 "nm-default.h" +#include "libnm/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 6df61af70f..c08ad00a24 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c index eee75c0f67..2c2ee13535 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 "nm-default.h" +#include "libnm/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 b596be7444..23118e3403 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include #include diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c index 873afbd917..9fdd615a72 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 "nm-default.h" +#include "libnm/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 f1a5199ff0..4120acbb3f 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 "nm-default.h" +#include "libnm/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 3ef963675e..1902b57f2d 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 "nm-default.h" +#include "libnm/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 293f8b72a3..7031fc0f99 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 "nm-default.h" +#include "libnm/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 6c385bfd12..c8d8034dd9 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 "nm-default.h" +#include "libnm/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 aacc10ac51..6075563950 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 "nm-default.h" +#include "libnm/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 49e5d2cccd..c0dde744bc 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 "nm-default.h" +#include "libnm/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 7d730e7a6f..f3a2d1f0c4 100644 --- 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" diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c index 523a1e1b94..c8e3d576e5 100644 --- 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" diff --git a/clients/tui/newt/nmt-newt-toggle-button.c b/clients/tui/newt/nmt-newt-toggle-button.c index 3d5d07c4ef..cbc813fb30 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 "nm-default.h" +#include "libnm/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 d3f807a99e..af24824558 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include #include diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c index 6eeeaa189a..902949527a 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 "nm-default.h" +#include "libnm/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 7f1bcb6778..01f22f64ca 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 "nm-default.h" +#include "libnm/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 4bb8e7114f..21dc3aef92 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 "nm-default.h" +#include "libnm/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 a33a2307fc..bb3651d956 100644 --- 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" diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index 8960f47ff8..e8a90d0a31 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c index 593b7b6af9..dcc2c6d24d 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 "nm-default.h" +#include "libnm/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 b57e48031a..52535e077c 100644 --- 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" diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c index c7e657a109..9bd07066c9 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 "nm-default.h" +#include "libnm/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 e899b3a476..18f886bda5 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 "nm-default.h" +#include "libnm/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 200462bf14..24ff9bebca 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 "nm-default.h" +#include "libnm/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 34eaceda8f..0b85cd2935 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 "nm-default.h" +#include "libnm/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 eb5d2fb2a6..2f5a09b097 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 "nm-default.h" +#include "libnm/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 2d292c98ce..e6d1306d5c 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include #include diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index db49e564cb..2768eaab35 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 "nm-default.h" +#include "libnm/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 096f8b469c..7b1c0f3be1 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index d24d6311a2..9c86a49860 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 "nm-default.h" +#include "libnm/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 fc1e9ed66d..228acc20c0 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 "nm-default.h" +#include "libnm/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 b2120cc0fb..7fc85eb2ed 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 "nm-default.h" +#include "libnm/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 ded0fd4a9a..8e1e69f3f2 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 "nm-default.h" +#include "libnm/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 db6b5598a2..61ef811ca8 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 "nm-default.h" +#include "libnm/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 00e87ec471..0529caf367 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 "nm-default.h" +#include "libnm/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 02b0a25473..ab58038989 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 "nm-default.h" +#include "libnm/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 7611567bce..1f01155bf4 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c index d44d0b952a..f4e4f3d0ea 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c index 9e5564cb8c..b60835af09 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c index 22510946c0..fd71140813 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 "nm-default.h" +#include "libnm/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 705ff95782..f0a3f839d7 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 "nm-default.h" +#include "libnm/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 ad8ab490e5..549156dd33 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 "nm-default.h" +#include "libnm/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 a0b66fcb76..817e23bde6 100644 --- 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 #include diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c index 845aa4a885..679bf05229 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 "nm-default.h" +#include "libnm/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 77514bb54f..c4c54a26bf 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 "nm-default.h" +#include "libnm/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 a89e2be6d6..d2e54122e7 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 "nm-default.h" +#include "libnm/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 025d712117..545eaf14ea 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include #include diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c index 4386e50257..e38149450a 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include #include diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c index 5e787dc2a5..9a2f6d241c 100644 --- 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" diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c index e80c50035a..39889e11c6 100644 --- 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" diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c index dd645c4c6a..d25c01c77e 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include "nmt-widget-list.h" diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 36182077ca..356badb011 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index ac205b05ae..8a88e1162a 100644 --- 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 diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c index 494827c230..07e0f6058c 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include "nmt-newt.h" diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index f73e087593..73ead40e8f 100644 --- 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" diff --git a/dispatcher/meson.build b/dispatcher/meson.build index f4fe0c4a89..d12e47145f 100644 --- 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, diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c index aa0f006aba..f1ec979f27 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include "nm-dispatcher-utils.h" diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c index 548097b3e4..9891bf3d15 100644 --- 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 #include diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index 3bdf369266..84b4b61c66 100644 --- 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, ) diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c index 073d95bc79..4c37dd6c07 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include #include diff --git a/libnm/meson.build b/libnm/meson.build index a9d38f8de7..f1e92a4102 100644 --- 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, diff --git a/libnm/nm-default-client.h b/libnm/nm-default-client.h new file mode 100644 index 0000000000..b5d1a6d318 --- /dev/null +++ b/libnm/nm-default-client.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2015 Red Hat, Inc. + */ + +#ifndef __NM_DEFAULT_CLIENT_H__ +#define __NM_DEFAULT_CLIENT_H__ + +/*****************************************************************************/ + +#include "nm-glib-aux/nm-default-glib-i18n-lib.h" + +#undef NETWORKMANAGER_COMPILATION +#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_CLIENT + +/*****************************************************************************/ + +#include "nm-version.h" +#include "NetworkManager.h" + +/*****************************************************************************/ + +#endif /* __NM_DEFAULT_CLIENT_H__ */ diff --git a/libnm/nm-libnm-aux/nm-libnm-aux.c b/libnm/nm-libnm-aux/nm-libnm-aux.c index 90152b5896..2b8d2c2ef9 100644 --- a/libnm/nm-libnm-aux/nm-libnm-aux.c +++ b/libnm/nm-libnm-aux/nm-libnm-aux.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.h" diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build index 71dc83e706..f3da897eca 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -41,7 +41,6 @@ libnm_vpn_plugin_utils_test = static_library( include_directories: libnm_inc, dependencies: libnm_nm_default_dep, c_args: [ - '-DNETWORKMANAGER_COMPILATION_TEST', - '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM', + '-DG_LOG_DOMAIN="test"', ], ) diff --git a/shared/nm-default.h b/shared/nm-default.h index 44428b237e..a101067a3e 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -22,7 +22,7 @@ #error Define NETWORKMANAGER_COMPILATION accordingly #endif -#if NETWORKMANAGER_COMPILATION < NM_NETWORKMANAGER_COMPILATION_CLIENT +#if NETWORKMANAGER_COMPILATION < NM_NETWORKMANAGER_COMPILATION_LIBNM #error Dont include this header with such NETWORKMANAGER_COMPILATION #endif diff --git a/shared/nm-meta-setting.c b/shared/nm-meta-setting.c index 530d76f566..2f5844ead7 100644 --- a/shared/nm-meta-setting.c +++ b/shared/nm-meta-setting.c @@ -3,7 +3,11 @@ * Copyright (C) 2017 - 2018 Red Hat, Inc. */ -#include "nm-default.h" +#ifdef NETWORKMANAGER_COMPILATION + #undef NETWORKMANAGER_COMPILATION +#endif + +#include "nm-glib-aux/nm-default-glib-i18n-lib.h" #include "nm-meta-setting.h" @@ -562,6 +566,11 @@ const NMMetaSettingInfo * nm_meta_setting_infos_by_gtype(GType gtype) { #if ((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL) + /* FIXME: we no longer define NETWORKMANAGER_COMPILATION via CFLAGS, but it's instead + * defined by our source and which files get included. + * + * For now, this code is unreachable (and we use the slower fallback). Rework how this + * works. */ nm_auto_unref_gtypeclass GTypeClass *gtypeclass_unref = NULL; GTypeClass * gtypeclass; NMSettingClass * klass; diff --git a/shared/nm-utils/nm-vpn-plugin-utils.c b/shared/nm-utils/nm-vpn-plugin-utils.c index 6a057e8520..89285ecd2f 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 "nm-default.h" +#include "libnm/nm-default-client.h" #include "nm-vpn-plugin-utils.h"