diff options
| author | Tony Espy <espy@canonical.com> | 2015-12-16 20:11:20 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2015-12-17 13:13:45 -0600 |
| commit | 548a11f5862668bba74d102d84f3c71282013bf7 (patch) | |
| tree | 9564a8e80c5d6b392cd5b25aa3eb5b5820486e54 | |
| parent | 2116af7cb3a637adb9ea70e7429f8d72a38920a3 (diff) | |
| download | ofono-548a11f5862668bba74d102d84f3c71282013bf7.tar.bz2 | |
build: untangle ATMODEM and BLUETOOTH conditionals
| -rw-r--r-- | Makefile.am | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index b22c04b5..8bbe25ce 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 |