summaryrefslogtreecommitdiff
path: root/sd/Library_sd.mk
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2012-10-21 14:54:53 +0200
committerRene Engelhard <rene@debian.org>2012-10-21 23:01:47 +0200
commit7c8c73dd5cf84050a8a2c51b04d7f5278b409fd7 (patch)
treecd340ea358a42b8638377102306b7e12df011e7e /sd/Library_sd.mk
parent22238981b9f271d75f4d4c8b39b56cbc3616bff2 (diff)
fix sdremote related configure switches
sdremote itself apparently works also over IP (WLAN), so we don't need to disable it when we just don't want/have bluetooth. And also dbus is also needed in the bluez case Change-Id: I55ba07cd715d1e9bd641ef28e2391e4fe85b85e0
Diffstat (limited to 'sd/Library_sd.mk')
-rw-r--r--sd/Library_sd.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index ba2fe9ef4ff8..ae4b8a59baea 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -513,7 +513,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
ifeq ($(ENABLE_SDREMOTE),YES)
$(eval $(call gb_Library_add_exception_objects,sd,\
- sd/source/ui/remotecontrol/BluetoothServer \
sd/source/ui/remotecontrol/BufferedStreamSocket \
sd/source/ui/remotecontrol/Communicator \
sd/source/ui/remotecontrol/DiscoveryService \
@@ -528,6 +527,16 @@ $(eval $(call gb_Library_add_defs,sd,\
-DENABLE_SDREMOTE \
))
+ifeq ($(ENABLE_BLUETOOTH),YES)
+$(eval $(call gb_Library_add_exception_objects,sd,\
+ sd/source/ui/remotecontrol/BluetoothServer \
+))
+
+$(eval $(call gb_Library_add_defs,sd,\
+ -DENABLE_BLUETOOTH \
+))
+endif
+
endif
ifeq ($(strip $(GUI)),WNT)