From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Thu, 22 Mar 2018 09:16:26 +0000 (+0200)
Subject: build: Fix make distcheck
X-Git-Tag: accepted/tizen/unified/20190522.085452~1^2~134
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3730422520f1103165bffed4b55d2c0f47656e47;p=platform%2Fupstream%2Fbluez.git

build: Fix make distcheck

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

diff --git a/Makefile.am b/Makefile.am
index 31e812e..f07ef83 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,11 +228,7 @@ 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 1fd9f10..d91658a 100755
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -1,5 +1,3 @@
-if OBEX
-
 if SYSTEMD
 #systemduserunitdir = @SYSTEMD_USERUNITDIR@
 systemduserunitdir = @SYSTEMD_SYSTEMUNITDIR@
@@ -12,6 +10,8 @@ endif
 
 EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
 
+if OBEX
+
 obex_plugindir = $(libdir)/obex/plugins
 
 obexd_builtin_modules =
@@ -97,6 +97,8 @@ obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src  \
 				-I$(srcdir)/obexd/src -I$(srcdir)/btio \
 				-I$(srcdir)/gobex -I$(srcdir)/gdbus
 
+endif
+
 obexd_src_obexd_SHORTNAME = obexd
 
 obexd_builtin_files = obexd/src/builtin.h $(obexd_builtin_nodist)
@@ -113,5 +115,3 @@ 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