Commit 44ecb415 authored by Thomas Haller's avatar Thomas Haller
Browse files

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

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.
parent a65762ca
...@@ -950,17 +950,6 @@ src_cppflags = \ ...@@ -950,17 +950,6 @@ src_cppflags = \
-I$(top_builddir)/introspection \ -I$(top_builddir)/introspection \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_builddir)/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)\" \ -DPREFIX=\"$(prefix)\" \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
...@@ -1429,8 +1418,7 @@ src_libNetworkManager_la_LIBADD = \ ...@@ -1429,8 +1418,7 @@ src_libNetworkManager_la_LIBADD = \
check_ltlibraries += src/libNetworkManagerTest.la check_ltlibraries += src/libNetworkManagerTest.la
src_tests_cppflags = \ src_tests_cppflags = \
$(src_cppflags) \ $(src_cppflags)
-I$(top_srcdir)/src/platform/tests
if REQUIRE_ROOT_TESTS if REQUIRE_ROOT_TESTS
src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1 src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1
...@@ -1599,7 +1587,6 @@ check_programs += src/settings/plugins/keyfile/tests/test-keyfile ...@@ -1599,7 +1587,6 @@ check_programs += src/settings/plugins/keyfile/tests/test-keyfile
src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
$(src_tests_cppflags) \ $(src_tests_cppflags) \
-I$(top_srcdir)/src/settings/plugins/keyfile \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \ -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/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 ...@@ -1660,8 +1647,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ibft/libnms-ibft-core.la
src_settings_plugins_ibft_cppflags = \ src_settings_plugins_ibft_cppflags = \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
...@@ -1703,9 +1688,6 @@ src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \ ...@@ -1703,9 +1688,6 @@ src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/src/settings/plugins/ibft \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \ -DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \
...@@ -1751,10 +1733,7 @@ noinst_LTLIBRARIES += \ ...@@ -1751,10 +1733,7 @@ noinst_LTLIBRARIES += \
src_settings_plugins_ifcfg_rh_cppflags = \ src_settings_plugins_ifcfg_rh_cppflags = \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \ -I$(top_builddir)/src/ \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
-I$(top_builddir)/src/settings/plugins/ifcfg-rh \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
...@@ -1840,7 +1819,6 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \ ...@@ -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_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
$(src_tests_cppflags) \ $(src_tests_cppflags) \
-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
-DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \ -DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/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 ...@@ -2047,7 +2025,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
src_settings_plugins_ifupdown_cppflags = \ src_settings_plugins_ifupdown_cppflags = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
...@@ -2098,8 +2075,6 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \ ...@@ -2098,8 +2075,6 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/src/settings/plugins/ifupdown \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
...@@ -2152,8 +2127,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la ...@@ -2152,8 +2127,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la
src_settings_plugins_ifnet_cppflags = \ src_settings_plugins_ifnet_cppflags = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
...@@ -2206,9 +2179,6 @@ src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \ ...@@ -2206,9 +2179,6 @@ src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \ -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"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
...@@ -2249,8 +2219,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \ ...@@ -2249,8 +2219,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \ -I${top_builddir}/introspection \
-I${top_srcdir}/shared \ -I${top_srcdir}/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
...@@ -2283,16 +2251,11 @@ if WITH_MODEM_MANAGER_1 ...@@ -2283,16 +2251,11 @@ if WITH_MODEM_MANAGER_1
src_devices_wwan_cppflags = \ src_devices_wwan_cppflags = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/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_builddir}/introspection \
-I${top_srcdir}/shared \ -I${top_srcdir}/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/src/devices/wwan \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
...@@ -2385,17 +2348,11 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \ ...@@ -2385,17 +2348,11 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/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_builddir}/introspection \
-I${top_srcdir}/shared \ -I${top_srcdir}/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_srcdir}/src/devices/bluetooth \
-I${top_builddir}/src/devices/bluetooth \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
...@@ -2450,10 +2407,6 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ ...@@ -2450,10 +2407,6 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/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_builddir}/introspection \
-I${top_srcdir}/shared \ -I${top_srcdir}/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
...@@ -2493,9 +2446,7 @@ src_devices_wifi_tests_test_general_CPPFLAGS = \ ...@@ -2493,9 +2446,7 @@ src_devices_wifi_tests_test_general_CPPFLAGS = \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I${top_srcdir}/src/platform \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/devices/wifi \
-I$(top_builddir)/src \ -I$(top_builddir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
...@@ -2521,9 +2472,6 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \ ...@@ -2521,9 +2472,6 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \
src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/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_builddir}/introspection \
-I${top_srcdir}/shared \ -I${top_srcdir}/shared \
-I$(top_builddir)/shared \ -I$(top_builddir)/shared \
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "nm-setting-ip6-config.h" #include "nm-setting-ip6-config.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-exported-object.h" #include "nm-exported-object.h"
#include "nm-auth-utils.h" #include "nm-auth-utils.h"
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include "nm-setting-adsl.h" #include "nm-setting-adsl.h"
#include "nm-device-adsl.h" #include "nm-device-adsl.h"
#include "nm-device-factory.h" #include "devices/nm-device-factory.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "nm-device-private.h" #include "devices/nm-device-private.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "ppp/nm-ppp-manager.h" #include "ppp/nm-ppp-manager.h"
#include "ppp/nm-ppp-status.h" #include "ppp/nm-ppp-status.h"
#include "nm-setting-adsl.h" #include "nm-setting-adsl.h"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "nmdbus-device-adsl.h" #include "nmdbus-device-adsl.h"
#include "nm-device-logging.h" #include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF (NMDeviceAdsl); _LOG_DECLARE_SELF (NMDeviceAdsl);
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#ifndef __NETWORKMANAGER_DEVICE_ADSL_H__ #ifndef __NETWORKMANAGER_DEVICE_ADSL_H__
#define __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_TYPE_DEVICE_ADSL (nm_device_adsl_get_type ())
#define NM_DEVICE_ADSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdsl)) #define NM_DEVICE_ADSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdsl))
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-bt-error.h" #include "nm-bt-error.h"
#include "nm-bluez-common.h" #include "nm-bluez-common.h"
#include "nm-settings.h" #include "settings/nm-settings.h"
#include "nm-settings-connection.h" #include "settings/nm-settings-connection.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#if WITH_BLUEZ5_DUN #if WITH_BLUEZ5_DUN
......
...@@ -25,16 +25,16 @@ ...@@ -25,16 +25,16 @@
#include <stdlib.h> #include <stdlib.h>
#include <gmodule.h> #include <gmodule.h>
#include "nm-device-factory.h" #include "devices/nm-device-factory.h"
#include "nm-setting-bluetooth.h" #include "nm-setting-bluetooth.h"
#include "nm-settings.h" #include "settings/nm-settings.h"
#include "nm-bluez4-manager.h" #include "nm-bluez4-manager.h"
#include "nm-bluez5-manager.h" #include "nm-bluez5-manager.h"
#include "nm-bluez-device.h" #include "nm-bluez-device.h"
#include "nm-bluez-common.h" #include "nm-bluez-common.h"
#include "nm-device-bt.h" #include "nm-device-bt.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-dbus-compat.h" #include "nm-dbus-compat.h"
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "nm-bluez-device.h" #include "nm-bluez-device.h"
#include "nm-bluez-common.h" #include "nm-bluez-common.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-settings.h" #include "settings/nm-settings.h"
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "nm-bluez4-adapter.h" #include "nm-bluez4-adapter.h"
#include "nm-bluez-common.h" #include "nm-bluez-common.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-settings.h" #include "settings/nm-settings.h"
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "nm-bluez-device.h" #include "nm-bluez-device.h"
#include "nm-bluez-common.h" #include "nm-bluez-common.h"
#include "nm-settings.h" #include "settings/nm-settings.h"
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "nm-bluez-common.h" #include "nm-bluez-common.h"
#include "nm-bluez-device.h" #include "nm-bluez-device.h"
#include "nm-device-private.h" #include "devices/nm-device-private.h"
#include "ppp/nm-ppp-manager.h" #include "ppp/nm-ppp-manager.h"
#include "nm-setting-connection.h" #include "nm-setting-connection.h"
#include "nm-setting-bluetooth.h" #include "nm-setting-bluetooth.h"
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-bt-error.h" #include "nm-bt-error.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nmdbus-device-bt.h" #include "nmdbus-device-bt.h"
#include "nm-device-logging.h" #include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBt); _LOG_DECLARE_SELF(NMDeviceBt);
#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1" #define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
......
...@@ -21,9 +21,10 @@ ...@@ -21,9 +21,10 @@
#ifndef __NETWORKMANAGER_DEVICE_BT_H__ #ifndef __NETWORKMANAGER_DEVICE_BT_H__
#define __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-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_TYPE_DEVICE_BT (nm_device_bt_get_type ())
#define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt)) #define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt))
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-device-private.h" #include "nm-device-private.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-device-factory.h" #include "nm-device-factory.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-ip4-config.h" #include "nm-ip4-config.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-device-private.h" #include "nm-device-private.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-device-factory.h" #include "nm-device-factory.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
......
...@@ -35,18 +35,18 @@ ...@@ -35,18 +35,18 @@
#include "nm-act-request.h" #include "nm-act-request.h"
#include "nm-ip4-config.h" #include "nm-ip4-config.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-supplicant-manager.h" #include "supplicant/nm-supplicant-manager.h"
#include "nm-supplicant-interface.h" #include "supplicant/nm-supplicant-interface.h"
#include "nm-supplicant-config.h" #include "supplicant/nm-supplicant-config.h"
#include "ppp/nm-ppp-manager.h" #include "ppp/nm-ppp-manager.h"
#include "ppp/nm-ppp-status.h" #include "ppp/nm-ppp-status.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-platform-utils.h" #include "platform/nm-platform-utils.h"
#include "nm-dcb.h" #include "nm-dcb.h"
#include "nm-settings-connection.h" #include "settings/nm-settings-connection.h"
#include "nm-config.h" #include "nm-config.h"
#include "nm-device-ethernet-utils.h" #include "nm-device-ethernet-utils.h"
#include "nm-settings.h" #include "settings/nm-settings.h"
#include "nm-device-factory.h" #include "nm-device-factory.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <string.h> #include <string.h>
#include <gmodule.h> #include <gmodule.h>
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-utils.h" #include "nm-utils.h"
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "nm-device-generic.h" #include "nm-device-generic.h"
#include "nm-device-private.h" #include "nm-device-private.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nmdbus-device-generic.h" #include "nmdbus-device-generic.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "nm-device-private.h" #include "nm-device-private.h"
#include "nm-act-request.h" #include "nm-act-request.h"
#include "nm-ip4-config.h" #include "nm-ip4-config.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-device-factory.h" #include "nm-device-factory.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
#include "nm-device-private.h" #include "nm-device-private.h"
#include "nm-manager.h" #include "nm-manager.h"
#include "nm-platform.h" #include "platform/nm-platform.h"
#include "nm-device-factory.h" #include "nm-device-factory.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-settings.h" #include "settings/nm-settings.h"
#include "nm-act-request.h" #include "nm-act-request.h"
#include "nm-ip4-config.h" #include "nm-ip4-config.h"