system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: don't add subdirectories to include search path but require qualified include

Browse source 
Keep the include paths clean and separate. We use directories to group source
files together. That makes sense (I guess), but then we should use this
grouping also when including files. Thus require to #include files with their
path relative to "src/".

Also, we build various artifacts from the "src/" tree. Instead of having
individual CFLAGS for each artifact in Makefile.am, the CFLAGS should be
unified. Previously, the CFLAGS for each artifact differ and are inconsistent
in which paths they add to the search path. Fix the inconsistency by just
don't add the paths at all.
This commit is contained in:
Thomas Haller 2016-11-21 00:43:52 +01:00
parent a65762ca33
commit 44ecb41593
129 changed files with 246 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Makefile.am
View file

@ -950,17 +950,6 @@ src_cppflags = \
-I$(top_builddir)/introspection \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
-I$(top_srcdir)/src/devices \
-I$(top_srcdir)/src/dhcp \
-I$(top_srcdir)/src/dns \
-I$(top_srcdir)/src/dnsmasq \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/platform/wifi \
-I$(top_srcdir)/src/ppp \
-I$(top_srcdir)/src/ndisc \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/supplicant \
-I$(top_srcdir)/src/vpn \
\
-DPREFIX=\"$(prefix)\" \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
@ -1429,8 +1418,7 @@ src_libNetworkManager_la_LIBADD = \
check_ltlibraries += src/libNetworkManagerTest.la
src_tests_cppflags = \
$(src_cppflags) \
-I$(top_srcdir)/src/platform/tests
$(src_cppflags)
if REQUIRE_ROOT_TESTS
src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1
@ -1599,7 +1587,6 @@ check_programs += src/settings/plugins/keyfile/tests/test-keyfile
src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
$(src_tests_cppflags) \
-I$(top_srcdir)/src/settings/plugins/keyfile \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\"
@ -1660,8 +1647,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ibft/libnms-ibft-core.la
src_settings_plugins_ibft_cppflags = \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
@ -1703,9 +1688,6 @@ src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/src/settings/plugins/ibft \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \
@ -1751,10 +1733,7 @@ noinst_LTLIBRARIES += \
src_settings_plugins_ifcfg_rh_cppflags = \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
-I$(top_builddir)/src/settings/plugins/ifcfg-rh \
-I$(top_builddir)/src/ \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
@ -1840,7 +1819,6 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
$(src_tests_cppflags) \
-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
-DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\"
@ -2047,7 +2025,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
src_settings_plugins_ifupdown_cppflags = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
@ -2098,8 +2075,6 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/src/settings/plugins/ifupdown \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
@ -2152,8 +2127,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la
src_settings_plugins_ifnet_cppflags = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
@ -2206,9 +2179,6 @@ src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings/plugins/ifnet \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
@ -2249,8 +2219,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
@ -2283,16 +2251,11 @@ if WITH_MODEM_MANAGER_1
src_devices_wwan_cppflags = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/src/devices/wwan \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
@ -2385,17 +2348,11 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-I${top_srcdir}/src/devices/bluetooth \
-I${top_builddir}/src/devices/bluetooth \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
@ -2450,10 +2407,6 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/supplicant \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
@ -2493,9 +2446,7 @@ src_devices_wifi_tests_test_general_CPPFLAGS = \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I${top_srcdir}/src/platform \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/devices/wifi \
-I$(top_builddir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
@ -2521,9 +2472,6 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \
src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/settings \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \

2
src/NetworkManagerUtils.c
View file

@ -30,7 +30,7 @@
#include "nm-setting-ip6-config.h"
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-exported-object.h"
#include "nm-auth-utils.h"

4
src/devices/adsl/nm-atm-manager.c
View file

@ -26,8 +26,8 @@
#include "nm-setting-adsl.h"
#include "nm-device-adsl.h"
#include "nm-device-factory.h"
#include "nm-platform.h"
#include "devices/nm-device-factory.h"
#include "platform/nm-platform.h"
/*****************************************************************************/

6
src/devices/adsl/nm-device-adsl.c
View file

@ -32,8 +32,8 @@
#include <stdlib.h>
#include <string.h>
#include "nm-device-private.h"
#include "nm-platform.h"
#include "devices/nm-device-private.h"
#include "platform/nm-platform.h"
#include "ppp/nm-ppp-manager.h"
#include "ppp/nm-ppp-status.h"
#include "nm-setting-adsl.h"
@ -41,7 +41,7 @@
#include "nmdbus-device-adsl.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF (NMDeviceAdsl);
/*****************************************************************************/

2
src/devices/adsl/nm-device-adsl.h
View file

@ -22,7 +22,7 @@
#ifndef __NETWORKMANAGER_DEVICE_ADSL_H__
#define __NETWORKMANAGER_DEVICE_ADSL_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#define NM_TYPE_DEVICE_ADSL (nm_device_adsl_get_type ())
#define NM_DEVICE_ADSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdsl))

4
src/devices/bluetooth/nm-bluez-device.c
View file

@ -28,8 +28,8 @@
#include "nm-core-internal.h"
#include "nm-bt-error.h"
#include "nm-bluez-common.h"
#include "nm-settings.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "NetworkManagerUtils.h"
#if WITH_BLUEZ5_DUN

6
src/devices/bluetooth/nm-bluez-manager.c
View file

@ -25,16 +25,16 @@
#include <stdlib.h>
#include <gmodule.h>
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-setting-bluetooth.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-bluez4-manager.h"
#include "nm-bluez5-manager.h"
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-device-bt.h"
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-dbus-compat.h"
/*****************************************************************************/

2
src/devices/bluetooth/nm-bluez4-adapter.c
View file

@ -28,7 +28,7 @@
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-core-internal.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
/*****************************************************************************/

2
src/devices/bluetooth/nm-bluez4-manager.c
View file

@ -30,7 +30,7 @@
#include "nm-bluez4-adapter.h"
#include "nm-bluez-common.h"
#include "nm-core-internal.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
/*****************************************************************************/

2
src/devices/bluetooth/nm-bluez5-manager.c
View file

@ -32,7 +32,7 @@
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
/*****************************************************************************/

6
src/devices/bluetooth/nm-device-bt.c
View file

@ -27,7 +27,7 @@
#include "nm-bluez-common.h"
#include "nm-bluez-device.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "ppp/nm-ppp-manager.h"
#include "nm-setting-connection.h"
#include "nm-setting-bluetooth.h"
@ -38,11 +38,11 @@
#include "NetworkManagerUtils.h"
#include "nm-utils.h"
#include "nm-bt-error.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nmdbus-device-bt.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBt);
#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"

5
src/devices/bluetooth/nm-device-bt.h
View file

@ -21,9 +21,10 @@
#ifndef __NETWORKMANAGER_DEVICE_BT_H__
#define __NETWORKMANAGER_DEVICE_BT_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-bluez-device.h"
#include "nm-modem.h"
#include "devices/wwan/nm-modem.h"
#define NM_TYPE_DEVICE_BT (nm_device_bt_get_type ())
#define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt))

2
src/devices/nm-arping-manager.c
View file

@ -22,7 +22,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"

2
src/devices/nm-device-bond.c
View file

@ -27,7 +27,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nm-ip4-config.h"

2
src/devices/nm-device-bridge.c
View file

@ -26,7 +26,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"

14
src/devices/nm-device-ethernet.c
View file

@ -35,18 +35,18 @@
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "NetworkManagerUtils.h"
#include "nm-supplicant-manager.h"
#include "nm-supplicant-interface.h"
#include "nm-supplicant-config.h"
#include "supplicant/nm-supplicant-manager.h"
#include "supplicant/nm-supplicant-interface.h"
#include "supplicant/nm-supplicant-config.h"
#include "ppp/nm-ppp-manager.h"
#include "ppp/nm-ppp-status.h"
#include "nm-platform.h"
#include "nm-platform-utils.h"
#include "platform/nm-platform.h"
#include "platform/nm-platform-utils.h"
#include "nm-dcb.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
#include "nm-config.h"
#include "nm-device-ethernet-utils.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"

2
src/devices/nm-device-factory.c
View file

@ -28,7 +28,7 @@
#include <string.h>
#include <gmodule.h>
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
/*****************************************************************************/

2
src/devices/nm-device-generic.c
View file

@ -23,7 +23,7 @@
#include "nm-device-generic.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
#include "nmdbus-device-generic.h"

2
src/devices/nm-device-infiniband.c
View file

@ -28,7 +28,7 @@
#include "nm-device-private.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"

4
src/devices/nm-device-ip-tunnel.c
View file

@ -30,10 +30,10 @@
#include "nm-device-private.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"

4
src/devices/nm-device-macvlan.c
View file

@ -25,10 +25,10 @@
#include <string.h>
#include "nm-device-private.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-act-request.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-setting-macvlan.h"
#include "nm-setting-wired.h"

2
src/devices/nm-device-tun.c
View file

@ -29,7 +29,7 @@
#include "nm-act-request.h"
#include "nm-device-private.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-setting-tun.h"
#include "nm-core-internal.h"

2
src/devices/nm-device-veth.c
View file

@ -30,7 +30,7 @@
#include "nm-device-veth.h"
#include "nm-device-private.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nmdbus-device-veth.h"

6
src/devices/nm-device-vlan.c
View file

@ -28,14 +28,14 @@
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-manager.h"
#include "nm-core-internal.h"
#include "nmp-object.h"
#include "platform/nmp-object.h"
#include "nmdbus-device-vlan.h"

4
src/devices/nm-device-vxlan.c
View file

@ -26,12 +26,12 @@
#include "nm-device-private.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "nm-device-factory.h"
#include "nm-setting-vxlan.h"
#include "nm-setting-wired.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"

16
src/devices/nm-device.c
View file

@ -39,26 +39,26 @@
#include "nm-device-private.h"
#include "NetworkManagerUtils.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "nm-ndisc.h"
#include "nm-lndp-ndisc.h"
#include "nm-dhcp-manager.h"
#include "platform/nm-platform.h"
#include "ndisc/nm-ndisc.h"
#include "ndisc/nm-lndp-ndisc.h"
#include "dhcp/nm-dhcp-manager.h"
#include "nm-act-request.h"
#include "nm-proxy-config.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "nm-pacrunner-manager.h"
#include "nm-dnsmasq-manager.h"
#include "dnsmasq/nm-dnsmasq-manager.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp6-config.h"
#include "nm-rfkill-manager.h"
#include "nm-firewall-manager.h"
#include "nm-settings-connection.h"
#include "nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "nm-auth-utils.h"
#include "nm-dispatcher.h"
#include "nm-config.h"
#include "nm-dns-manager.h"
#include "dns/nm-dns-manager.h"
#include "nm-core-internal.h"
#include "nm-default-route-manager.h"
#include "nm-route-manager.h"

2
src/devices/nm-lldp-listener.c
View file

@ -25,7 +25,7 @@
#include <net/ethernet.h>
#include <errno.h>
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "systemd/nm-sd.h"

6
src/devices/team/nm-device-team.c
View file

@ -30,15 +30,15 @@
#include <stdlib.h>
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "devices/nm-device-private.h"
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
#include "nm-ip4-config.h"
#include "nm-dbus-compat.h"
#include "nmdbus-device-team.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTeam);
/*****************************************************************************/

2
src/devices/team/nm-device-team.h
View file

@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_DEVICE_TEAM_H__
#define __NETWORKMANAGER_DEVICE_TEAM_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#define NM_TYPE_DEVICE_TEAM (nm_device_team_get_type ())
#define NM_DEVICE_TEAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_TEAM, NMDeviceTeam))

4
src/devices/team/nm-team-factory.c
View file

@ -24,9 +24,9 @@
#include <gmodule.h>
#include "nm-manager.h"
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-device-team.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
/*****************************************************************************/

4
src/devices/tests/test-arping.c
View file

@ -20,8 +20,8 @@
#include "nm-default.h"
#include "nm-arping-manager.h"
#include "test-common.h"
#include "devices/nm-arping-manager.h"
#include "platform/tests/test-common.h"
#define IFACE_VETH0 "nm-test-veth0"
#define IFACE_VETH1 "nm-test-veth1"

4
src/devices/tests/test-lldp.c
View file

@ -26,10 +26,10 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "nm-lldp-listener.h"
#include "devices/nm-lldp-listener.h"
#include "systemd/nm-sd.h"
#include "test-common.h"
#include "platform/tests/test-common.h"
#include "nm-test-utils-core.h"

8
src/devices/wifi/nm-device-olpc-mesh.c
View file

@ -37,23 +37,23 @@
#include <sys/ioctl.h>
#include <errno.h>
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-device-wifi.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-act-request.h"
#include "nm-setting-connection.h"
#include "nm-setting-olpc-mesh.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
/* This is a bug; but we can't really change API now... */
#include "nm-vpn-dbus-interface.h"
#include "nmdbus-device-olpc-mesh.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceOlpcMesh);
/*****************************************************************************/

2
src/devices/wifi/nm-device-olpc-mesh.h
View file

@ -28,7 +28,7 @@
#ifndef __NETWORKMANAGER_DEVICE_OLPC_MESH_H__
#define __NETWORKMANAGER_DEVICE_OLPC_MESH_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#define NM_TYPE_DEVICE_OLPC_MESH (nm_device_olpc_mesh_get_type ())
#define NM_DEVICE_OLPC_MESH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_OLPC_MESH, NMDeviceOlpcMesh))

18
src/devices/wifi/nm-device-wifi.c
View file

@ -29,14 +29,14 @@
#include <errno.h>
#include "nm-common-macros.h"
#include "nm-device.h"
#include "nm-device-private.h"
#include "devices/nm-device.h"
#include "devices/nm-device-private.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-act-request.h"
#include "nm-supplicant-manager.h"
#include "nm-supplicant-interface.h"
#include "nm-supplicant-config.h"
#include "supplicant/nm-supplicant-manager.h"
#include "supplicant/nm-supplicant-interface.h"
#include "supplicant/nm-supplicant-config.h"
#include "nm-setting-connection.h"
#include "nm-setting-wireless.h"
#include "nm-setting-wireless-security.h"
@ -44,16 +44,16 @@
#include "nm-setting-ip4-config.h"
#include "nm-ip4-config.h"
#include "nm-setting-ip6-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-auth-utils.h"
#include "nm-settings-connection.h"
#include "nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "nm-core-internal.h"
#include "nm-config.h"
#include "nmdbus-device-wifi.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceWifi);
/* All of these are in seconds */

2
src/devices/wifi/nm-device-wifi.h
View file

@ -22,7 +22,7 @@
#ifndef __NETWORKMANAGER_DEVICE_WIFI_H__
#define __NETWORKMANAGER_DEVICE_WIFI_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-wifi-ap.h"
#define NM_TYPE_DEVICE_WIFI (nm_device_wifi_get_type ())

6
src/devices/wifi/nm-wifi-factory.c
View file

@ -22,13 +22,13 @@
#include <gmodule.h>
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-setting-wireless.h"
#include "nm-setting-olpc-mesh.h"
#include "nm-device-wifi.h"
#include "nm-device-olpc-mesh.h"
#include "nm-settings-connection.h"
#include "nm-platform.h"
#include "settings/nm-settings-connection.h"
#include "platform/nm-platform.h"
/*****************************************************************************/

2
src/devices/wifi/tests/test-general.c
View file

@ -22,7 +22,7 @@
#include <string.h>
#include "nm-wifi-utils.h"
#include "devices/wifi/nm-wifi-utils.h"
#include "nm-core-internal.h"

6
src/devices/wwan/nm-device-modem.c
View file

@ -25,16 +25,16 @@
#include <string.h>
#include "nm-modem.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "nm-rfkill-manager.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
#include "nm-modem-broadband.h"
#include "NetworkManagerUtils.h"
#include "nm-core-internal.h"
#include "nmdbus-device-modem.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceModem);
/*****************************************************************************/

2
src/devices/wwan/nm-device-modem.h
View file

@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_DEVICE_MODEM_H__
#define __NETWORKMANAGER_DEVICE_MODEM_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-modem.h"
#define NM_TYPE_DEVICE_MODEM (nm_device_modem_get_type ())

4
src/devices/wwan/nm-modem-broadband.c
View file

@ -28,8 +28,8 @@
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "devices/nm-device-private.h"
#include "platform/nm-platform.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"

4
src/devices/wwan/nm-modem-ofono.c
View file

@ -25,9 +25,9 @@
#include <string.h>
#include "nm-core-internal.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "nm-modem.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-ip4-config.h"
#define VARIANT_IS_OF_TYPE_BOOLEAN(v) ((v) != NULL && ( g_variant_is_of_type ((v), G_VARIANT_TYPE_BOOLEAN) ))

4
src/devices/wwan/nm-modem.c
View file

@ -28,10 +28,10 @@
#include <termios.h>
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-setting-connection.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "nm-route-manager.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"

2
src/devices/wwan/nm-modem.h
View file

@ -23,7 +23,7 @@
#define __NETWORKMANAGER_MODEM_H__
#include "ppp/nm-ppp-manager.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#define NM_TYPE_MODEM (nm_modem_get_type ())
#define NM_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM, NMModem))

4
src/devices/wwan/nm-wwan-factory.c
View file

@ -23,12 +23,12 @@
#include <string.h>
#include <gmodule.h>
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-setting-gsm.h"
#include "nm-setting-cdma.h"
#include "nm-modem-manager.h"
#include "nm-device-modem.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
/*****************************************************************************/

2
src/dhcp/nm-dhcp-client.c
View file

@ -33,7 +33,7 @@
#include "NetworkManagerUtils.h"
#include "nm-utils.h"
#include "nm-dhcp-utils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-dhcp-client-logging.h"

2
src/dhcp/nm-dhcp-dhclient-utils.c
View file

@ -28,7 +28,7 @@
#include "nm-dhcp-utils.h"
#include "nm-ip4-config.h"
#include "nm-utils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "NetworkManagerUtils.h"
#define CLIENTID_TAG "send dhcp-client-identifier"

2
src/dhcp/nm-dhcp-systemd.c
View file

@ -31,7 +31,7 @@
#include "nm-utils.h"
#include "nm-dhcp-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-dhcp-client-logging.h"
#include "systemd/nm-sd.h"

2
src/dhcp/nm-dhcp-utils.c
View file

@ -27,7 +27,7 @@
#include "nm-dhcp-utils.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-dhcp-client-logging.h"
#include "nm-core-internal.h"

6
src/dhcp/tests/test-dhcp-dhclient.c
View file

@ -25,11 +25,11 @@
#include <arpa/inet.h>
#include "NetworkManagerUtils.h"
#include "nm-dhcp-dhclient-utils.h"
#include "nm-dhcp-utils.h"
#include "dhcp/nm-dhcp-dhclient-utils.h"
#include "dhcp/nm-dhcp-utils.h"
#include "nm-utils.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-test-utils-core.h"

4
src/dhcp/tests/test-dhcp-utils.c
View file

@ -25,8 +25,8 @@
#include "nm-utils.h"
#include "nm-dhcp-utils.h"
#include "nm-platform.h"
#include "dhcp/nm-dhcp-utils.h"
#include "platform/nm-platform.h"
#include "nm-test-utils-core.h"

2
src/dns/nm-dns-dnsmasq.c
View file

@ -31,7 +31,7 @@
#include <linux/if.h>
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"

4
src/dns/nm-dns-systemd-resolved.c
View file

@ -32,13 +32,13 @@
#include <linux/if.h>
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "nm-bus-manager.h"
#include "nm-manager.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "NetworkManagerUtils.h"
#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1"

2
src/dnsmasq/nm-dnsmasq-utils.c
View file

@ -24,7 +24,7 @@
#include <arpa/inet.h>
#include "nm-dnsmasq-utils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
gboolean

2
src/dnsmasq/nm-dnsmasq-utils.h
View file

@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__
#define __NETWORKMANAGER_DNSMASQ_UTILS_H__
#include "nm-platform.h"
#include "platform/nm-platform.h"
gboolean nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr,
char *out_first,

2
src/dnsmasq/tests/test-dnsmasq-utils.c
View file

@ -22,7 +22,7 @@
#include <arpa/inet.h>
#include "nm-dnsmasq-utils.h"
#include "dnsmasq/nm-dnsmasq-utils.h"
#include "nm-test-utils-core.h"

8
src/main.c
View file

@ -38,14 +38,14 @@
#include "nm-dbus-interface.h"
#include "NetworkManagerUtils.h"
#include "nm-manager.h"
#include "nm-linux-platform.h"
#include "platform/nm-linux-platform.h"
#include "nm-bus-manager.h"
#include "nm-device.h"
#include "nm-dhcp-manager.h"
#include "devices/nm-device.h"
#include "dhcp/nm-dhcp-manager.h"
#include "nm-config.h"
#include "nm-session-monitor.h"
#include "nm-dispatcher.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-auth-manager.h"
#include "nm-core-internal.h"
#include "nm-exported-object.h"

4
src/ndisc/nm-lndp-ndisc.c
View file

@ -31,8 +31,8 @@
#include "nm-ndisc-private.h"
#include "NetworkManagerUtils.h"
#include "nm-platform.h"
#include "nmp-netns.h"
#include "platform/nm-platform.h"
#include "platform/nmp-netns.h"
#define _NMLOG_PREFIX_NAME "ndisc-lndp"

4
src/ndisc/nm-ndisc.c
View file

@ -30,8 +30,8 @@
#include "nm-ndisc-private.h"
#include "nm-utils.h"
#include "nm-platform.h"
#include "nmp-netns.h"
#include "platform/nm-platform.h"
#include "platform/nmp-netns.h"
#define _NMLOG_PREFIX_NAME "ndisc"

6
src/ndisc/tests/test-ndisc-fake.c
View file

@ -23,10 +23,10 @@
#include <string.h>
#include <syslog.h>
#include "nm-ndisc.h"
#include "nm-fake-ndisc.h"
#include "ndisc/nm-ndisc.h"
#include "ndisc/nm-fake-ndisc.h"
#include "nm-fake-platform.h"
#include "platform/nm-fake-platform.h"
#include "nm-test-utils-core.h"

6
src/ndisc/tests/test-ndisc-linux.c
View file

@ -23,10 +23,10 @@
#include <string.h>
#include <syslog.h>
#include "nm-ndisc.h"
#include "nm-lndp-ndisc.h"
#include "ndisc/nm-ndisc.h"
#include "ndisc/nm-lndp-ndisc.h"
#include "nm-linux-platform.h"
#include "platform/nm-linux-platform.h"
#include "nm-test-utils-core.h"

4
src/nm-act-request.c
View file

@ -30,9 +30,9 @@
#include "nm-setting-wireless-security.h"
#include "nm-setting-8021x.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-active-connection.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
#include "nm-auth-subject.h"
typedef struct {

4
src/nm-active-connection.c
View file

@ -24,8 +24,8 @@
#include "nm-common-macros.h"
#include "nm-dbus-interface.h"
#include "nm-device.h"
#include "nm-settings-connection.h"
#include "devices/nm-device.h"
#include "settings/nm-settings-connection.h"
#include "nm-simple-connection.h"
#include "nm-auth-utils.h"
#include "nm-auth-subject.h"

2
src/nm-audit-manager.c
View file

@ -30,7 +30,7 @@
#include "nm-auth-subject.h"
#include "nm-config.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
/*****************************************************************************/

2
src/nm-audit-manager.h
View file

@ -22,7 +22,7 @@
#define __NM_AUDIT_MANAGER_H__
#include "nm-connection.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-types.h"
#define NM_TYPE_AUDIT_MANAGER (nm_audit_manager_get_type ())

2
src/nm-checkpoint-manager.c
View file

@ -25,7 +25,7 @@
#include "nm-checkpoint.h"
#include "nm-connection.h"
#include "nm-core-utils.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-exported-object.h"
#include "nm-manager.h"
#include "nm-utils.h"

6
src/nm-checkpoint.c
View file

@ -27,10 +27,10 @@
#include "nm-auth-subject.h"
#include "nm-core-utils.h"
#include "nm-dbus-interface.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-manager.h"
#include "nm-settings.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "nm-simple-connection.h"
#include "nm-utils.h"
#include "nmdbus-checkpoint.h"

2
src/nm-config-data.c
View file

@ -26,7 +26,7 @@
#include <string.h>
#include "nm-config.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-core-internal.h"
#include "nm-keyfile-internal.h"

2
src/nm-config.c
View file

@ -27,7 +27,7 @@
#include <stdio.h>
#include "nm-utils.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "NetworkManagerUtils.h"
#include "nm-core-internal.h"
#include "nm-keyfile-internal.h"

2
src/nm-dcb.c
View file

@ -24,7 +24,7 @@
#include <string.h>
#include "nm-dcb.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "NetworkManagerUtils.h"
static const char *helper_names[] = { "dcbtool", "fcoeadm" };

6
src/nm-default-route-manager.c
View file

@ -25,9 +25,9 @@
#include <string.h>
#include "nm-device.h"
#include "nm-vpn-connection.h"
#include "nm-platform.h"
#include "devices/nm-device.h"
#include "vpn/nm-vpn-connection.h"
#include "platform/nm-platform.h"
#include "nm-manager.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"

6
src/nm-dispatcher.c
View file

@ -29,15 +29,15 @@
#include "NetworkManagerUtils.h"
#include "nm-utils.h"
#include "nm-connectivity.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp6-config.h"
#include "nm-proxy-config.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "nm-manager.h"
#include "nm-settings-connection.h"
#include "nm-platform.h"
#include "settings/nm-settings-connection.h"
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
#define CALL_TIMEOUT (1000 * 60 * 10) /* 10 minutes for all scripts */

2
src/nm-exported-object.c
View file

@ -27,7 +27,7 @@
#include "nm-bus-manager.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-active-connection.h"
#include "nmdbus-device-statistics.h"

8
src/nm-iface-helper.c
View file

@ -38,10 +38,10 @@ extern unsigned int if_nametoindex (const char *__ifname);
#include "main-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-linux-platform.h"
#include "nm-dhcp-manager.h"
#include "nm-ndisc.h"
#include "nm-lndp-ndisc.h"
#include "platform/nm-linux-platform.h"
#include "dhcp/nm-dhcp-manager.h"
#include "ndisc/nm-ndisc.h"
#include "ndisc/nm-lndp-ndisc.h"
#include "nm-utils.h"
#include "nm-setting-ip6-config.h"
#include "systemd/nm-sd.h"

4
src/nm-ip4-config.c
View file

@ -27,8 +27,8 @@
#include <arpa/inet.h>
#include "nm-utils.h"
#include "nm-platform.h"
#include "nm-platform-utils.h"
#include "platform/nm-platform.h"
#include "platform/nm-platform-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-route-manager.h"
#include "nm-core-internal.h"

4
src/nm-ip6-config.c
View file

@ -27,8 +27,8 @@
#include <arpa/inet.h>
#include "nm-utils.h"
#include "nm-platform.h"
#include "nm-platform-utils.h"
#include "platform/nm-platform.h"
#include "platform/nm-platform-utils.h"
#include "nm-route-manager.h"
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"

16
src/nm-manager.c
View file

@ -31,18 +31,18 @@
#include "nm-common-macros.h"
#include "nm-bus-manager.h"
#include "nm-vpn-manager.h"
#include "nm-device.h"
#include "nm-device-generic.h"
#include "nm-platform.h"
#include "vpn/nm-vpn-manager.h"
#include "devices/nm-device.h"
#include "devices/nm-device-generic.h"
#include "platform/nm-platform.h"
#include "nm-rfkill-manager.h"
#include "nm-dhcp-manager.h"
#include "nm-settings.h"
#include "nm-settings-connection.h"
#include "dhcp/nm-dhcp-manager.h"
#include "settings/nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "nm-auth-utils.h"
#include "nm-auth-manager.h"
#include "NetworkManagerUtils.h"
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-sleep-monitor.h"
#include "nm-connectivity.h"
#include "nm-policy.h"

2
src/nm-manager.h
View file

@ -23,7 +23,7 @@
#define __NETWORKMANAGER_MANAGER_H__
#include "nm-exported-object.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
#define NM_TYPE_MANAGER (nm_manager_get_type ())
#define NM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager))

2
src/nm-pacrunner-manager.c
View file

@ -23,7 +23,7 @@
#include "nm-pacrunner-manager.h"
#include "nm-utils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-proxy-config.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"

12
src/nm-policy.c
View file

@ -30,21 +30,21 @@
#include "NetworkManagerUtils.h"
#include "nm-act-request.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-default-route-manager.h"
#include "nm-setting-ip4-config.h"
#include "nm-setting-connection.h"
#include "nm-platform.h"
#include "nm-dns-manager.h"
#include "nm-vpn-manager.h"
#include "platform/nm-platform.h"
#include "dns/nm-dns-manager.h"
#include "vpn/nm-vpn-manager.h"
#include "nm-auth-utils.h"
#include "nm-firewall-manager.h"
#include "nm-dispatcher.h"
#include "nm-utils.h"
#include "nm-core-internal.h"
#include "nm-manager.h"
#include "nm-settings.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp6-config.h"

4
src/nm-route-manager.c
View file

@ -24,8 +24,8 @@
#include <string.h>
#include "nm-platform.h"
#include "nmp-object.h"
#include "platform/nm-platform.h"
#include "platform/nmp-object.h"
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"

2
src/platform/tests/monitor.c
View file

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <syslog.h>
#include "nm-linux-platform.h"
#include "platform/nm-linux-platform.h"
#include "nm-test-utils-core.h"

6
src/platform/tests/test-common.h
View file

@ -4,9 +4,9 @@
#include <string.h>
#include <arpa/inet.h>
#include "nm-platform.h"
#include "nm-fake-platform.h"
#include "nm-linux-platform.h"
#include "platform/nm-platform.h"
#include "platform/nm-fake-platform.h"
#include "platform/nm-linux-platform.h"
#include "nm-test-utils-core.h"

4
src/platform/tests/test-general.c
View file

@ -22,8 +22,8 @@
#include <linux/rtnetlink.h>
#include "nm-platform-utils.h"
#include "nm-linux-platform.h"
#include "platform/nm-platform-utils.h"
#include "platform/nm-linux-platform.h"
#include "nm-test-utils-core.h"

6
src/platform/tests/test-link.c
View file

@ -25,9 +25,9 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "nmp-object.h"
#include "nmp-netns.h"
#include "nm-platform-utils.h"
#include "platform/nmp-object.h"
#include "platform/nmp-netns.h"
#include "platform/nm-platform-utils.h"
#include "test-common.h"
#include "nm-test-utils-core.h"

2
src/platform/tests/test-nmp-object.c
View file

@ -20,7 +20,7 @@
#include "nm-default.h"
#include "nmp-object.h"
#include "platform/nmp-object.h"
#include "nm-test-utils-core.h"

2
src/platform/tests/test-route.c
View file

@ -23,7 +23,7 @@
#include <linux/rtnetlink.h>
#include "nm-core-utils.h"
#include "nm-platform-utils.h"
#include "platform/nm-platform-utils.h"
#include "test-common.h"

2
src/platform/wifi/wifi-utils-nl80211.c
View file

@ -34,7 +34,7 @@
#include "wifi-utils-private.h"
#include "wifi-utils-nl80211.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"

2
src/platform/wifi/wifi-utils-wext.c
View file

@ -31,7 +31,7 @@
#include "wifi-utils-private.h"
#include "wifi-utils-wext.h"
#include "nm-utils.h"
#include "nm-platform-utils.h"
#include "platform/nm-platform-utils.h"
/* Hacks necessary to #include wireless.h; yay for WEXT */
#ifndef __user

2
src/ppp/nm-ppp-manager.c
View file

@ -44,7 +44,7 @@
#include <linux/if_ppp.h>
#include "NetworkManagerUtils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"

2
src/settings/nm-settings.c
View file

@ -62,7 +62,7 @@
#include "nm-utils.h"
#include "nm-core-internal.h"
#include "nm-device-ethernet.h"
#include "devices/nm-device-ethernet.h"
#include "nm-settings-connection.h"
#include "nm-settings-plugin.h"
#include "nm-bus-manager.h"

2
src/settings/plugins/ibft/nms-ibft-connection.h
View file

@ -21,7 +21,7 @@
#ifndef __NMS_IBFT_CONNECTION_H__
#define __NMS_IBFT_CONNECTION_H__
#include <nm-settings-connection.h>
#include "settings/nm-settings-connection.h"
#define NMS_TYPE_IBFT_CONNECTION (nms_ibft_connection_get_type ())
#define NMS_IBFT_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMS_TYPE_IBFT_CONNECTION, NMSIbftConnection))

2
src/settings/plugins/ibft/nms-ibft-plugin.c
View file

@ -28,7 +28,7 @@
#include <gmodule.h>
#include "nm-setting-connection.h"
#include "nm-settings-plugin.h"
#include "settings/nm-settings-plugin.h"
#include "NetworkManagerUtils.h"
#include "nms-ibft-reader.h"

2
src/settings/plugins/ibft/nms-ibft-reader.c
View file

@ -34,7 +34,7 @@
#include <unistd.h>
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "NetworkManagerUtils.h"
/*****************************************************************************/

2
src/settings/plugins/ibft/tests/test-ibft.c
View file

@ -32,7 +32,7 @@
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
#include "nms-ibft-reader.h"
#include "settings/plugins/ibft/nms-ibft-reader.h"
#include "nm-test-utils-core.h"

4
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
View file

@ -35,8 +35,8 @@
#include "nm-setting-pppoe.h"
#include "nm-setting-wireless-security.h"
#include "nm-setting-8021x.h"
#include "nm-platform.h"
#include "nm-inotify-helper.h"
#include "platform/nm-platform.h"
#include "settings/nm-inotify-helper.h"
#include "nm-config.h"
#include "nms-ifcfg-rh-common.h"

2
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h
View file

@ -22,7 +22,7 @@
#define __NETWORKMANAGER_IFCFG_CONNECTION_H__
#include "nm-dbus-interface.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
#define NM_TYPE_IFCFG_CONNECTION (nm_ifcfg_connection_get_type ())
#define NM_IFCFG_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFCFG_CONNECTION, NMIfcfgConnection))

4
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
View file

@ -34,7 +34,7 @@
#include "nm-dbus-compat.h"
#include "nm-setting-connection.h"
#include "nm-settings-plugin.h"
#include "settings/nm-settings-plugin.h"
#include "nm-config.h"
#include "NetworkManagerUtils.h"
#include "nm-exported-object.h"
@ -46,7 +46,7 @@
#include "nms-ifcfg-rh-utils.h"
#include "shvar.h"
#include "nmdbus-ifcfg-rh.h"
#include "settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h"
#define IFCFGRH1_DBUS_SERVICE_NAME "com.redhat.ifcfgrh1"
#define IFCFGRH1_DBUS_OBJECT_PATH "/com/redhat/ifcfgrh1"

2
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -53,7 +53,7 @@
#include "nm-core-internal.h"
#include "nm-utils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "NetworkManagerUtils.h"
#include "nms-ifcfg-rh-common.h"

8
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -50,10 +50,10 @@
#include "NetworkManagerUtils.h"
#include "nms-ifcfg-rh-common.h"
#include "nms-ifcfg-rh-reader.h"
#include "nms-ifcfg-rh-writer.h"
#include "nms-ifcfg-rh-utils.h"
#include "settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h"
#include "settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h"
#include "settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h"
#include "settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h"
#include "nm-test-utils-core.h"

Some files were not shown because too many files have changed in this diff Show more