From ce06826bd7d0ec0a657c15b309421cc2b70afa43 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 20 Nov 2012 11:50:48 +0100 Subject: [PATCH] build: Remove stupid -I directives --- Makefile.am | 4 +--- emulator/b1ee.c | 2 +- emulator/btdev.c | 2 +- emulator/main.c | 2 +- emulator/server.c | 2 +- emulator/vhci.c | 2 +- plugins/gatt-example.c | 10 +++++----- profiles/alert/server.c | 10 +++++----- profiles/deviceinfo/deviceinfo.c | 6 +++--- profiles/deviceinfo/manager.c | 6 +++--- profiles/gatt/gas.c | 6 +++--- profiles/gatt/manager.c | 6 +++--- profiles/heartrate/heartrate.c | 6 +++--- profiles/heartrate/manager.c | 6 +++--- profiles/input/hog_device.c | 10 +++++----- profiles/input/hog_manager.c | 12 ++++++------ profiles/proximity/immalert.c | 10 +++++----- profiles/proximity/linkloss.c | 10 +++++----- profiles/proximity/manager.c | 6 +++--- profiles/proximity/monitor.c | 6 +++--- profiles/proximity/reporter.c | 8 ++++---- profiles/scanparam/manager.c | 6 +++--- profiles/scanparam/scan.c | 6 +++--- profiles/thermometer/manager.c | 6 +++--- profiles/thermometer/thermometer.c | 6 +++--- profiles/time/server.c | 10 +++++----- src/adapter.c | 6 +++--- src/attrib-server.c | 8 ++++---- src/device.c | 6 +++--- tools/avinfo.c | 2 +- 30 files changed, 93 insertions(+), 95 deletions(-) diff --git a/Makefile.am b/Makefile.am index e8a247af1..2006e194e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -347,9 +347,7 @@ EXTRA_DIST += doc/manager-api.txt \ AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@ AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \ - -I$(srcdir)/profiles/audio -I$(srcdir)/gdbus \ - -I$(srcdir)/attrib -I$(srcdir)/btio -I$(srcdir)/tools \ - -I$(builddir)/tools -I$(srcdir)/monitor + -I$(srcdir)/gdbus -I$(srcdir)/btio if MCAP AM_CPPFLAGS += -I$(builddir)/health diff --git a/emulator/b1ee.c b/emulator/b1ee.c index 59c0650c3..17a60fca6 100644 --- a/emulator/b1ee.c +++ b/emulator/b1ee.c @@ -39,7 +39,7 @@ #include #include -#include "mainloop.h" +#include "monitor/mainloop.h" #define DEFAULT_SERVER "b1ee.com" #define DEFAULT_HOST_PORT "45550" /* 0xb1ee */ diff --git a/emulator/btdev.c b/emulator/btdev.c index 188ecf35b..700c6a800 100644 --- a/emulator/btdev.c +++ b/emulator/btdev.c @@ -31,7 +31,7 @@ #include #include -#include "bt.h" +#include "monitor/bt.h" #include "btdev.h" #define le16_to_cpu(val) (val) diff --git a/emulator/main.c b/emulator/main.c index bcb2db3c6..6a30c8c61 100644 --- a/emulator/main.c +++ b/emulator/main.c @@ -30,7 +30,7 @@ #include #include -#include "mainloop.h" +#include "monitor/mainloop.h" #include "server.h" #include "vhci.h" diff --git a/emulator/server.c b/emulator/server.c index 61f22757e..841c2b31b 100644 --- a/emulator/server.c +++ b/emulator/server.c @@ -42,7 +42,7 @@ #include #include -#include "mainloop.h" +#include "monitor/mainloop.h" #include "btdev.h" #include "server.h" diff --git a/emulator/vhci.c b/emulator/vhci.c index 6b66105c5..52876ba91 100644 --- a/emulator/vhci.c +++ b/emulator/vhci.c @@ -33,7 +33,7 @@ #include #include -#include "mainloop.h" +#include "monitor/mainloop.h" #include "btdev.h" #include "vhci.h" diff --git a/plugins/gatt-example.c b/plugins/gatt-example.c index 2d9ffe22e..de090e945 100644 --- a/plugins/gatt-example.c +++ b/plugins/gatt-example.c @@ -34,11 +34,11 @@ #include "plugin.h" #include "hcid.h" #include "log.h" -#include "gattrib.h" -#include "gatt-service.h" -#include "att.h" -#include "gatt.h" -#include "att-database.h" +#include "attrib/gattrib.h" +#include "attrib/gatt-service.h" +#include "attrib/att.h" +#include "attrib/gatt.h" +#include "attrib/att-database.h" #include "attrib-server.h" /* FIXME: Not defined by SIG? UUID128? */ diff --git a/profiles/alert/server.c b/profiles/alert/server.c index 761a24b53..1c929060b 100644 --- a/profiles/alert/server.c +++ b/profiles/alert/server.c @@ -34,15 +34,15 @@ #include #include "dbus-common.h" -#include "att.h" +#include "attrib/att.h" #include "adapter.h" #include "device.h" -#include "att-database.h" +#include "attrib/att-database.h" #include "log.h" -#include "gatt-service.h" -#include "gattrib.h" +#include "attrib/gatt-service.h" +#include "attrib/gattrib.h" #include "attrib-server.h" -#include "gatt.h" +#include "attrib/gatt.h" #include "server.h" #include "profile.h" #include "error.h" diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c index 57652a01e..9910533fd 100644 --- a/profiles/deviceinfo/deviceinfo.c +++ b/profiles/deviceinfo/deviceinfo.c @@ -31,10 +31,10 @@ #include "adapter.h" #include "device.h" -#include "gattrib.h" +#include "attrib/gattrib.h" #include "attio.h" -#include "att.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gatt.h" #include "log.h" #include "deviceinfo.h" diff --git a/profiles/deviceinfo/manager.c b/profiles/deviceinfo/manager.c index 3217283a9..8eab62c4d 100644 --- a/profiles/deviceinfo/manager.c +++ b/profiles/deviceinfo/manager.c @@ -28,9 +28,9 @@ #include "adapter.h" #include "device.h" #include "profile.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "deviceinfo.h" #include "manager.h" diff --git a/profiles/gatt/gas.c b/profiles/gatt/gas.c index 793a3afaa..0e8209791 100644 --- a/profiles/gatt/gas.c +++ b/profiles/gatt/gas.c @@ -36,11 +36,11 @@ #include "adapter.h" #include "device.h" -#include "att.h" -#include "gattrib.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" #include "attio.h" #include "btio.h" -#include "gatt.h" +#include "attrib/gatt.h" #include "log.h" #include "textfile.h" #include "gas.h" diff --git a/profiles/gatt/manager.c b/profiles/gatt/manager.c index 747760b8c..3d8051e9a 100644 --- a/profiles/gatt/manager.c +++ b/profiles/gatt/manager.c @@ -28,9 +28,9 @@ #include "adapter.h" #include "device.h" #include "profile.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "gas.h" #include "log.h" #include "manager.h" diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c index f0eb7a4ef..535d55bd4 100644 --- a/profiles/heartrate/heartrate.c +++ b/profiles/heartrate/heartrate.c @@ -34,9 +34,9 @@ #include "dbus-common.h" #include "device.h" #include "error.h" -#include "gattrib.h" -#include "att.h" -#include "gatt.h" +#include "attrib/gattrib.h" +#include "attrib/att.h" +#include "attrib/gatt.h" #include "attio.h" #include "log.h" #include "heartrate.h" diff --git a/profiles/heartrate/manager.c b/profiles/heartrate/manager.c index 19b18a856..aeb69f454 100644 --- a/profiles/heartrate/manager.c +++ b/profiles/heartrate/manager.c @@ -28,9 +28,9 @@ #include "adapter.h" #include "device.h" #include "profile.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "heartrate.h" #include "manager.h" diff --git a/profiles/input/hog_device.c b/profiles/input/hog_device.c index f6e945ea4..d231e00e9 100644 --- a/profiles/input/hog_device.c +++ b/profiles/input/hog_device.c @@ -43,13 +43,13 @@ #include "log.h" -#include "../src/adapter.h" -#include "../src/device.h" +#include "src/adapter.h" +#include "src/device.h" -#include "att.h" -#include "gattrib.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" #include "attio.h" -#include "gatt.h" +#include "attrib/gatt.h" #include "hog_device.h" diff --git a/profiles/input/hog_manager.c b/profiles/input/hog_manager.c index d37b90315..21ceb79d4 100644 --- a/profiles/input/hog_manager.c +++ b/profiles/input/hog_manager.c @@ -33,17 +33,17 @@ #include #include "log.h" -#include "../src/adapter.h" -#include "../src/device.h" -#include "../src/profile.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" #include "plugin.h" #include "hcid.h" #include "device.h" #include "suspend.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "hog_device.h" static gboolean suspend_supported = FALSE; diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c index 77b496646..5c4592b8d 100644 --- a/profiles/proximity/immalert.c +++ b/profiles/proximity/immalert.c @@ -34,11 +34,11 @@ #include #include "log.h" -#include "gattrib.h" -#include "att.h" -#include "gatt.h" -#include "att-database.h" -#include "gatt-service.h" +#include "attrib/gattrib.h" +#include "attrib/att.h" +#include "attrib/gatt.h" +#include "attrib/att-database.h" +#include "attrib/gatt-service.h" #include "attrib-server.h" #include "device.h" #include "profile.h" diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c index 40510d8e5..d4ef3e178 100644 --- a/profiles/proximity/linkloss.c +++ b/profiles/proximity/linkloss.c @@ -34,11 +34,11 @@ #include #include "log.h" -#include "att-database.h" -#include "gattrib.h" -#include "att.h" -#include "gatt.h" -#include "gatt-service.h" +#include "attrib/att-database.h" +#include "attrib/gattrib.h" +#include "attrib/att.h" +#include "attrib/gatt.h" +#include "attrib/gatt-service.h" #include "attrib-server.h" #include "device.h" #include "profile.h" diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c index 58e519312..fb34e8ff9 100644 --- a/profiles/proximity/manager.c +++ b/profiles/proximity/manager.c @@ -35,9 +35,9 @@ #include "adapter.h" #include "device.h" #include "profile.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "monitor.h" #include "reporter.h" #include "manager.h" diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c index e45fa4a08..9e3d4fb99 100644 --- a/profiles/proximity/monitor.c +++ b/profiles/proximity/monitor.c @@ -43,9 +43,9 @@ #include "device.h" #include "error.h" #include "log.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "attio.h" #include "monitor.h" #include "textfile.h" diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c index 6ec5f733e..929dca4c5 100644 --- a/profiles/proximity/reporter.c +++ b/profiles/proximity/reporter.c @@ -43,10 +43,10 @@ #include "device.h" #include "profile.h" #include "hcid.h" -#include "gattrib.h" -#include "att.h" -#include "gatt.h" -#include "att-database.h" +#include "attrib/gattrib.h" +#include "attrib/att.h" +#include "attrib/gatt.h" +#include "attrib/att-database.h" #include "attrib-server.h" #include "reporter.h" #include "linkloss.h" diff --git a/profiles/scanparam/manager.c b/profiles/scanparam/manager.c index 24d1e78f5..cea2b29cc 100644 --- a/profiles/scanparam/manager.c +++ b/profiles/scanparam/manager.c @@ -35,9 +35,9 @@ #include "adapter.h" #include "device.h" #include "profile.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "manager.h" #include "scan.h" diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c index 09fbe1fb3..849336e24 100644 --- a/profiles/scanparam/scan.c +++ b/profiles/scanparam/scan.c @@ -34,9 +34,9 @@ #include "log.h" #include "adapter.h" #include "device.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "attio.h" #include "scan.h" diff --git a/profiles/thermometer/manager.c b/profiles/thermometer/manager.c index 605763331..167df3725 100644 --- a/profiles/thermometer/manager.c +++ b/profiles/thermometer/manager.c @@ -27,9 +27,9 @@ #include "adapter.h" #include "device.h" #include "profile.h" -#include "att.h" -#include "gattrib.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gattrib.h" +#include "attrib/gatt.h" #include "thermometer.h" #include "manager.h" diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c index 4d1df1dbf..46e2b7cd6 100644 --- a/profiles/thermometer/thermometer.c +++ b/profiles/thermometer/thermometer.c @@ -36,10 +36,10 @@ #include "device.h" #include "error.h" #include "log.h" -#include "gattrib.h" +#include "attrib/gattrib.h" #include "attio.h" -#include "att.h" -#include "gatt.h" +#include "attrib/att.h" +#include "attrib/gatt.h" #include "thermometer.h" #define THERMOMETER_INTERFACE "org.bluez.Thermometer" diff --git a/profiles/time/server.c b/profiles/time/server.c index bd7503783..0a17b83dc 100644 --- a/profiles/time/server.c +++ b/profiles/time/server.c @@ -37,12 +37,12 @@ #include #include -#include "gattrib.h" -#include "att.h" -#include "gatt.h" -#include "att-database.h" +#include "attrib/gattrib.h" +#include "attrib/att.h" +#include "attrib/gatt.h" +#include "attrib/att-database.h" #include "attrib-server.h" -#include "gatt-service.h" +#include "attrib/gatt-service.h" #include "log.h" #include "server.h" diff --git a/src/adapter.c b/src/adapter.c index 5c17a6e69..0f6a078fc 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -58,9 +58,9 @@ #include "glib-helper.h" #include "agent.h" #include "storage.h" -#include "gattrib.h" -#include "att.h" -#include "gatt.h" +#include "attrib/gattrib.h" +#include "attrib/att.h" +#include "attrib/gatt.h" #include "attrib-server.h" #include "eir.h" #include "mgmt.h" diff --git a/src/attrib-server.c b/src/attrib-server.c index 4489edc20..8e2090334 100644 --- a/src/attrib-server.c +++ b/src/attrib-server.c @@ -46,10 +46,10 @@ #include "adapter.h" #include "device.h" #include "manager.h" -#include "gattrib.h" -#include "att.h" -#include "gatt.h" -#include "att-database.h" +#include "attrib/gattrib.h" +#include "attrib/att.h" +#include "attrib/gatt.h" +#include "attrib/att-database.h" #include "storage.h" #include "attrib-server.h" diff --git a/src/device.c b/src/device.c index 6c79c4372..0f2169239 100644 --- a/src/device.c +++ b/src/device.c @@ -47,10 +47,10 @@ #include "log.h" -#include "att.h" +#include "attrib/att.h" #include "hcid.h" #include "adapter.h" -#include "gattrib.h" +#include "attrib/gattrib.h" #include "attio.h" #include "device.h" #include "profile.h" @@ -58,7 +58,7 @@ #include "error.h" #include "glib-helper.h" #include "sdp-client.h" -#include "gatt.h" +#include "attrib/gatt.h" #include "agent.h" #include "sdp-xml.h" #include "storage.h" diff --git a/tools/avinfo.c b/tools/avinfo.c index f036cf8a4..d237742f8 100644 --- a/tools/avinfo.c +++ b/tools/avinfo.c @@ -39,7 +39,7 @@ #include #include -#include +#include "profiles/audio/a2dp-codecs.h" #include #include -- 2.47.3