* [PATCH v2] build: untangle ATMODEM and BLUETOOTH conditionals
@ 2015-12-17 1:11 Tony Espy
2015-12-17 19:33 ` Denis Kenzior
0 siblings, 1 reply; 2+ messages in thread
From: Tony Espy @ 2015-12-17 1:11 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1802 bytes --]
---
Makefile.am | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b22c04b..8bbe25c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -478,9 +478,6 @@ builtin_sources += plugins/ublox.c
if BLUETOOTH
if BLUEZ4
-builtin_modules += bluez4
-builtin_sources += plugins/bluez4.c plugins/bluez4.h
-
builtin_modules += telit
builtin_sources += plugins/telit.c plugins/bluez4.h
@@ -490,11 +487,25 @@ builtin_sources += plugins/sap.c plugins/bluez4.h
builtin_modules += hfp_bluez4
builtin_sources += plugins/hfp_hf_bluez4.c plugins/bluez4.h
-builtin_modules += hfp_ag_bluez4
-builtin_sources += plugins/hfp_ag_bluez4.c plugins/bluez4.h
-
builtin_modules += dun_gw_bluez4
builtin_sources += plugins/dun_gw_bluez4.c plugins/bluez4.h
+else
+builtin_modules += hfp_bluez5
+builtin_sources += plugins/hfp_hf_bluez5.c plugins/bluez5.h
+
+builtin_modules += dun_gw_bluez5
+builtin_sources += plugins/dun_gw_bluez5.c plugins/bluez5.h
+endif
+endif
+endif
+
+if BLUETOOTH
+if BLUEZ4
+builtin_modules += bluez4
+builtin_sources += plugins/bluez4.c plugins/bluez4.h
+
+builtin_modules += hfp_ag_bluez4
+builtin_sources += plugins/hfp_ag_bluez4.c plugins/bluez4.h
builtin_sources += $(btio_sources)
builtin_cflags += @BLUEZ_CFLAGS@
@@ -503,15 +514,8 @@ else
builtin_modules += bluez5
builtin_sources += plugins/bluez5.c plugins/bluez5.h
-builtin_modules += hfp_bluez5
-builtin_sources += plugins/hfp_hf_bluez5.c plugins/bluez5.h
-
builtin_modules += hfp_ag_bluez5
builtin_sources += plugins/hfp_ag_bluez5.c plugins/bluez5.h
-
-builtin_modules += dun_gw_bluez5
-builtin_sources += plugins/dun_gw_bluez5.c plugins/bluez5.h
-endif
endif
endif
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] build: untangle ATMODEM and BLUETOOTH conditionals
2015-12-17 1:11 [PATCH v2] build: untangle ATMODEM and BLUETOOTH conditionals Tony Espy
@ 2015-12-17 19:33 ` Denis Kenzior
0 siblings, 0 replies; 2+ messages in thread
From: Denis Kenzior @ 2015-12-17 19:33 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
Hi Tony,
On 12/16/2015 07:11 PM, Tony Espy wrote:
> ---
> Makefile.am | 30 +++++++++++++++++-------------
> 1 file changed, 17 insertions(+), 13 deletions(-)
>
Applied, thanks.
Regards,
-Denis
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-17 19:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-17 1:11 [PATCH v2] build: untangle ATMODEM and BLUETOOTH conditionals Tony Espy
2015-12-17 19:33 ` Denis Kenzior
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.