Bypass cppunit stuff for non-DESKTOP in more places

We don't run any cppunit tests for cross-compiled platforms anyway, so no
point in compiling that. (Especially as compiling cppunit currently fails in a
--enable-werror build at least for Android thanks to -Wundef.)

Change-Id: I3139c62305ccfeddc0f67729f10e224618d2fc03

cppunit/Module_cppunit.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Module_Module,cppunit))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
 ifeq ($(SYSTEM_CPPUNIT),NO)
 $(eval $(call gb_Module_add_targets,cppunit,\
 	UnpackedTarball_cppunit \
@@ -17,4 +19,6 @@ $(eval $(call gb_Module_add_targets,cppunit,\
 ))
 endif
 
+endif
+
 # vim: set noet sw=4 ts=4:

test/Module_test.mk

@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Module_Module,test))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_subsequenttest \
@@ -34,4 +36,6 @@ $(eval $(call gb_Module_add_targets,test,\
     Package_unittest \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4:

unotest/Module_unotest.mk

@@ -27,12 +27,14 @@
 
 $(eval $(call gb_Module_Module,unotest))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,unotest,\
 	Library_unobootstrapprotector \
 	Library_unoexceptionprotector \
 	Library_unotest \
     Package_inc \
 ))
+endif
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,unotest,\