diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 11:35:02 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 19:58:49 +0000 |
| commit | f0b94ad3e74afca55016ee1e15b0848ede51a016 (patch) | |
| tree | e3e0ad4400c4982cdb537581760419841d360831 /sd | |
| parent | 87b3670557ae723b8ef016b459bcda1567cf8365 (diff) | |
ENABLE_BLUETOOTH* Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: Ia27882faa9c85c439bc1f77987d766f65f1d8cef
Reviewed-on: https://gerrit.libreoffice.org/5699
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 20 | ||||
| -rw-r--r-- | sd/Library_sdui.mk | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index e791d03488e6..955253b298c7 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -533,7 +533,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/view/zoomlist \ )) -ifeq ($(ENABLE_SDREMOTE),YES) +ifeq ($(ENABLE_SDREMOTE),TRUE) $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BufferedStreamSocket \ sd/source/ui/remotecontrol/Communicator \ @@ -550,13 +550,13 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\ sd/source/ui/remotecontrol/OSXNetworkService \ )) -else +else # OS!=MACSOX ifeq ($(ENABLE_AVAHI),TRUE) $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/AvahiNetworkService \ )) -endif +endif # ENABLE_AVAHI=TRUE $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/DiscoveryService \ @@ -577,15 +577,15 @@ $(eval $(call gb_Library_add_cobjects,sd,\ sd/source/ui/remotecontrol/mDNSResponder/dllmain \ )) -endif +endif # OS=WNT -endif +endif # OS!=MACOSX $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE \ )) -ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),TRUE) ifneq ($(OS),MACOSX) @@ -593,7 +593,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ )) -else +else # OS!=MACOSX $(eval $(call gb_Library_add_objcxxobjects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ @@ -609,14 +609,14 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sd,\ IOBluetooth \ )) -endif +endif # OS!=MACOSX $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) -endif +endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE -endif +endif # ENABLE_SDREMOTE=TRUE # vim: set noet sw=4 ts=4: diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 53f279d1b850..8eb3145aedd7 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -15,12 +15,12 @@ $(eval $(call gb_Library_set_include,sdui,\ -I$(SRCDIR)/sd/source/ui/inc \ )) -ifeq ($(ENABLE_SDREMOTE),YES) +ifeq ($(ENABLE_SDREMOTE),TRUE) $(eval $(call gb_Library_add_defs,sdui,\ -DENABLE_SDREMOTE \ )) -ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),TRUE) $(eval $(call gb_Library_add_defs,sdui,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) |