Use the entire include path for btio.h

Makefile.am

@@ -357,7 +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)/btio
+		-I$(builddir)/src -I$(srcdir)/src
 
 if MCAP
 AM_CPPFLAGS += -I$(builddir)/health

Makefile.obexd

@@ -31,7 +31,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)/obexd/src \
 				-I$(srcdir)/gobex
 
 obexd_src_obexd_SHORTNAME = obexd
@@ -79,6 +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)/gobex
 
 obexd_client_obex_client_SHORTNAME = obex-client

attrib/client.c

@@ -37,7 +37,7 @@
 #include "log.h"
 #include "error.h"
 #include "dbus-common.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "storage.h"
 
 #include "att.h"

attrib/gattrib.c

@@ -33,7 +33,7 @@
 
 #include "log.h"
 #include "att.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "gattrib.h"
 
 #define GATT_TIMEOUT 30

attrib/gatttool.c

@@ -33,7 +33,7 @@
 #include <bluetooth/uuid.h>
 
 #include "att.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "gattrib.h"
 #include "gatt.h"
 #include "gatttool.h"

attrib/interactive.c

@@ -32,7 +32,7 @@
 #include <readline/history.h>
 
 #include "att.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "gattrib.h"
 #include "gatt.h"
 #include "gatttool.h"

attrib/utils.c

@@ -33,7 +33,7 @@
 #include "att.h"
 #include "gattrib.h"
 #include "gatt.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "gatttool.h"
 
 GIOChannel *gatt_connect(const gchar *src, const gchar *dst,

obexd/client/bluetooth.c

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

obexd/plugins/bluetooth.c

@@ -38,7 +38,7 @@
 #include "transport.h"
 #include "service.h"
 #include "log.h"
-#include "btio.h"
+#include <btio/btio.h>
 
 #define BT_RX_MTU 32767
 #define BT_TX_MTU 32767

obexd/plugins/syncevolution.c

@@ -39,7 +39,7 @@
 #include "mimetype.h"
 #include "log.h"
 #include "manager.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "obexd.h"
 #include "filesystem.h"
 

obexd/src/manager.c

@@ -37,7 +37,7 @@
 #include "server.h"
 #include "manager.h"
 #include "log.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "service.h"
 
 #define OBEX_MANAGER_PATH "/"

obexd/src/obex.c

@@ -47,7 +47,7 @@
 #include "mimetype.h"
 #include "service.h"
 #include "transport.h"
-#include "btio.h"
+#include <btio/btio.h>
 
 /* Challenge request */
 #define NONCE_TAG 0x00

profiles/audio/avctp.c

@@ -48,7 +48,7 @@
 #include "log.h"
 #include "error.h"
 #include "uinput.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "manager.h"
 #include "device.h"
 #include "avctp.h"

profiles/audio/avdtp.c

@@ -50,7 +50,7 @@
 #include "manager.h"
 #include "control.h"
 #include "avdtp.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "sink.h"
 #include "source.h"
 

profiles/audio/main.c

@@ -34,7 +34,7 @@
 #include <dbus/dbus.h>
 
 #include "glib-helper.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "plugin.h"
 #include "log.h"
 #include "device.h"

profiles/audio/manager.c

@@ -45,7 +45,7 @@
 #include <gdbus/gdbus.h>
 
 #include "glib-helper.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "../src/adapter.h"
 #include "../src/manager.h"
 #include "../src/device.h"

profiles/gatt/gas.c

@@ -35,7 +35,7 @@
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
 #include "attio.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "attrib/gatt.h"
 #include "log.h"
 #include "textfile.h"

profiles/health/hdp.c

@@ -35,7 +35,7 @@
 #include <error.h>
 #include <adapter.h>
 #include <device.h>
-#include <btio.h>
+#include <btio/btio.h>
 
 #include "mcap_lib.h"
 #include "hdp_types.h"

profiles/health/hdp_manager.c

@@ -26,7 +26,7 @@
 #include <bluetooth/sdp_lib.h>
 #include <bluetooth/uuid.h>
 
-#include <btio.h>
+#include <btio/btio.h>
 #include <adapter.h>
 #include <device.h>
 #include <profile.h>

profiles/health/hdp_util.c

@@ -36,7 +36,7 @@
 #include <sdp-client.h>
 #include <glib-helper.h>
 
-#include <btio.h>
+#include <btio/btio.h>
 
 #include <log.h>
 

profiles/health/mcap.c

@@ -30,7 +30,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
 
-#include <btio.h>
+#include <btio/btio.h>
 #include <log.h>
 #include <error.h>
 

profiles/health/mcap_sync.c

@@ -31,7 +31,7 @@
 #include <bluetooth/l2cap.h>
 #include <adapter.h>
 #include <manager.h>
-#include <btio.h>
+#include <btio/btio.h>
 #include <log.h>
 
 #include "mcap.h"

profiles/input/device.c

@@ -45,7 +45,7 @@
 
 #include "device.h"
 #include "error.h"
-#include "btio.h"
+#include <btio/btio.h>
 
 #include "sdp-client.h"
 

profiles/input/server.c

@@ -35,7 +35,7 @@
 #include "log.h"
 
 #include "glib-helper.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "../src/adapter.h"
 #include "../src/device.h"
 #include "../src/profile.h"

profiles/network/connection.c

@@ -35,7 +35,7 @@
 #include <gdbus/gdbus.h>
 
 #include "log.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "dbus-common.h"
 #include "adapter.h"
 #include "device.h"

profiles/network/server.c

@@ -42,7 +42,7 @@
 #include "log.h"
 #include "error.h"
 #include "sdpd.h"
-#include "btio.h"
+#include <btio/btio.h>
 
 #include "common.h"
 #include "server.h"

profiles/sap/server.c

@@ -31,7 +31,7 @@
 #include <bluetooth/uuid.h>
 
 #include "adapter.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "sdpd.h"
 #include "log.h"
 #include "error.h"

src/attrib-server.c

@@ -36,7 +36,7 @@
 
 #include <gdbus/gdbus.h>
 #include "log.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "sdpd.h"
 #include "hcid.h"
 #include "adapter.h"

src/device.c

@@ -58,7 +58,7 @@
 #include "agent.h"
 #include "sdp-xml.h"
 #include "storage.h"
-#include "btio.h"
+#include <btio/btio.h>
 #include "attrib-server.h"
 #include "attrib/client.h"
 

src/plugin.c

@@ -33,7 +33,7 @@
 #include "plugin.h"
 #include "log.h"
 #include "hcid.h"
-#include "btio.h"
+#include <btio/btio.h>
 
 static GSList *plugins = NULL;
 

src/profile.c

@@ -35,7 +35,7 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include "btio.h"
+#include <btio/btio.h>
 #include "sdpd.h"
 #include "log.h"
 #include "error.h"

src/sdp-client.c

@@ -29,7 +29,7 @@
 
 #include <glib.h>
 
-#include "btio.h"
+#include <btio/btio.h>
 #include "sdp-client.h"
 
 /* Number of seconds to keep a sdp_session_t in the cache */

test/btiotest.c

@@ -30,7 +30,7 @@
 
 #include <glib.h>
 
-#include "btio.h"
+#include <btio/btio.h>
 
 #define DEFAULT_ACCEPT_TIMEOUT 2
 static gint opt_update_sec = 0;