[Libreoffice-commits] .: 2 commits - Module_tail_build.mk sw/CppunitTest_sw_filters_test.mk

[Tor Lillqvist]

 Module_tail_build.mk              |    2 +-
 sw/CppunitTest_sw_filters_test.mk |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0f0063e31d211157e3252ca850236eb45dcf31d1
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Apr 9 23:37:06 2012 +0300

    xmlhelp not built for non-desktop OSes

diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 86e144f..a858d3e 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -89,7 +89,8 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
     ucb/source/core/ucb1 \
     ucb/source/ucp/file/ucpfile1 \
     unoxml/source/service/unoxml \
-    xmlhelp/util/ucpchelp1 \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)), \
+	    xmlhelp/util/ucpchelp1) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
commit ff9cca69744b54ca84d98476a9a969d1aa0ff2d3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Apr 9 23:35:59 2012 +0300

    I meant DESKTOP, not XMLHELP

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index cd69300..a19f71c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -92,7 +92,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     writerfilter \
     writerperfect \
     xmerge \
-	$(if $(filter XMLHELP,$(BUILD_TYPE)), \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)), \
 	    xmlhelp) \
     xmloff \
     xmlscript \