OSDN Git Service

build: Include bluetooth lib folder for obexd
authorChan-yeol Park <chanyeol.park@samsung.com>
Wed, 5 Dec 2012 02:27:57 +0000 (11:27 +0900)
committerJohan Hedberg <johan.hedberg@intel.com>
Wed, 5 Dec 2012 08:40:41 +0000 (10:40 +0200)
Because obexd is included in bluez repo, obexd should refer to local
lib folder before system's one.

Makefile.obexd

index 1ed423b..cbcd65d 100644 (file)
@@ -29,7 +29,7 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
                                        -DPLUGINDIR=\""$(obex_plugindir)"\" \
                                        -fPIC -D_FILE_OFFSET_BITS=64
 
-obexd_src_obexd_CPPFLAGS = -I$(builddir)/obexd/src \
+obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src  \
                                -I$(srcdir)/obexd/src -I$(srcdir)/btio \
                                -I$(srcdir)/gobex -I$(srcdir)/gdbus
 
@@ -76,7 +76,8 @@ obexd_client_obex_client_LDADD = lib/libbluetooth-private.la \
 obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
                                                -fPIC -D_FILE_OFFSET_BITS=64
 
-obexd_client_obex_client_CPPFLAGS = -I$(srcdir)/obexd/src -I$(srcdir)/btio \
-                                       -I$(srcdir)/gobex -I$(srcdir)/gdbus
+obexd_client_obex_client_CPPFLAGS = -I$(builddir)/lib -I$(srcdir)/obexd/src \
+                               -I$(srcdir)/btio -I$(srcdir)/gobex \
+                               -I$(srcdir)/gdbus
 
 obexd_client_obex_client_SHORTNAME = obex-client