[Libreoffice-commits] .: sw/CppunitTest_sw_subsequent_odfexport.mk sw/CppunitTest_sw_subsequent_ww8export.mk sw/CppunitTest_sw_subsequent_ww8import.mk

[Michael Meeks]

 sw/CppunitTest_sw_subsequent_odfexport.mk |    2 +-
 sw/CppunitTest_sw_subsequent_ww8export.mk |    3 +--
 sw/CppunitTest_sw_subsequent_ww8import.mk |    3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit bdda15e82ea09abdc9ed008edee677a03530cbf3
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Jul 27 11:31:55 2012 +0100

    android: get ucpchelp1 conditionals right.

diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk
index 0b90494..21739e7 100644
--- a/sw/CppunitTest_sw_subsequent_odfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfexport.mk
@@ -84,7 +84,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\
     ucb/source/ucp/file/ucpfile1 \
     unotools/util/utl \
     unoxml/source/service/unoxml \
-    xmlhelp/util/ucpchelp1 \
+    $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport))
diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk
index d46fdfb..8c051e3 100644
--- a/sw/CppunitTest_sw_subsequent_ww8export.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8export.mk
@@ -96,8 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8export,\
     ucb/source/ucp/file/ucpfile1 \
     unotools/util/utl \
     unoxml/source/service/unoxml \
-    $(if $(filter DESKTOP,$(BUILD_TYPE)), \
-        xmlhelp/util/ucpchelp1) \
+    $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export))
diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk
index cb947e4..cb70e39 100644
--- a/sw/CppunitTest_sw_subsequent_ww8import.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8import.mk
@@ -81,8 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8import,\
     ucb/source/core/ucb1 \
     ucb/source/ucp/file/ucpfile1 \
     unoxml/source/service/unoxml \
-    $(if $(filter DESKTOP,$(BUILD_TYPE)), \
-        xmlhelp/util/ucpchelp1) \
+    $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import))