* [PATCH BlueZ] build: Fix not disabling obexd when given --disable-obex
@ 2018-03-21 16:54 Luiz Augusto von Dentz
2018-03-22 8:37 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2018-03-21 16:54 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
--disable-obex shall disable building obexd daemon.
---
Makefile.am | 4 ++++
Makefile.obexd | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index daf34b6ca..5ac76d81c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -223,7 +223,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 5959f2292..11d101158 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -1,4 +1,3 @@
-
if SYSTEMD
systemduserunitdir = @SYSTEMD_USERUNITDIR@
systemduserunit_DATA = obexd/src/obex.service
@@ -32,7 +31,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
@@ -41,7 +39,6 @@ obexd_builtin_sources += obexd/plugins/pbap.c \
obexd/plugins/vcard.h obexd/plugins/vcard.c \
obexd/plugins/phonebook.h \
obexd/plugins/phonebook-dummy.c
-endif
obexd_builtin_modules += mas
obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
--
2.14.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH BlueZ] build: Fix not disabling obexd when given --disable-obex
2018-03-21 16:54 [PATCH BlueZ] build: Fix not disabling obexd when given --disable-obex Luiz Augusto von Dentz
@ 2018-03-22 8:37 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2018-03-22 8:37 UTC (permalink / raw)
To: linux-bluetooth
Hi,
On Wed, Mar 21, 2018 at 6:54 PM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> --disable-obex shall disable building obexd daemon.
> ---
> Makefile.am | 4 ++++
> Makefile.obexd | 3 ---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index daf34b6ca..5ac76d81c 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -223,7 +223,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 5959f2292..11d101158 100644
> --- a/Makefile.obexd
> +++ b/Makefile.obexd
> @@ -1,4 +1,3 @@
> -
> if SYSTEMD
> systemduserunitdir = @SYSTEMD_USERUNITDIR@
> systemduserunit_DATA = obexd/src/obex.service
> @@ -32,7 +31,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
>
> @@ -41,7 +39,6 @@ obexd_builtin_sources += obexd/plugins/pbap.c \
> obexd/plugins/vcard.h obexd/plugins/vcard.c \
> obexd/plugins/phonebook.h \
> obexd/plugins/phonebook-dummy.c
> -endif
>
> obexd_builtin_modules += mas
> obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
> --
> 2.14.3
Applied.
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-22 8:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-21 16:54 [PATCH BlueZ] build: Fix not disabling obexd when given --disable-obex Luiz Augusto von Dentz
2018-03-22 8:37 ` Luiz Augusto von Dentz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.