From aa77b0bea9507229cadb219b6857a38ec3433f97 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 5 Dec 2012 09:22:52 -0200 Subject: [PATCH] Use the entire include path for gdbus.h --- Makefile.am | 3 +-- Makefile.obexd | 5 ++--- attrib/client.c | 2 +- obexd/client/bluetooth.c | 2 +- obexd/client/dbus.c | 2 +- obexd/client/driver.c | 2 +- obexd/client/ftp.c | 2 +- obexd/client/main.c | 2 +- obexd/client/manager.c | 2 +- obexd/client/map.c | 2 +- obexd/client/opp.c | 2 +- obexd/client/pbap.c | 2 +- obexd/client/session.c | 2 +- obexd/client/session.h | 2 +- obexd/client/sync.c | 2 +- obexd/client/transfer.c | 2 +- obexd/plugins/bluetooth.c | 2 +- obexd/plugins/pcsuite.c | 2 +- obexd/plugins/syncevolution.c | 2 +- obexd/plugins/usb.c | 2 +- obexd/plugins/vcard.c | 2 +- obexd/src/main.c | 2 +- obexd/src/manager.c | 2 +- plugins/dbusoob.c | 2 +- plugins/neard.c | 2 +- plugins/service.c | 2 +- profiles/alert/server.c | 2 +- profiles/audio/avrcp.c | 2 +- profiles/audio/control.c | 2 +- profiles/audio/device.c | 2 +- profiles/audio/manager.c | 2 +- profiles/audio/media.c | 2 +- profiles/audio/player.c | 2 +- profiles/audio/sink.c | 2 +- profiles/audio/source.c | 2 +- profiles/audio/transport.c | 2 +- profiles/cups/main.c | 2 +- profiles/cyclingspeed/cyclingspeed.c | 2 +- profiles/health/hdp.c | 2 +- profiles/health/hdp_main.c | 2 +- profiles/health/hdp_util.c | 2 +- profiles/heartrate/heartrate.c | 2 +- profiles/heartrate/manager.c | 2 +- profiles/input/device.c | 2 +- profiles/input/main.c | 2 +- profiles/network/connection.c | 2 +- profiles/network/main.c | 2 +- profiles/network/manager.c | 2 +- profiles/network/server.c | 2 +- profiles/proximity/immalert.c | 2 +- profiles/proximity/linkloss.c | 2 +- profiles/proximity/main.c | 2 +- profiles/proximity/manager.c | 2 +- profiles/proximity/monitor.c | 2 +- profiles/proximity/reporter.c | 2 +- profiles/sap/main.c | 2 +- profiles/sap/sap-dummy.c | 2 +- profiles/sap/server.h | 2 +- profiles/thermometer/thermometer.c | 2 +- src/adapter.c | 2 +- src/agent.c | 2 +- src/attrib-server.c | 2 +- src/dbus-common.c | 2 +- src/device.c | 2 +- src/error.c | 2 +- src/main.c | 2 +- src/manager.c | 2 +- src/profile.c | 2 +- 68 files changed, 69 insertions(+), 71 deletions(-) diff --git a/Makefile.am b/Makefile.am index d39c5a1d3..4605e673f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -357,8 +357,7 @@ EXTRA_DIST += doc/adapter-api.txt doc/device-api.txt doc/profile-api.txt \ AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@ AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \ - -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/gdbus \ - -I$(srcdir)/btio + -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/btio if MCAP AM_CPPFLAGS += -I$(builddir)/health diff --git a/Makefile.obexd b/Makefile.obexd index f8798f6b1..738e73d08 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -32,7 +32,7 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \ -I$(builddir)/obexd/src \ -I$(srcdir)/obexd/src -I$(srcdir)/btio \ - -I$(srcdir)/gobex -I$(srcdir)/gdbus + -I$(srcdir)/gobex obexd_src_obexd_SHORTNAME = obexd @@ -79,7 +79,6 @@ obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ obexd_client_obex_client_CPPFLAGS = -include $(top_builddir)/config.h \ -I$(builddir)/lib -I$(srcdir)/obexd/src \ - -I$(srcdir)/btio -I$(srcdir)/gobex \ - -I$(srcdir)/gdbus + -I$(srcdir)/btio -I$(srcdir)/gobex obexd_client_obex_client_SHORTNAME = obex-client diff --git a/attrib/client.c b/attrib/client.c index 44a6730d4..2220ce17a 100644 --- a/attrib/client.c +++ b/attrib/client.c @@ -31,10 +31,10 @@ #include #include +#include #include "adapter.h" #include "device.h" #include "log.h" -#include "gdbus.h" #include "error.h" #include "dbus-common.h" #include "btio.h" diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c index 528845ea8..336f11261 100644 --- a/obexd/client/bluetooth.c +++ b/obexd/client/bluetooth.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/obexd/client/dbus.c b/obexd/client/dbus.c index 78e0b966e..ad7670022 100644 --- a/obexd/client/dbus.c +++ b/obexd/client/dbus.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "log.h" #include "dbus.h" diff --git a/obexd/client/driver.c b/obexd/client/driver.c index 66501fa4c..8cd369038 100644 --- a/obexd/client/driver.c +++ b/obexd/client/driver.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "transfer.h" #include "session.h" diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c index e2b650f6b..ea8be60c4 100644 --- a/obexd/client/ftp.c +++ b/obexd/client/ftp.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "dbus.h" #include "log.h" diff --git a/obexd/client/main.c b/obexd/client/main.c index 80867be07..a0b1c97b2 100644 --- a/obexd/client/main.c +++ b/obexd/client/main.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include "log.h" #include "manager.h" diff --git a/obexd/client/manager.c b/obexd/client/manager.c index 93d16aeff..36ca942d1 100644 --- a/obexd/client/manager.c +++ b/obexd/client/manager.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "log.h" #include "transfer.h" diff --git a/obexd/client/map.c b/obexd/client/map.c index 0f141c1cf..6d7d926c7 100644 --- a/obexd/client/map.c +++ b/obexd/client/map.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/obexd/client/opp.c b/obexd/client/opp.c index 5f317a272..aa08db659 100644 --- a/obexd/client/opp.c +++ b/obexd/client/opp.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include "log.h" diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c index fa8b126ca..00b631a0f 100644 --- a/obexd/client/pbap.c +++ b/obexd/client/pbap.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/obexd/client/session.c b/obexd/client/session.c index 4339327c5..4ee9d21dc 100644 --- a/obexd/client/session.c +++ b/obexd/client/session.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include "dbus.h" diff --git a/obexd/client/session.h b/obexd/client/session.h index af7156812..402c042bd 100644 --- a/obexd/client/session.h +++ b/obexd/client/session.h @@ -24,7 +24,7 @@ #include #include -#include +#include struct obc_session; diff --git a/obexd/client/sync.c b/obexd/client/sync.c index 45e49b021..a555430ce 100644 --- a/obexd/client/sync.c +++ b/obexd/client/sync.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "log.h" diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c index 67b8eafe7..662e08705 100644 --- a/obexd/client/transfer.c +++ b/obexd/client/transfer.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include "dbus.h" diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c index 24fd1cb26..b2d6f288f 100644 --- a/obexd/plugins/bluetooth.c +++ b/obexd/plugins/bluetooth.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "obexd.h" #include "plugin.h" diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c index b479980c5..6d5bea449 100644 --- a/obexd/plugins/pcsuite.c +++ b/obexd/plugins/pcsuite.c @@ -35,7 +35,7 @@ #include #include -#include "gdbus.h" +#include #include "obexd.h" #include "plugin.h" diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c index 1e8f78aa2..24b2d5e96 100644 --- a/obexd/plugins/syncevolution.c +++ b/obexd/plugins/syncevolution.c @@ -32,6 +32,7 @@ #include +#include #include "plugin.h" #include "obex.h" #include "service.h" @@ -40,7 +41,6 @@ #include "manager.h" #include "btio.h" #include "obexd.h" -#include "gdbus.h" #include "filesystem.h" #define SYNCML_TARGET_SIZE 11 diff --git a/obexd/plugins/usb.c b/obexd/plugins/usb.c index 32e715945..350b37b60 100644 --- a/obexd/plugins/usb.c +++ b/obexd/plugins/usb.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include "obexd.h" #include "plugin.h" diff --git a/obexd/plugins/vcard.c b/obexd/plugins/vcard.c index baf069646..c9f178a5c 100644 --- a/obexd/plugins/vcard.c +++ b/obexd/plugins/vcard.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "vcard.h" diff --git a/obexd/src/main.c b/obexd/src/main.c index fb3826530..d9329ce8b 100644 --- a/obexd/src/main.c +++ b/obexd/src/main.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include "log.h" #include "obexd.h" diff --git a/obexd/src/manager.c b/obexd/src/manager.c index e038b9e64..aaf911a0a 100644 --- a/obexd/src/manager.c +++ b/obexd/src/manager.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c index 95e52f98c..5c4f65069 100644 --- a/plugins/dbusoob.c +++ b/plugins/dbusoob.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/plugins/neard.c b/plugins/neard.c index 842eabf82..8db852023 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include diff --git a/plugins/service.c b/plugins/service.c index d7c9b290f..81318d7de 100644 --- a/plugins/service.c +++ b/plugins/service.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include "dbus-common.h" #include "sdpd.h" diff --git a/profiles/alert/server.c b/profiles/alert/server.c index 60d010816..4bc026586 100644 --- a/profiles/alert/server.c +++ b/profiles/alert/server.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c index c69652f5f..6da001ad7 100644 --- a/profiles/audio/avrcp.c +++ b/profiles/audio/avrcp.c @@ -41,7 +41,7 @@ #include #include -#include +#include #include "../src/adapter.h" #include "../src/device.h" diff --git a/profiles/audio/control.c b/profiles/audio/control.c index 489ad0741..b8a66f0a8 100644 --- a/profiles/audio/control.c +++ b/profiles/audio/control.c @@ -40,7 +40,7 @@ #include #include -#include +#include #include "../src/adapter.h" #include "../src/device.h" diff --git a/profiles/audio/device.c b/profiles/audio/device.c index c11126296..2ee0d3d7f 100644 --- a/profiles/audio/device.c +++ b/profiles/audio/device.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include "log.h" #include "../src/adapter.h" diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c index 7544197f5..0361ae4d1 100644 --- a/profiles/audio/manager.c +++ b/profiles/audio/manager.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include "glib-helper.h" #include "btio.h" diff --git a/profiles/audio/media.c b/profiles/audio/media.c index 2ac7d7dfd..db60d7d97 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "../src/adapter.h" #include "../src/device.h" diff --git a/profiles/audio/player.c b/profiles/audio/player.c index 460fb5a75..66af11e5c 100644 --- a/profiles/audio/player.c +++ b/profiles/audio/player.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include "log.h" #include "player.h" diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c index e7901e05c..c8f72073e 100644 --- a/profiles/audio/sink.c +++ b/profiles/audio/sink.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include "log.h" diff --git a/profiles/audio/source.c b/profiles/audio/source.c index 8913ab13a..964f273a6 100644 --- a/profiles/audio/source.c +++ b/profiles/audio/source.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include "log.h" diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 79355ce5a..112e9a518 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "../src/adapter.h" #include "../src/device.h" diff --git a/profiles/cups/main.c b/profiles/cups/main.c index 8959f0036..11f2a24c8 100644 --- a/profiles/cups/main.c +++ b/profiles/cups/main.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include "cups.h" diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c index f678ed922..468f18001 100644 --- a/profiles/cyclingspeed/cyclingspeed.c +++ b/profiles/cyclingspeed/cyclingspeed.c @@ -20,7 +20,7 @@ * */ -#include +#include #include #include #include diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c index 0692d43dc..d062abb46 100644 --- a/profiles/health/hdp.c +++ b/profiles/health/hdp.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/profiles/health/hdp_main.c b/profiles/health/hdp_main.c index 96dc678a2..7f4e8d588 100644 --- a/profiles/health/hdp_main.c +++ b/profiles/health/hdp_main.c @@ -22,7 +22,7 @@ #include -#include +#include #include "plugin.h" #include "hdp_manager.h" diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c index 714117cbe..8aa572385 100644 --- a/profiles/health/hdp_util.c +++ b/profiles/health/hdp_util.c @@ -25,7 +25,7 @@ #include -#include +#include #include #include diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c index ab61b870b..7abb6ed1d 100644 --- a/profiles/heartrate/heartrate.c +++ b/profiles/heartrate/heartrate.c @@ -20,7 +20,7 @@ * */ -#include +#include #include #include #include diff --git a/profiles/heartrate/manager.c b/profiles/heartrate/manager.c index aeb69f454..b939a2a61 100644 --- a/profiles/heartrate/manager.c +++ b/profiles/heartrate/manager.c @@ -20,7 +20,7 @@ * */ -#include +#include #include #include #include diff --git a/profiles/input/device.c b/profiles/input/device.c index d512f4872..b8767653a 100644 --- a/profiles/input/device.c +++ b/profiles/input/device.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include "log.h" diff --git a/profiles/input/main.c b/profiles/input/main.c index 3595b0b9e..6b66f8bd5 100644 --- a/profiles/input/main.c +++ b/profiles/input/main.c @@ -25,7 +25,7 @@ #include -#include +#include #include "plugin.h" #include "hcid.h" diff --git a/profiles/network/connection.c b/profiles/network/connection.c index b97c15138..e1e037692 100644 --- a/profiles/network/connection.c +++ b/profiles/network/connection.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include "log.h" #include "btio.h" diff --git a/profiles/network/main.c b/profiles/network/main.c index c8f9ea0d0..98eb7b584 100644 --- a/profiles/network/main.c +++ b/profiles/network/main.c @@ -23,7 +23,7 @@ #include -#include +#include #include "plugin.h" #include "manager.h" diff --git a/profiles/network/manager.c b/profiles/network/manager.c index d3da540c8..70ad8887a 100644 --- a/profiles/network/manager.c +++ b/profiles/network/manager.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "log.h" diff --git a/profiles/network/server.c b/profiles/network/server.c index 153ec08c4..c093d34f9 100644 --- a/profiles/network/server.c +++ b/profiles/network/server.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "../src/dbus-common.h" #include "../src/adapter.h" diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c index 8ea37b6ed..92166d43f 100644 --- a/profiles/proximity/immalert.c +++ b/profiles/proximity/immalert.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "log.h" #include "attrib/gattrib.h" diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c index a325ef1d9..648202fbd 100644 --- a/profiles/proximity/linkloss.c +++ b/profiles/proximity/linkloss.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "log.h" #include "attrib/att-database.h" diff --git a/profiles/proximity/main.c b/profiles/proximity/main.c index 93f4a1c8e..b795fd752 100644 --- a/profiles/proximity/main.c +++ b/profiles/proximity/main.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "log.h" #include "plugin.h" diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c index 9190b63a7..6da08ed0d 100644 --- a/profiles/proximity/manager.c +++ b/profiles/proximity/manager.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "adapter.h" diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c index 9868fce68..517e50df9 100644 --- a/profiles/proximity/monitor.c +++ b/profiles/proximity/monitor.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c index c27906263..d504f9d59 100644 --- a/profiles/proximity/reporter.c +++ b/profiles/proximity/reporter.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include "log.h" diff --git a/profiles/sap/main.c b/profiles/sap/main.c index c5df5a1e5..d2218d43a 100644 --- a/profiles/sap/main.c +++ b/profiles/sap/main.c @@ -19,7 +19,7 @@ */ #include -#include +#include #include "plugin.h" #include "manager.h" diff --git a/profiles/sap/sap-dummy.c b/profiles/sap/sap-dummy.c index a3e08bbbc..0f9265c2f 100644 --- a/profiles/sap/sap-dummy.c +++ b/profiles/sap/sap-dummy.c @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include "dbus-common.h" diff --git a/profiles/sap/server.h b/profiles/sap/server.h index e636d91ec..73b38ab05 100644 --- a/profiles/sap/server.h +++ b/profiles/sap/server.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include int sap_server_register(const char *path, const bdaddr_t *src); void sap_server_unregister(const char *path); diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c index 6fb0d03e4..31bf7184c 100644 --- a/profiles/thermometer/thermometer.c +++ b/profiles/thermometer/thermometer.c @@ -25,7 +25,7 @@ #include -#include +#include #include "dbus-common.h" #include "adapter.h" diff --git a/src/adapter.c b/src/adapter.c index 8ae9c34eb..0a0e6f0ee 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include "log.h" #include "textfile.h" diff --git a/src/agent.c b/src/agent.c index 97d34cef2..82a0e9c85 100644 --- a/src/agent.c +++ b/src/agent.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "log.h" diff --git a/src/attrib-server.c b/src/attrib-server.c index 5cd5460d4..0718c4b76 100644 --- a/src/attrib-server.c +++ b/src/attrib-server.c @@ -34,8 +34,8 @@ #include #include +#include #include "log.h" -#include "gdbus.h" #include "btio.h" #include "sdpd.h" #include "hcid.h" diff --git a/src/dbus-common.c b/src/dbus-common.c index 3c73e322b..579e70408 100644 --- a/src/dbus-common.c +++ b/src/dbus-common.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "log.h" diff --git a/src/device.c b/src/device.c index 32fb788a4..5b570bc94 100644 --- a/src/device.c +++ b/src/device.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include "log.h" diff --git a/src/error.c b/src/error.c index c5747c088..a019dae01 100644 --- a/src/error.c +++ b/src/error.c @@ -23,7 +23,7 @@ * */ -#include +#include #include "error.h" diff --git a/src/main.c b/src/main.c index 90cd32677..0534e26ed 100644 --- a/src/main.c +++ b/src/main.c @@ -40,7 +40,7 @@ #include -#include +#include #include "log.h" diff --git a/src/manager.c b/src/manager.c index e569fcf4f..47204a4e3 100644 --- a/src/manager.c +++ b/src/manager.c @@ -38,7 +38,7 @@ #include -#include +#include #include "glib-helper.h" #include "hcid.h" diff --git a/src/profile.c b/src/profile.c index 755c38773..88d7cdbb7 100644 --- a/src/profile.c +++ b/src/profile.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include -- 2.47.3