diff options
| -rw-r--r-- | cpputools/Module_cpputools.mk | 2 | ||||
| -rw-r--r-- | filter/Module_filter.mk | 7 | ||||
| -rw-r--r-- | idlc/Module_idlc.mk | 3 | ||||
| -rw-r--r-- | jvmfwk/Module_jvmfwk.mk | 2 | ||||
| -rw-r--r-- | sal/Module_sal.mk | 11 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 2 | ||||
| -rw-r--r-- | ucpp/Module_ucpp.mk | 5 |
7 files changed, 26 insertions, 6 deletions
diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk index 3e5a063c0abf..7051b96864cc 100644 --- a/cpputools/Module_cpputools.mk +++ b/cpputools/Module_cpputools.mk @@ -35,11 +35,13 @@ $(eval $(call gb_Module_add_targets,cpputools,\ StaticLibrary_uno \ )) else +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,cpputools,\ Executable_regcomp \ Executable_regsingleton \ Executable_uno \ )) +endif ifneq ($(OS),WNT) $(eval $(call gb_Module_add_targets,cpputools,\ diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index d719a387dde5..d764301391e5 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Module_add_targets,filter,\ AllLangResTarget_xsltdlg \ Configuration_filter \ CustomTarget_svg \ - Executable_svg2odf \ Library_PptImporter \ Library_egi \ Library_eme \ @@ -69,6 +68,12 @@ $(eval $(call gb_Module_add_targets,filter,\ Package_xslt \ )) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,filter,\ + Executable_svg2odf \ +)) +endif + ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,filter,\ Jar_XSLTFilter \ diff --git a/idlc/Module_idlc.mk b/idlc/Module_idlc.mk index 2fd35d2648b7..bd82e2b641da 100644 --- a/idlc/Module_idlc.mk +++ b/idlc/Module_idlc.mk @@ -8,6 +8,9 @@ # $(eval $(call gb_Module_Module,idlc)) + +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,idlc,Executable_idlc)) +endif # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index 6757b903a57b..443fc0a5fd76 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -42,10 +42,12 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\ )) ifneq ($(OS),MACOSX) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,jvmfwk,\ Executable_javaldx \ )) endif +endif endif diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 2a10c52f8680..7bce17b45485 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ CustomTarget_generated \ CustomTarget_sal_allheaders \ - $(if $(filter $(OS),IOS),, \ - Executable_osl_process_child) \ Executable_cppunittester \ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ @@ -46,6 +44,13 @@ $(eval $(call gb_Module_add_targets,sal,\ StaticLibrary_salcpprt \ )) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,sal,\ + Executable_osl_process_child \ + CppunitTest_sal_osl_process \ +)) +endif + $(eval $(call gb_Module_add_check_targets,sal,\ CppunitTest_Module_DLL \ CppunitTest_sal_bytesequence \ @@ -57,8 +62,6 @@ $(eval $(call gb_Module_add_check_targets,sal,\ CppunitTest_sal_osl_old_test_file \ CppunitTest_sal_osl_security \ CppunitTest_sal_osl_thread \ - $(if $(filter $(OS),IOS),, \ - CppunitTest_sal_osl_process) \ CppunitTest_sal_rtl_alloc \ CppunitTest_sal_rtl_cipher \ CppunitTest_sal_rtl_crc32 \ diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index acfb7885f74e..82fe1d0eefa7 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_targets,svx,\ Package_sdi \ )) -ifneq ($(OS),IOS) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal.bin \ Package_gengal \ diff --git a/ucpp/Module_ucpp.mk b/ucpp/Module_ucpp.mk index 9829bb2519f7..fc37f0259eb3 100644 --- a/ucpp/Module_ucpp.mk +++ b/ucpp/Module_ucpp.mk @@ -11,7 +11,12 @@ $(eval $(call gb_Module_Module,ucpp)) $(eval $(call gb_Module_add_targets,ucpp,\ CustomTarget_source \ +)) + +ifneq ($(CROSS_COMPILING),YES) +$(eval $(call gb_Module_add_targets,ucpp,\ Executable_ucpp \ )) +endif # vim: set noet sw=4 ts=4: |