From 981f2d3fdb99eb978dd17ef0e6e40150820e2bc0 Mon Sep 17 00:00:00 2001 From: Vinayak Chettimada Date: Fri, 31 Mar 2017 21:12:37 +0200 Subject: [PATCH] Bluetooth: Compile BR/EDR independent of BLUETOOTH_CONN check BR/EDR sources that was compiled under BLUETOOTH_CONN if-clause is moved out as independent conditional compilation based on selected BR/EDR feature support. Change-id: Iedfafc6056132654a9150ed235b245f8be62b4b1 Signed-off-by: Vinayak Chettimada --- subsys/bluetooth/host/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/subsys/bluetooth/host/Makefile b/subsys/bluetooth/host/Makefile index 6f4c0bb0d41..0be479f8f21 100644 --- a/subsys/bluetooth/host/Makefile +++ b/subsys/bluetooth/host/Makefile @@ -20,16 +20,16 @@ ifeq ($(CONFIG_BLUETOOTH_CONN),y) else obj-y += smp_null.o endif - - obj-$(CONFIG_BLUETOOTH_BREDR) += keys_br.o l2cap_br.o avdtp.o sdp.o - - obj-$(CONFIG_BLUETOOTH_RFCOMM) += rfcomm.o - - obj-$(CONFIG_BLUETOOTH_HFP_HF) += at.o hfp_hf.o - - obj-$(CONFIG_BLUETOOTH_AVDTP) += avdtp.o - - obj-$(CONFIG_BLUETOOTH_A2DP) += a2dp.o endif obj-$(CONFIG_BLUETOOTH_HOST_CRYPTO) += crypto.o + +obj-$(CONFIG_BLUETOOTH_BREDR) += keys_br.o l2cap_br.o sdp.o + +obj-$(CONFIG_BLUETOOTH_RFCOMM) += rfcomm.o + +obj-$(CONFIG_BLUETOOTH_HFP_HF) += at.o hfp_hf.o + +obj-$(CONFIG_BLUETOOTH_AVDTP) += avdtp.o + +obj-$(CONFIG_BLUETOOTH_A2DP) += a2dp.o