[Libreoffice-commits] core.git: codemaker/Module_codemaker.mk salhelper/Module_salhelper.mk

[jan Iversen]

 codemaker/Module_codemaker.mk |    6 ++----
 salhelper/Module_salhelper.mk |    2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 99cde7238ec2e7c961f62e8353f2266f11fea0ce
Author: jan Iversen <jani at libreoffice.org>
Date:   Tue Jun 27 09:10:54 2017 +0200

    iOS, remove java and cppunittest
    
    Low level functions will not be tested
    
    Change-Id: I72fa44ea713639db97e39801a3975d6731a684c2

diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index c65d86c390cb..8b8f13f3b4fa 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -11,15 +11,13 @@ $(eval $(call gb_Module_Module,codemaker))
 
 # if not cross-compiling or we need this for ODK
 ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE)))
-ifneq ($(OS),IOS)
 $(eval $(call gb_Module_add_targets,codemaker,\
     StaticLibrary_codemaker \
     StaticLibrary_codemaker_cpp \
-    StaticLibrary_codemaker_java \
-    Executable_javamaker \
+    $(if $(filter TRUE,$(ENABLE_JAVA)),StaticLibrary_codemaker_java) \
+    $(if $(filter TRUE,$(ENABLE_JAVA)),Executable_javamaker) \
     Executable_cppumaker \
 ))
 endif
-endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
index 9278844b6c77..696e93471d0f 100644
--- a/salhelper/Module_salhelper.mk
+++ b/salhelper/Module_salhelper.mk
@@ -14,8 +14,10 @@ $(eval $(call gb_Module_add_targets,salhelper,\
 	Library_salhelper \
 ))
 
+ifneq ($(OS),IOS)
 $(eval $(call gb_Module_add_check_targets,salhelper,\
 	CppunitTest_salhelper_testapi \
 ))
+endif
 
 # vim: set noet sw=4 ts=4: