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

2024-07-22 10:46:59 +00:00 · 2021-02-04 16:04:15 +01:00 · 2021-02-04 16:04:15 +01:00 · 78629830c8
parent a38afcb1d9
commit 78629830c8
84 changed files with 112 additions and 100 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -593,7 +593,6 @@ libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
 	$(NULL)

 libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \
@ -666,7 +665,6 @@ libnm_core_nm_keyfile_libnm_keyfile_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
 	$(NULL)

 libnm_core_nm_keyfile_libnm_keyfile_la_SOURCES = \
@ -1114,6 +1112,7 @@ libnm_core_lib_h_priv = \
 	libnm-core/nm-core-types-internal.h \
 	libnm-core/nm-crypto-impl.h \
 	libnm-core/nm-crypto.h \
+	libnm-core/nm-default-libnm-core.h \
 	libnm-core/nm-property-compare.h \
 	libnm-core/nm-setting-private.h \
 	libnm-core/nm-team-utils.h \
@ -1219,7 +1218,7 @@ GLIB_GENERATED += \
 	$(libnm_core_lib_c_mkenums)
 nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real)

-nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
+nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm-core/nm-default-libnm-core.h"\n'

 libnm-core/nm-core-enum-types.h.stamp:                                      libnm-core/.dirstamp
 libnm-core/nm-core-enum-types.c.stamp:                                      libnm-core/.dirstamp
@ -1240,7 +1239,6 @@ $(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS):                 $(li
 libnm_core_libnm_core_la_CPPFLAGS = \
 	$(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
 	$(NULL)

 libnm_core_libnm_core_la_SOURCES = \
@ -1339,7 +1337,7 @@ GLIB_GENERATED += \
 	libnm-core/tests/nm-core-tests-enum-types.h \
 	libnm-core/tests/nm-core-tests-enum-types.c
 nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h
-nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "nm-default.h"\n'
+nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "libnm-core/nm-default-libnm-core.h"\n'

 libnm-core/tests/nm-core-tests-enum-types.h.stamp: libnm-core/tests/.dirstamp
 libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp
@ -1350,8 +1348,7 @@ libnm_core_tests_cppflags = \
 	-I$(srcdir)/libnm-core/tests \
 	-I$(builddir)/libnm-core/tests \
 	$(dflt_cppflags_libnm_core) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)

--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@ -40,6 +40,7 @@ IGNORE_HFILES= \
 	nm-crypto-impl.h \
 	nm-crypto.h \
 	nm-dbus-helpers.h \
+	nm-default-libnm-core.h \
 	nm-device-private.h \
 	nm-dhcp4-config.h \
 	nm-dhcp6-config.h \
--- a/docs/libnm/meson.build
+++ b/docs/libnm/meson.build
@ -13,6 +13,7 @@ private_headers = [
  'nm-crypto-impl.h',
  'nm-crypto.h',
  'nm-dbus-helpers.h',
+  'nm-default-libnm-core.h',
  'nm-device-private.h',
  'nm-dhcp4-config.h',
  'nm-dhcp6-config.h',
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@ -79,7 +79,7 @@ libnm_core_enum_sources = gnome.mkenums_simple(
  'nm-core-enum-types',
  sources: libnm_core_headers + [nm_version_macro_header],
  identifier_prefix: nm_id_prefix,
-  body_prefix: '#include "nm-default.h"',
+  body_prefix: '#include "libnm-core/nm-default-libnm-core.h"',
  install_header: true,
  install_dir: libnm_pkgincludedir,
 )
@ -95,8 +95,7 @@ libnm_libnm_core_intern = static_library(
    libnm_base_dep,
  ],
  c_args: [
-    '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
+    '-DG_LOG_DOMAIN="libnm"',
  ],
 )

@ -118,8 +117,7 @@ libnm_crypto = static_library(
    libnm_glib_aux_dep,
  ],
  c_args: [
-    '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
+    '-DG_LOG_DOMAIN="libnm"',
  ],
 )

@ -203,8 +201,7 @@ libnm_core = static_library(
    uuid_dep,
  ],
  c_args: [
-    '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
+    '-DG_LOG_DOMAIN="libnm"',
  ],
  link_with: [
    libnm_crypto,
@ -251,8 +248,7 @@ libnm_keyfile = static_library(
  sources: nm_keyfile_source + [libnm_core_enum_sources[1]],
  dependencies: libnm_glib_aux_dep,
  c_args: [
-    '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
+    '-DG_LOG_DOMAIN="libnm"',
  ],
  link_with: libnm_libnm_core_intern,
 )
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-connection.h"

--- a/libnm-core/nm-crypto-gnutls.c
+++ b/libnm-core/nm-crypto-gnutls.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2015 Red Hat, Inc.
 */

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

 #include "nm-crypto-impl.h"

--- a/libnm-core/nm-crypto-nss.c
+++ b/libnm-core/nm-crypto-nss.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2009 Red Hat, Inc.
 */

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

 #include "nm-crypto-impl.h"

--- a/libnm-core/nm-crypto.c
+++ b/libnm-core/nm-crypto.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2018 Red Hat, Inc.
 */

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

 #include "nm-crypto.h"

--- a/libnm-core/nm-dbus-utils.c
+++ b/libnm-core/nm-dbus-utils.c
@ -3,7 +3,7 @@
 * Copyright (C) 2015 Red Hat, Inc.
 */

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

 #include "nm-core-internal.h"

--- a/libnm-core/nm-default-libnm-core.h
+++ b/libnm-core/nm-default-libnm-core.h
@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2015 Red Hat, Inc.
+ */
+
+#ifndef __NM_DEFAULT_LIBNM_CORE_H__
+#define __NM_DEFAULT_LIBNM_CORE_H__
+
+/*****************************************************************************/
+
+#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+
+#undef NETWORKMANAGER_COMPILATION
+#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE
+
+/*****************************************************************************/
+
+#include "nm-version.h"
+
+/*****************************************************************************/
+
+#endif /* __NM_DEFAULT_LIBNM_CORE_H__ */
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@ -3,7 +3,7 @@
 * Copyright (C) 2004 - 2014 Red Hat, Inc.
 */

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

 #include "nm-errors.h"

--- a/libnm-core/nm-keyfile/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile/nm-keyfile-utils.c
@ -3,7 +3,7 @@
 * Copyright (C) 2010 Red Hat, Inc.
 */

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

 #include "nm-keyfile-utils.h"

--- a/libnm-core/nm-keyfile/nm-keyfile.c
+++ b/libnm-core/nm-keyfile/nm-keyfile.c
@ -4,7 +4,7 @@
 * Copyright (C) 2008 - 2017 Red Hat, Inc.
 */

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

 #include "nm-keyfile-internal.h"

--- a/libnm-core/nm-libnm-core-intern/nm-auth-subject.c
+++ b/libnm-core/nm-libnm-core-intern/nm-auth-subject.c
@ -11,7 +11,7 @@
 * makes requests, like process identifier and user UID.
 */

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

 #include "nm-auth-subject.h"

--- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
+++ b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */

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

 #include "nm-libnm-core-utils.h"

--- a/libnm-core/nm-property-compare.c
+++ b/libnm-core/nm-property-compare.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-property-compare.h"

--- a/libnm-core/nm-setting-6lowpan.c
+++ b/libnm-core/nm-setting-6lowpan.c
@ -3,7 +3,7 @@
 * Copyright (C) 2018 Red Hat, Inc.
 */

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

 #include "nm-setting-6lowpan.h"

--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-8021x.h"

--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@ -3,7 +3,7 @@
 * Copyright (C) 2011 - 2013 Red Hat, Inc.
 */

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

 #include "nm-setting-adsl.h"

--- a/libnm-core/nm-setting-bluetooth.c
+++ b/libnm-core/nm-setting-bluetooth.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-bluetooth.h"

--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@ -3,7 +3,7 @@
 * Copyright (C) 2011 - 2013 Red Hat, Inc.
 */

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

 #include "nm-setting-bond.h"

--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@ -3,7 +3,7 @@
 * Copyright (C) 2012 - 2013 Red Hat, Inc.
 */

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

 #include "nm-setting-bridge-port.h"

--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@ -3,7 +3,7 @@
 * Copyright (C) 2011 - 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-bridge.h"

--- a/libnm-core/nm-setting-cdma.c
+++ b/libnm-core/nm-setting-cdma.c
@ -3,7 +3,7 @@
 * Copyright (C) 2007 - 2013 Red Hat, Inc.
 */

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

 #include "nm-setting-cdma.h"

--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-connection.h"

--- a/libnm-core/nm-setting-dcb.c
+++ b/libnm-core/nm-setting-dcb.c
@ -3,7 +3,7 @@
 * Copyright (C) 2013 Red Hat, Inc.
 */

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

 #include "nm-setting-dcb.h"

--- a/libnm-core/nm-setting-dummy.c
+++ b/libnm-core/nm-setting-dummy.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-dummy.h"

--- a/libnm-core/nm-setting-ethtool.c
+++ b/libnm-core/nm-setting-ethtool.c
@ -3,7 +3,7 @@
 * Copyright (C) 2018 Red Hat, Inc.
 */

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

 #include "nm-setting-ethtool.h"

--- a/libnm-core/nm-setting-generic.c
+++ b/libnm-core/nm-setting-generic.c
@ -3,7 +3,7 @@
 * Copyright (C) 2013 Red Hat, Inc.
 */

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

 #include "nm-setting-generic.h"

--- a/libnm-core/nm-setting-gsm.c
+++ b/libnm-core/nm-setting-gsm.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-gsm.h"

--- a/libnm-core/nm-setting-hostname.c
+++ b/libnm-core/nm-setting-hostname.c
@ -3,7 +3,7 @@
 * Copyright (C) 2020 Red Hat, Inc.
 */

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

 #include "nm-setting-hostname.h"

--- a/libnm-core/nm-setting-infiniband.c
+++ b/libnm-core/nm-setting-infiniband.c
@ -3,7 +3,7 @@
 * Copyright (C) 2011 - 2013 Red Hat, Inc.
 */

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

 #include "nm-setting-infiniband.h"

--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-ip-config.h"

--- a/libnm-core/nm-setting-ip-tunnel.c
+++ b/libnm-core/nm-setting-ip-tunnel.c
@ -3,7 +3,7 @@
 * Copyright (C) 2015 Red Hat, Inc.
 */

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

 #include "nm-setting-ip-tunnel.h"

--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@ -3,7 +3,7 @@
 * Copyright (C) 2014 Red Hat, Inc.
 */

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

 #include "nm-setting-ip4-config.h"

--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@ -3,7 +3,7 @@
 * Copyright (C) 2007 - 2014 Red Hat, Inc.
 */

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

 #include "nm-setting-ip6-config.h"

--- a/libnm-core/nm-setting-macsec.c
+++ b/libnm-core/nm-setting-macsec.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-macsec.h"

--- a/libnm-core/nm-setting-macvlan.c
+++ b/libnm-core/nm-setting-macvlan.c
@ -3,7 +3,7 @@
 * Copyright (C) 2015 Red Hat, Inc.
 */

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

 #include "nm-setting-macvlan.h"

--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@ -3,7 +3,7 @@
 * Copyright (C) 2018 Red Hat, Inc.
 */

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

 #include "nm-setting-match.h"

--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@ -5,7 +5,7 @@
 * Copyright (C) 2009 One Laptop per Child
 */

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

 #include "nm-setting-olpc-mesh.h"

--- a/libnm-core/nm-setting-ovs-bridge.c
+++ b/libnm-core/nm-setting-ovs-bridge.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-ovs-bridge.h"

--- a/libnm-core/nm-setting-ovs-dpdk.c
+++ b/libnm-core/nm-setting-ovs-dpdk.c
@ -3,7 +3,7 @@
 * Copyright (C) 2019 Red Hat, Inc.
 */

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

 #include "nm-setting-ovs-dpdk.h"

--- a/libnm-core/nm-setting-ovs-external-ids.c
+++ b/libnm-core/nm-setting-ovs-external-ids.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 - 2020 Red Hat, Inc.
 */

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

 #include "nm-setting-ovs-external-ids.h"

--- a/libnm-core/nm-setting-ovs-interface.c
+++ b/libnm-core/nm-setting-ovs-interface.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-ovs-interface.h"

--- a/libnm-core/nm-setting-ovs-patch.c
+++ b/libnm-core/nm-setting-ovs-patch.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-ovs-patch.h"

--- a/libnm-core/nm-setting-ovs-port.c
+++ b/libnm-core/nm-setting-ovs-port.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-ovs-port.h"

--- a/libnm-core/nm-setting-ppp.c
+++ b/libnm-core/nm-setting-ppp.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-ppp.h"

--- a/libnm-core/nm-setting-pppoe.c
+++ b/libnm-core/nm-setting-pppoe.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-pppoe.h"

--- a/libnm-core/nm-setting-proxy.c
+++ b/libnm-core/nm-setting-proxy.c
@ -3,7 +3,7 @@
 * Copyright (C) 2016 Atul Anand <atulhjp@gmail.com>.
 */

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

 #include "nm-setting-proxy.h"

--- a/libnm-core/nm-setting-serial.c
+++ b/libnm-core/nm-setting-serial.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-serial.h"

--- a/libnm-core/nm-setting-sriov.c
+++ b/libnm-core/nm-setting-sriov.c
@ -3,7 +3,7 @@
 * Copyright (C) 2018 Red Hat, Inc.
 */

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

 #include "nm-setting-sriov.h"

--- a/libnm-core/nm-setting-tc-config.c
+++ b/libnm-core/nm-setting-tc-config.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-tc-config.h"

--- a/libnm-core/nm-setting-team-port.c
+++ b/libnm-core/nm-setting-team-port.c
@ -4,7 +4,7 @@
 * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us>
 */

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

 #include "nm-setting-team-port.h"

--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@ -4,7 +4,7 @@
 * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us>
 */

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

 #include "nm-setting-team.h"

--- a/libnm-core/nm-setting-tun.c
+++ b/libnm-core/nm-setting-tun.c
@ -3,7 +3,7 @@
 * Copyright (C) 2015 Red Hat, Inc.
 */

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

 #include "nm-setting-tun.h"

--- a/libnm-core/nm-setting-user.c
+++ b/libnm-core/nm-setting-user.c
@ -3,7 +3,7 @@
 * Copyright (C) 2017 Red Hat, Inc.
 */

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

 #include "nm-setting-user.h"

--- a/libnm-core/nm-setting-veth.c
+++ b/libnm-core/nm-setting-veth.c
@ -3,7 +3,7 @@
 * Copyright (C) 2020 Red Hat, Inc.
 */

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

 #include "nm-setting-veth.h"

--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@ -3,7 +3,7 @@
 * Copyright (C) 2011 - 2014 Red Hat, Inc.
 */

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

 #include "nm-setting-vlan.h"

--- a/libnm-core/nm-setting-vpn.c
+++ b/libnm-core/nm-setting-vpn.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-vpn.h"

--- a/libnm-core/nm-setting-vrf.c
+++ b/libnm-core/nm-setting-vrf.c
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */

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

 #include "nm-setting-vrf.h"

--- a/libnm-core/nm-setting-vxlan.c
+++ b/libnm-core/nm-setting-vxlan.c
@ -3,7 +3,7 @@
 * Copyright (C) 2015 Red Hat, Inc.
 */

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

 #include "nm-setting-vxlan.h"

--- a/libnm-core/nm-setting-wifi-p2p.c
+++ b/libnm-core/nm-setting-wifi-p2p.c
@ -3,7 +3,7 @@
 * Copyright (C) 2019 Red Hat, Inc.
 */

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

 #include "nm-setting-wifi-p2p.h"

--- a/libnm-core/nm-setting-wimax.c
+++ b/libnm-core/nm-setting-wimax.c
@ -4,7 +4,7 @@
 * Copyright (C) 2009 Novell, Inc.
 */

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

 #include "nm-setting-wimax.h"

--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-wired.h"

--- a/libnm-core/nm-setting-wireguard.c
+++ b/libnm-core/nm-setting-wireguard.c
@ -3,7 +3,7 @@
 * Copyright (C) 2018 - 2019 Red Hat, Inc.
 */

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

 #include "nm-setting-wireguard.h"

--- a/libnm-core/nm-setting-wireless-security.c
+++ b/libnm-core/nm-setting-wireless-security.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-wireless-security.h"

--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting-wireless.h"

--- a/libnm-core/nm-setting-wpan.c
+++ b/libnm-core/nm-setting-wpan.c
@ -3,7 +3,7 @@
 * Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk>
 */

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

 #include "nm-setting-wpan.h"

--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include "nm-setting.h"

--- a/libnm-core/nm-simple-connection.c
+++ b/libnm-core/nm-simple-connection.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2014 Red Hat, Inc.
 */

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

 #include "nm-simple-connection.h"

--- a/libnm-core/nm-team-utils.c
+++ b/libnm-core/nm-team-utils.c
@ -5,7 +5,7 @@

 #define NM_VALUE_TYPE_DEFINE_FUNCTIONS

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

 #include "nm-team-utils.h"

--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@ -3,7 +3,7 @@
 * Copyright (C) 2005 - 2017 Red Hat, Inc.
 */

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

 #include "nm-utils.h"

--- a/libnm-core/nm-vpn-editor-plugin.c
+++ b/libnm-core/nm-vpn-editor-plugin.c
@ -5,7 +5,7 @@
 * Copyright (C) 2015 Red Hat, Inc.
 */

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

 #include "nm-vpn-editor-plugin.h"

--- a/libnm-core/nm-vpn-plugin-info.c
+++ b/libnm-core/nm-vpn-plugin-info.c
@ -3,7 +3,7 @@
 * Copyright (C) 2015 Red Hat, Inc.
 */

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

 #include "nm-vpn-plugin-info.h"

--- a/libnm-core/tests/meson.build
+++ b/libnm-core/tests/meson.build
@ -4,7 +4,7 @@ enum_sources = gnome.mkenums_simple(
  'nm-core-tests-enum-types',
  sources: 'test-general-enums.h',
  identifier_prefix: nm_id_prefix,
-  body_prefix: '#include "nm-default.h"',
+  body_prefix: '#include "libnm-core/nm-default-libnm-core.h"',
 )

 test_units = [
@ -28,8 +28,7 @@ foreach test_unit: test_units
      libnm_base_dep,
    ],
    c_args: [
-      '-DNETWORKMANAGER_COMPILATION_TEST',
-      '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
+      '-DG_LOG_DOMAIN="test"',
    ],
    link_with: libnm_systemd_logging_stub,
  )
--- a/libnm-core/tests/test-compare.c
+++ b/libnm-core/tests/test-compare.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2008 Novell, Inc.
 */

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

 #include <arpa/inet.h>
 #include <netinet/in.h>
--- a/libnm-core/tests/test-crypto.c
+++ b/libnm-core/tests/test-crypto.c
@ -4,7 +4,7 @@
 * Copyright (C) 2007 - 2011 Red Hat, Inc.
 */

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

 #include <unistd.h>
 #include <stdlib.h>
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@ -5,7 +5,7 @@

 #define NM_GLIB_COMPAT_H_TEST

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

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/libnm-core/tests/test-keyfile.c
+++ b/libnm-core/tests/test-keyfile.c
@ -3,7 +3,7 @@
 * Copyright (C) 2015 Red Hat, Inc.
 */

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

 #include "nm-glib-aux/nm-json-aux.h"
 #include "nm-keyfile/nm-keyfile-utils.h"
--- a/libnm-core/tests/test-secrets.c
+++ b/libnm-core/tests/test-secrets.c
@ -3,7 +3,7 @@
 * Copyright (C) 2008 - 2011 Red Hat, Inc.
 */

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

 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
--- a/libnm-core/tests/test-setting.c
+++ b/libnm-core/tests/test-setting.c
@ -3,7 +3,7 @@
 * Copyright (C) 2008 - 2017 Red Hat, Inc.
 */

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

 #include <linux/pkt_sched.h>
 #include <net/if.h>
--- a/libnm-core/tests/test-settings-defaults.c
+++ b/libnm-core/tests/test-settings-defaults.c
@ -3,7 +3,7 @@
 * Copyright (C) 2008 - 2011 Red Hat, Inc.
 */

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

 #include "nm-utils.h"
 #include "nm-setting-8021x.h"
--- 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_LIBNM_CORE
+#if NETWORKMANAGER_COMPILATION < NM_NETWORKMANAGER_COMPILATION_DAEMON
    #error Dont include this header with such NETWORKMANAGER_COMPILATION
 #endif

--- a/shared/nm-meta-setting.c
+++ b/shared/nm-meta-setting.c
@ -3,10 +3,6 @@
 * Copyright (C) 2017 - 2018 Red Hat, Inc.
 */

-#ifdef NETWORKMANAGER_COMPILATION
-    #undef NETWORKMANAGER_COMPILATION
-#endif
-
 #include "nm-glib-aux/nm-default-glib-i18n-lib.h"

 #include "nm-meta-setting.h"