fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 11:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Thomas Haller 2021-02-04 16:04:15 +01:00
parent a38afcb1d9
commit 78629830c8
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
84 changed files with 112 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.am
View file

@ -593,7 +593,6 @@ libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \
-DG_LOG_DOMAIN=\""libnm"\" \ -DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
$(NULL) $(NULL)
libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \ 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) \ $(GLIB_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \
-DG_LOG_DOMAIN=\""libnm"\" \ -DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
$(NULL) $(NULL)
libnm_core_nm_keyfile_libnm_keyfile_la_SOURCES = \ 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-core-types-internal.h \
libnm-core/nm-crypto-impl.h \ libnm-core/nm-crypto-impl.h \
libnm-core/nm-crypto.h \ libnm-core/nm-crypto.h \
libnm-core/nm-default-libnm-core.h \
libnm-core/nm-property-compare.h \ libnm-core/nm-property-compare.h \
libnm-core/nm-setting-private.h \ libnm-core/nm-setting-private.h \
libnm-core/nm-team-utils.h \ libnm-core/nm-team-utils.h \
@ -1219,7 +1218,7 @@ GLIB_GENERATED += \
$(libnm_core_lib_c_mkenums) $(libnm_core_lib_c_mkenums)
nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real) 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.h.stamp: libnm-core/.dirstamp
libnm-core/nm-core-enum-types.c.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 = \ libnm_core_libnm_core_la_CPPFLAGS = \
$(dflt_cppflags_libnm_core) \ $(dflt_cppflags_libnm_core) \
-DG_LOG_DOMAIN=\""libnm"\" \ -DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
$(NULL) $(NULL)
libnm_core_libnm_core_la_SOURCES = \ 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.h \
libnm-core/tests/nm-core-tests-enum-types.c 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_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.h.stamp: libnm-core/tests/.dirstamp
libnm-core/tests/nm-core-tests-enum-types.c.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$(srcdir)/libnm-core/tests \
-I$(builddir)/libnm-core/tests \ -I$(builddir)/libnm-core/tests \
$(dflt_cppflags_libnm_core) \ $(dflt_cppflags_libnm_core) \
-DNETWORKMANAGER_COMPILATION_TEST \ -DG_LOG_DOMAIN=\""test"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
$(SANITIZER_EXEC_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \
$(NULL) $(NULL)

1
docs/libnm/Makefile.am
View file

@ -40,6 +40,7 @@ IGNORE_HFILES= \
nm-crypto-impl.h \ nm-crypto-impl.h \
nm-crypto.h \ nm-crypto.h \
nm-dbus-helpers.h \ nm-dbus-helpers.h \
nm-default-libnm-core.h \
nm-device-private.h \ nm-device-private.h \
nm-dhcp4-config.h \ nm-dhcp4-config.h \
nm-dhcp6-config.h \ nm-dhcp6-config.h \

1
docs/libnm/meson.build
View file

@ -13,6 +13,7 @@ private_headers = [
'nm-crypto-impl.h', 'nm-crypto-impl.h',
'nm-crypto.h', 'nm-crypto.h',
'nm-dbus-helpers.h', 'nm-dbus-helpers.h',
'nm-default-libnm-core.h',
'nm-device-private.h', 'nm-device-private.h',
'nm-dhcp4-config.h', 'nm-dhcp4-config.h',
'nm-dhcp6-config.h', 'nm-dhcp6-config.h',

14
libnm-core/meson.build
View file

@ -79,7 +79,7 @@ libnm_core_enum_sources = gnome.mkenums_simple(
'nm-core-enum-types', 'nm-core-enum-types',
sources: libnm_core_headers + [nm_version_macro_header], sources: libnm_core_headers + [nm_version_macro_header],
identifier_prefix: nm_id_prefix, 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_header: true,
install_dir: libnm_pkgincludedir, install_dir: libnm_pkgincludedir,
) )
@ -95,8 +95,7 @@ libnm_libnm_core_intern = static_library(
libnm_base_dep, libnm_base_dep,
], ],
c_args: [ c_args: [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name), '-DG_LOG_DOMAIN="libnm"',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
], ],
) )
@ -118,8 +117,7 @@ libnm_crypto = static_library(
libnm_glib_aux_dep, libnm_glib_aux_dep,
], ],
c_args: [ c_args: [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name), '-DG_LOG_DOMAIN="libnm"',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
], ],
) )
@ -203,8 +201,7 @@ libnm_core = static_library(
uuid_dep, uuid_dep,
], ],
c_args: [ c_args: [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name), '-DG_LOG_DOMAIN="libnm"',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
], ],
link_with: [ link_with: [
libnm_crypto, libnm_crypto,
@ -251,8 +248,7 @@ libnm_keyfile = static_library(
sources: nm_keyfile_source + [libnm_core_enum_sources[1]], sources: nm_keyfile_source + [libnm_core_enum_sources[1]],
dependencies: libnm_glib_aux_dep, dependencies: libnm_glib_aux_dep,
c_args: [ c_args: [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name), '-DG_LOG_DOMAIN="libnm"',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
], ],
link_with: libnm_libnm_core_intern, link_with: libnm_libnm_core_intern,
) )

2
libnm-core/nm-connection.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-connection.h" #include "nm-connection.h"

2
libnm-core/nm-crypto-gnutls.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2015 Red Hat, Inc. * Copyright (C) 2007 - 2015 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-crypto-impl.h" #include "nm-crypto-impl.h"

2
libnm-core/nm-crypto-nss.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2009 Red Hat, Inc. * Copyright (C) 2007 - 2009 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-crypto-impl.h" #include "nm-crypto-impl.h"

2
libnm-core/nm-crypto.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2018 Red Hat, Inc. * Copyright (C) 2007 - 2018 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-crypto.h" #include "nm-crypto.h"

2
libnm-core/nm-dbus-utils.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2015 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"

22
libnm-core/nm-default-libnm-core.h Normal file
View file

@ -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__ */

2
libnm-core/nm-errors.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2004 - 2014 Red Hat, Inc. * Copyright (C) 2004 - 2014 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-errors.h" #include "nm-errors.h"

2
libnm-core/nm-keyfile/nm-keyfile-utils.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2010 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-keyfile-utils.h" #include "nm-keyfile-utils.h"

2
libnm-core/nm-keyfile/nm-keyfile.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2008 - 2017 Red Hat, Inc. * Copyright (C) 2008 - 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-keyfile-internal.h" #include "nm-keyfile-internal.h"

2
libnm-core/nm-libnm-core-intern/nm-auth-subject.c
View file

@ -11,7 +11,7 @@
* makes requests, like process identifier and user UID. * 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" #include "nm-auth-subject.h"

2
libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* 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" #include "nm-libnm-core-utils.h"

2
libnm-core/nm-property-compare.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-property-compare.h" #include "nm-property-compare.h"

2
libnm-core/nm-setting-6lowpan.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2018 Red Hat, Inc. * Copyright (C) 2018 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-6lowpan.h" #include "nm-setting-6lowpan.h"

2
libnm-core/nm-setting-8021x.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-8021x.h" #include "nm-setting-8021x.h"

2
libnm-core/nm-setting-adsl.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2011 - 2013 Red Hat, Inc. * Copyright (C) 2011 - 2013 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-adsl.h" #include "nm-setting-adsl.h"

2
libnm-core/nm-setting-bluetooth.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-bluetooth.h" #include "nm-setting-bluetooth.h"

2
libnm-core/nm-setting-bond.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2011 - 2013 Red Hat, Inc. * Copyright (C) 2011 - 2013 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-bond.h" #include "nm-setting-bond.h"

2
libnm-core/nm-setting-bridge-port.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2012 - 2013 Red Hat, Inc. * 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" #include "nm-setting-bridge-port.h"

2
libnm-core/nm-setting-bridge.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2011 - 2017 Red Hat, Inc. * Copyright (C) 2011 - 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-bridge.h" #include "nm-setting-bridge.h"

2
libnm-core/nm-setting-cdma.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2007 - 2013 Red Hat, Inc. * Copyright (C) 2007 - 2013 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-cdma.h" #include "nm-setting-cdma.h"

2
libnm-core/nm-setting-connection.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-connection.h" #include "nm-setting-connection.h"

2
libnm-core/nm-setting-dcb.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2013 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-dcb.h" #include "nm-setting-dcb.h"

2
libnm-core/nm-setting-dummy.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-dummy.h" #include "nm-setting-dummy.h"

2
libnm-core/nm-setting-ethtool.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2018 Red Hat, Inc. * Copyright (C) 2018 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ethtool.h" #include "nm-setting-ethtool.h"

2
libnm-core/nm-setting-generic.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2013 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-generic.h" #include "nm-setting-generic.h"

2
libnm-core/nm-setting-gsm.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-gsm.h" #include "nm-setting-gsm.h"

2
libnm-core/nm-setting-hostname.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2020 Red Hat, Inc. * Copyright (C) 2020 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-hostname.h" #include "nm-setting-hostname.h"

2
libnm-core/nm-setting-infiniband.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2011 - 2013 Red Hat, Inc. * Copyright (C) 2011 - 2013 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-infiniband.h" #include "nm-setting-infiniband.h"

2
libnm-core/nm-setting-ip-config.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ip-config.h" #include "nm-setting-ip-config.h"

2
libnm-core/nm-setting-ip-tunnel.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2015 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ip-tunnel.h" #include "nm-setting-ip-tunnel.h"

2
libnm-core/nm-setting-ip4-config.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2014 Red Hat, Inc. * Copyright (C) 2014 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ip4-config.h" #include "nm-setting-ip4-config.h"

2
libnm-core/nm-setting-ip6-config.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2007 - 2014 Red Hat, Inc. * 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" #include "nm-setting-ip6-config.h"

2
libnm-core/nm-setting-macsec.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-macsec.h" #include "nm-setting-macsec.h"

2
libnm-core/nm-setting-macvlan.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2015 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-macvlan.h" #include "nm-setting-macvlan.h"

2
libnm-core/nm-setting-match.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2018 Red Hat, Inc. * Copyright (C) 2018 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-match.h" #include "nm-setting-match.h"

2
libnm-core/nm-setting-olpc-mesh.c
View file

@ -5,7 +5,7 @@
* Copyright (C) 2009 One Laptop per Child * 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" #include "nm-setting-olpc-mesh.h"

2
libnm-core/nm-setting-ovs-bridge.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ovs-bridge.h" #include "nm-setting-ovs-bridge.h"

2
libnm-core/nm-setting-ovs-dpdk.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2019 Red Hat, Inc. * Copyright (C) 2019 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ovs-dpdk.h" #include "nm-setting-ovs-dpdk.h"

2
libnm-core/nm-setting-ovs-external-ids.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 - 2020 Red Hat, Inc. * 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" #include "nm-setting-ovs-external-ids.h"

2
libnm-core/nm-setting-ovs-interface.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ovs-interface.h" #include "nm-setting-ovs-interface.h"

2
libnm-core/nm-setting-ovs-patch.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ovs-patch.h" #include "nm-setting-ovs-patch.h"

2
libnm-core/nm-setting-ovs-port.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ovs-port.h" #include "nm-setting-ovs-port.h"

2
libnm-core/nm-setting-ppp.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-ppp.h" #include "nm-setting-ppp.h"

2
libnm-core/nm-setting-pppoe.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-pppoe.h" #include "nm-setting-pppoe.h"

2
libnm-core/nm-setting-proxy.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2016 Atul Anand <atulhjp@gmail.com>. * 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" #include "nm-setting-proxy.h"

2
libnm-core/nm-setting-serial.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-serial.h" #include "nm-setting-serial.h"

2
libnm-core/nm-setting-sriov.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2018 Red Hat, Inc. * Copyright (C) 2018 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-sriov.h" #include "nm-setting-sriov.h"

2
libnm-core/nm-setting-tc-config.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-tc-config.h" #include "nm-setting-tc-config.h"

2
libnm-core/nm-setting-team-port.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> * 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" #include "nm-setting-team-port.h"

2
libnm-core/nm-setting-team.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> * 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" #include "nm-setting-team.h"

2
libnm-core/nm-setting-tun.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2015 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-tun.h" #include "nm-setting-tun.h"

2
libnm-core/nm-setting-user.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc. * Copyright (C) 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-user.h" #include "nm-setting-user.h"

2
libnm-core/nm-setting-veth.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2020 Red Hat, Inc. * Copyright (C) 2020 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-veth.h" #include "nm-setting-veth.h"

2
libnm-core/nm-setting-vlan.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2011 - 2014 Red Hat, Inc. * Copyright (C) 2011 - 2014 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-vlan.h" #include "nm-setting-vlan.h"

2
libnm-core/nm-setting-vpn.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-vpn.h" #include "nm-setting-vpn.h"

2
libnm-core/nm-setting-vrf.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* 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" #include "nm-setting-vrf.h"

2
libnm-core/nm-setting-vxlan.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2015 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-vxlan.h" #include "nm-setting-vxlan.h"

2
libnm-core/nm-setting-wifi-p2p.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2019 Red Hat, Inc. * Copyright (C) 2019 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-wifi-p2p.h" #include "nm-setting-wifi-p2p.h"

2
libnm-core/nm-setting-wimax.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2009 Novell, Inc. * Copyright (C) 2009 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-wimax.h" #include "nm-setting-wimax.h"

2
libnm-core/nm-setting-wired.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-wired.h" #include "nm-setting-wired.h"

2
libnm-core/nm-setting-wireguard.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2018 - 2019 Red Hat, Inc. * Copyright (C) 2018 - 2019 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-wireguard.h" #include "nm-setting-wireguard.h"

2
libnm-core/nm-setting-wireless-security.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-wireless-security.h" #include "nm-setting-wireless-security.h"

2
libnm-core/nm-setting-wireless.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting-wireless.h" #include "nm-setting-wireless.h"

2
libnm-core/nm-setting-wpan.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk> * 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" #include "nm-setting-wpan.h"

2
libnm-core/nm-setting.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-setting.h" #include "nm-setting.h"

2
libnm-core/nm-simple-connection.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2014 Red Hat, Inc. * Copyright (C) 2007 - 2014 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-simple-connection.h" #include "nm-simple-connection.h"

2
libnm-core/nm-team-utils.c
View file

@ -5,7 +5,7 @@
#define NM_VALUE_TYPE_DEFINE_FUNCTIONS #define NM_VALUE_TYPE_DEFINE_FUNCTIONS
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-team-utils.h" #include "nm-team-utils.h"

2
libnm-core/nm-utils.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2005 - 2017 Red Hat, Inc. * Copyright (C) 2005 - 2017 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-utils.h" #include "nm-utils.h"

2
libnm-core/nm-vpn-editor-plugin.c
View file

@ -5,7 +5,7 @@
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2015 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-vpn-editor-plugin.h" #include "nm-vpn-editor-plugin.h"

2
libnm-core/nm-vpn-plugin-info.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2015 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include "nm-vpn-plugin-info.h" #include "nm-vpn-plugin-info.h"

5
libnm-core/tests/meson.build
View file

@ -4,7 +4,7 @@ enum_sources = gnome.mkenums_simple(
'nm-core-tests-enum-types', 'nm-core-tests-enum-types',
sources: 'test-general-enums.h', sources: 'test-general-enums.h',
identifier_prefix: nm_id_prefix, identifier_prefix: nm_id_prefix,
body_prefix: '#include "nm-default.h"', body_prefix: '#include "libnm-core/nm-default-libnm-core.h"',
) )
test_units = [ test_units = [
@ -28,8 +28,7 @@ foreach test_unit: test_units
libnm_base_dep, libnm_base_dep,
], ],
c_args: [ c_args: [
'-DNETWORKMANAGER_COMPILATION_TEST', '-DG_LOG_DOMAIN="test"',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
], ],
link_with: libnm_systemd_logging_stub, link_with: libnm_systemd_logging_stub,
) )

2
libnm-core/tests/test-compare.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>

2
libnm-core/tests/test-crypto.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2007 - 2011 Red Hat, Inc. * Copyright (C) 2007 - 2011 Red Hat, Inc.
*/ */
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>

2
libnm-core/tests/test-general.c
View file

@ -5,7 +5,7 @@
#define NM_GLIB_COMPAT_H_TEST #define NM_GLIB_COMPAT_H_TEST
#include "nm-default.h" #include "libnm-core/nm-default-libnm-core.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
libnm-core/tests/test-keyfile.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2015 Red Hat, Inc. * 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-glib-aux/nm-json-aux.h"
#include "nm-keyfile/nm-keyfile-utils.h" #include "nm-keyfile/nm-keyfile-utils.h"

2
libnm-core/tests/test-secrets.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc. * 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-8021x.h"
#include "nm-setting-cdma.h" #include "nm-setting-cdma.h"

2
libnm-core/tests/test-setting.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2008 - 2017 Red Hat, Inc. * 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 <linux/pkt_sched.h>
#include <net/if.h> #include <net/if.h>

2
libnm-core/tests/test-settings-defaults.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc. * 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-utils.h"
#include "nm-setting-8021x.h" #include "nm-setting-8021x.h"

2
shared/nm-default.h
View file

@ -22,7 +22,7 @@
#error Define NETWORKMANAGER_COMPILATION accordingly #error Define NETWORKMANAGER_COMPILATION accordingly
#endif #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 #error Dont include this header with such NETWORKMANAGER_COMPILATION
#endif #endif

4
shared/nm-meta-setting.c
View file

@ -3,10 +3,6 @@
* Copyright (C) 2017 - 2018 Red Hat, Inc. * 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-glib-aux/nm-default-glib-i18n-lib.h"
#include "nm-meta-setting.h" #include "nm-meta-setting.h"