Use the entire include path for gdbus.h

This commit is contained in:
Lucas De Marchi 2012-12-05 09:22:52 -02:00 committed by Johan Hedberg
parent c61a78c877
commit aa77b0bea9
68 changed files with 69 additions and 71 deletions

View File

@ -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_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \ AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
-I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/gdbus \ -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/btio
-I$(srcdir)/btio
if MCAP if MCAP
AM_CPPFLAGS += -I$(builddir)/health AM_CPPFLAGS += -I$(builddir)/health

View File

@ -32,7 +32,7 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \ obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
-I$(builddir)/obexd/src \ -I$(builddir)/obexd/src \
-I$(srcdir)/obexd/src -I$(srcdir)/btio \ -I$(srcdir)/obexd/src -I$(srcdir)/btio \
-I$(srcdir)/gobex -I$(srcdir)/gdbus -I$(srcdir)/gobex
obexd_src_obexd_SHORTNAME = obexd 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 \ obexd_client_obex_client_CPPFLAGS = -include $(top_builddir)/config.h \
-I$(builddir)/lib -I$(srcdir)/obexd/src \ -I$(builddir)/lib -I$(srcdir)/obexd/src \
-I$(srcdir)/btio -I$(srcdir)/gobex \ -I$(srcdir)/btio -I$(srcdir)/gobex
-I$(srcdir)/gdbus
obexd_client_obex_client_SHORTNAME = obex-client obexd_client_obex_client_SHORTNAME = obex-client

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -32,6 +32,7 @@
#include <bluetooth/bluetooth.h> #include <bluetooth/bluetooth.h>
#include <gdbus/gdbus.h>
#include "plugin.h" #include "plugin.h"
#include "obex.h" #include "obex.h"
#include "service.h" #include "service.h"
@ -40,7 +41,6 @@
#include "manager.h" #include "manager.h"
#include "btio.h" #include "btio.h"
#include "obexd.h" #include "obexd.h"
#include "gdbus.h"
#include "filesystem.h" #include "filesystem.h"
#define SYNCML_TARGET_SIZE 11 #define SYNCML_TARGET_SIZE 11

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * 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); int sap_server_register(const char *path, const bdaddr_t *src);
void sap_server_unregister(const char *path); void sap_server_unregister(const char *path);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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