[Libreoffice-commits] core.git: sc/Module_sc.mk

Rene Engelhard rene at debian.org
Tue Nov 10 15:13:44 PST 2015


 sc/Module_sc.mk |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 6849dfca92506a112a89f1839b268a3a119be50b
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Nov 5 22:47:21 2015 +0100

    make Library_scqahelper a check target so it's not built on make build
    
    Change-Id: I6e7fcfd7e8819601ffe6ddac447ef9cf72fe13e6

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 21794b9..02f41e1 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -22,12 +22,6 @@ $(eval $(call gb_Module_add_l10n_targets,sc,\
 	UIConfig_scalc \
 ))
 
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Module_add_targets,sc,\
-	Library_scqahelper \
-))
-endif
-
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 
 $(eval $(call gb_Module_add_targets,sc,\
@@ -45,6 +39,8 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
+	$(if $(filter $(BUILD_TYPE),$(DESKTOP)),, \
+		Library_scqahelper) \
 	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
 		CppunitTest_sc_ucalc) \
     CppunitTest_sc_filters_test \


More information about the Libreoffice-commits mailing list