build: Fix not disabling obexd when given --disable-obex

--disable-obex shall disable building obexd daemon.

Change-Id: I978627b477f7ec25236e49ab1f6ac43263abf497
Signed-off-by: Amit Purwar <amit.purwar@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index f07ef83..31e812e 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,7 +228,11 @@ test_scripts =
 unit_tests =
 
 include Makefile.tools
+
+if OBEX
 include Makefile.obexd
+endif
+
 include android/Makefile.am
 
 if HID2HCI

diff --git a/Makefile.obexd b/Makefile.obexd
index 3ad8780..1fd9f10 100755 (executable)
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -1,3 +1,4 @@
+if OBEX
 
 if SYSTEMD
 #systemduserunitdir = @SYSTEMD_USERUNITDIR@
@@ -34,7 +35,6 @@ obexd_builtin_sources += obexd/plugins/opp.c
 obexd_builtin_modules += ftp
 obexd_builtin_sources += obexd/plugins/ftp.c obexd/plugins/ftp.h
 
-if OBEX
 obexd_builtin_modules += irmc
 obexd_builtin_sources += obexd/plugins/irmc.c
 
@@ -43,7 +43,6 @@ obexd_builtin_sources += obexd/plugins/pbap.c \
                                obexd/plugins/vcard.h obexd/plugins/vcard.c \
                                obexd/plugins/phonebook.h \
                                obexd/plugins/phonebook-tizen.c
-endif
 
 obexd_builtin_modules += mas
 obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
@@ -114,3 +113,5 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
 CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service
 
 EXTRA_DIST += obexd/src/genbuiltin
+
+endif