cpputools/Module_cpputools.mk | 2 ++ cross_tail_build/prj/build.lst | 2 +- filter/Module_filter.mk | 7 ++++++- idlc/Module_idlc.mk | 3 +++ jvmfwk/Module_jvmfwk.mk | 2 ++ sal/Module_sal.mk | 11 +++++++---- svx/Module_svx.mk | 2 +- ucpp/Module_ucpp.mk | 5 +++++ 8 files changed, 27 insertions(+), 7 deletions(-)
New commits: commit 988b6b4406c64cdf35fb089de25d869a9108b174 Author: Tor Lillqvist <[email protected]> Date: Tue Aug 7 08:54:58 2012 +0300 Add liblangtag Change-Id: Id496417ee4dd2a93c334ba102e455d7f12c9df06 diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst index cada4b9..f9c4292 100644 --- a/cross_tail_build/prj/build.lst +++ b/cross_tail_build/prj/build.lst @@ -1,2 +1,2 @@ -ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure CLUCENE:clucene DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu jurt LIBXSLT:libxslt offapi DESKTOP:rdbmaker ridljar sal salhelper solenv stoc ucbhelper udkapi ZLIB:zlib NULL +ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure CLUCENE:clucene DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu jurt LIBLANGTAG:liblangtag LIBXSLT:libxslt offapi DESKTOP:rdbmaker ridljar sal salhelper solenv stoc ucbhelper udkapi ZLIB:zlib NULL ctb tail_build\prj nmake - all ctb_prj NULL commit 30e1b61157fa6009cd302ba0475e19037f67d513 Author: Tor Lillqvist <[email protected]> Date: Mon Aug 6 13:08:04 2012 +0300 No point with these executables for non-desktop OSes Change-Id: If2e086cf2783c187f2cdb479608aa91561e0d674 diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk index 3e5a063..7051b96 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 d719a38..d764301 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 2fd35d2..bd82e2b 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 6757b90..443fc0a 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 2a10c52..7bce17b 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 acfb788..82fe1d0 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 9829bb2..fc37f02 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: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
