Use the entire include path for gdbus.h

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

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

attrib/client.c

@@ -31,10 +31,10 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/uuid.h>
 
+#include <gdbus/gdbus.h>
 #include "adapter.h"
 #include "device.h"
 #include "log.h"
-#include "gdbus.h"
 #include "error.h"
 #include "dbus-common.h"
 #include "btio.h"

obexd/client/bluetooth.c

@@ -25,7 +25,7 @@
 #include <inttypes.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <btio.h>
 
 #include <bluetooth/bluetooth.h>

obexd/client/dbus.c

@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "dbus.h"

obexd/client/driver.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "transfer.h"
 #include "session.h"

obexd/client/ftp.c

@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "dbus.h"
 #include "log.h"

obexd/client/main.c

@@ -30,7 +30,7 @@
 #include <sys/signalfd.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "manager.h"

obexd/client/manager.c

@@ -28,7 +28,7 @@
 #include <syslog.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "transfer.h"

obexd/client/map.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include <gobex-apparam.h>
 

obexd/client/opp.c

@@ -22,7 +22,7 @@
  */
 
 #include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

obexd/client/pbap.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include <bluetooth/bluetooth.h>
 #include <gobex-apparam.h>

obexd/client/session.c

@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <gobex.h>
 
 #include "dbus.h"

obexd/client/session.h

@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 struct obc_session;
 

obexd/client/sync.c

@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

obexd/client/transfer.c

@@ -32,7 +32,7 @@
 #include <inttypes.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <gobex.h>
 
 #include "dbus.h"

obexd/plugins/bluetooth.c

@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "obexd.h"
 #include "plugin.h"

obexd/plugins/pcsuite.c

@@ -35,7 +35,7 @@
 #include <inttypes.h>
 
 #include <glib.h>
-#include "gdbus.h"
+#include <gdbus/gdbus.h>
 
 #include "obexd.h"
 #include "plugin.h"

obexd/plugins/syncevolution.c

@@ -32,6 +32,7 @@
 
 #include <bluetooth/bluetooth.h>
 
+#include <gdbus/gdbus.h>
 #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

obexd/plugins/usb.c

@@ -33,7 +33,7 @@
 #include <inttypes.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "obexd.h"
 #include "plugin.h"

obexd/plugins/vcard.c

@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "vcard.h"
 

obexd/src/main.c

@@ -38,7 +38,7 @@
 #include <syslog.h>
 #include <glib.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "obexd.h"

obexd/src/manager.c

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <sys/socket.h>
 #include <inttypes.h>
 

plugins/dbusoob.c

@@ -26,7 +26,7 @@
 #include <stdbool.h>
 
 #include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>

plugins/neard.c

@@ -22,7 +22,7 @@
  */
 
 #include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>

plugins/service.c

@@ -30,7 +30,7 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "dbus-common.h"
 #include "sdpd.h"

profiles/alert/server.c

@@ -24,7 +24,7 @@
 
 #include <stdbool.h>
 #include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <glib.h>
 #include <bluetooth/uuid.h>
 #include <stdlib.h>

profiles/audio/avrcp.c

@@ -41,7 +41,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "../src/adapter.h"
 #include "../src/device.h"

profiles/audio/control.c

@@ -40,7 +40,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "../src/adapter.h"
 #include "../src/device.h"

profiles/audio/device.c

@@ -36,7 +36,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "../src/adapter.h"

profiles/audio/manager.c

@@ -42,7 +42,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "glib-helper.h"
 #include "btio.h"

profiles/audio/media.c

@@ -28,7 +28,7 @@
 #include <bluetooth/uuid.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "../src/adapter.h"
 #include "../src/device.h"

profiles/audio/player.c

@@ -31,7 +31,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "player.h"

profiles/audio/sink.c

@@ -31,7 +31,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

profiles/audio/source.c

@@ -32,7 +32,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

profiles/audio/transport.c

@@ -27,7 +27,7 @@
 #include <bluetooth/uuid.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "../src/adapter.h"
 #include "../src/device.h"

profiles/cups/main.c

@@ -36,7 +36,7 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "cups.h"
 

profiles/cyclingspeed/cyclingspeed.c

@@ -20,7 +20,7 @@
  *
  */
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <glib.h>

profiles/health/hdp.c

@@ -29,7 +29,7 @@
 #include <glib.h>
 
 #include <bluetooth/l2cap.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <dbus-common.h>
 #include <log.h>
 #include <error.h>

profiles/health/hdp_main.c

@@ -22,7 +22,7 @@
 
 #include <errno.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "plugin.h"
 #include "hdp_manager.h"

profiles/health/hdp_util.c

@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include <adapter.h>
 #include <device.h>

profiles/heartrate/heartrate.c

@@ -20,7 +20,7 @@
  *
  */
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <glib.h>

profiles/heartrate/manager.c

@@ -20,7 +20,7 @@
  *
  */
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <bluetooth/uuid.h>

profiles/input/device.c

@@ -33,7 +33,7 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

profiles/input/main.c

@@ -25,7 +25,7 @@
 
 #include <bluetooth/bluetooth.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "plugin.h"
 #include "hcid.h"

profiles/network/connection.c

@@ -32,7 +32,7 @@
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "btio.h"

profiles/network/main.c

@@ -23,7 +23,7 @@
 
 #include <errno.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "plugin.h"
 #include "manager.h"

profiles/network/manager.c

@@ -29,7 +29,7 @@
 #include <bluetooth/uuid.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

profiles/network/server.c

@@ -34,7 +34,7 @@
 #include <netinet/in.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "../src/dbus-common.h"
 #include "../src/adapter.h"

profiles/proximity/immalert.c

@@ -27,7 +27,7 @@
 #include <adapter.h>
 
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "attrib/gattrib.h"

profiles/proximity/linkloss.c

@@ -27,7 +27,7 @@
 #include <adapter.h>
 
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "attrib/att-database.h"

profiles/proximity/main.c

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "plugin.h"

profiles/proximity/manager.c

@@ -25,7 +25,7 @@
 #include <stdbool.h>
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <bluetooth/uuid.h>
 
 #include "adapter.h"

profiles/proximity/monitor.c

@@ -24,7 +24,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>

profiles/proximity/reporter.c

@@ -30,7 +30,7 @@
 #include <adapter.h>
 
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

profiles/sap/main.c

@@ -19,7 +19,7 @@
  */
 
 #include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include "plugin.h"
 #include "manager.h"
 

profiles/sap/sap-dummy.c

@@ -23,7 +23,7 @@
  */
 
 #include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 #include <stdint.h>
 
 #include "dbus-common.h"

profiles/sap/server.h

@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 int sap_server_register(const char *path, const bdaddr_t *src);
 void sap_server_unregister(const char *path);

profiles/thermometer/thermometer.c

@@ -25,7 +25,7 @@
 
 #include <bluetooth/uuid.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "dbus-common.h"
 #include "adapter.h"

src/adapter.c

@@ -39,7 +39,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 #include "textfile.h"

src/agent.c

@@ -34,7 +34,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

src/attrib-server.c

@@ -34,8 +34,8 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
+#include <gdbus/gdbus.h>
 #include "log.h"
-#include "gdbus.h"
 #include "btio.h"
 #include "sdpd.h"
 #include "hcid.h"

src/dbus-common.c

@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

src/device.c

@@ -39,7 +39,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

src/error.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "error.h"
 

src/main.c

@@ -40,7 +40,7 @@
 
 #include <dbus/dbus.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "log.h"
 

src/manager.c

@@ -38,7 +38,7 @@
 
 #include <dbus/dbus.h>
 
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include "glib-helper.h"
 #include "hcid.h"

src/profile.c

@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/uuid.h>