[Libreoffice-commits] core.git: sd/Library_sd.mk

[Tor Lillqvist]

 sd/Library_sd.mk |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 1b1037767adf96c23848a7ac195023e277086e54
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 22 12:59:31 2013 +0300

    Fix remote control server side build problems
    
    The non-Bluetooth (TCP) code should not be inside Bluetooth conditionals.
    
    You can't put a flag like -Wno-error in a list of objects. (And besides, why
    would we want to disable -Werror like that, instead we should not introduce
    warnings in what is after all freshly written code;)
    
    This should fix the Android tinderbox build.
    
    Change-Id: Ia698031a9815bf938c5c2a29bf68dee68cae07fe

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 1586ba0..15b720d 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -530,17 +530,31 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
     sd/source/ui/remotecontrol/Transmitter \
 ))
 
+ifneq ($(OS),MACOSX)
+
+$(eval $(call gb_Library_add_exception_objects,sd,\
+    sd/source/ui/remotecontrol/DiscoveryService \
+))
+
+else
+
+$(eval $(call gb_Library_add_objcxxobjects,sd,\
+    sd/source/ui/remotecontrol/DiscoveryService \
+    sd/source/ui/remotecontrol/OSXNetworkService, \
+))
+
+endif
+
 $(eval $(call gb_Library_add_defs,sd,\
     -DENABLE_SDREMOTE \
 ))
 
 ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES)
 
-ifeq (,$(filter IOS MACOSX,$(OS)))
+ifneq ($(OS),MACOSX))
 
 $(eval $(call gb_Library_add_exception_objects,sd,\
     sd/source/ui/remotecontrol/BluetoothServer \
-    sd/source/ui/remotecontrol/DiscoveryService \
 ))
 
 else
@@ -548,9 +562,6 @@ else
 $(eval $(call gb_Library_add_objcxxobjects,sd,\
     sd/source/ui/remotecontrol/BluetoothServer \
     sd/source/ui/remotecontrol/OSXBluetooth\
-    sd/source/ui/remotecontrol/DiscoveryService \
-    sd/source/ui/remotecontrol/OSXNetworkService, \
-    -Wno-error \
 ))
 
 $(eval $(call gb_Library_add_libs,sd,\
@@ -567,6 +578,7 @@ endif
 $(eval $(call gb_Library_add_defs,sd,\
     -DENABLE_SDREMOTE_BLUETOOTH \
 ))
+
 endif
 
 endif