Makefile.build | 19 -- Makefile.cross | 17 -- Makefile.gbuild | 23 +++ Makefile.in | 12 - Module_cross_toolset.mk | 96 -------------- RepositoryModule.mk | 271 ---------------------------------------- RepositoryModule_build.mk | 96 ++++++++++++++ RepositoryModule_host.mk | 271 ++++++++++++++++++++++++++++++++++++++++ solenv/bin/callcatcher.Makefile | 4 ucpp/Module_ucpp.mk | 5 10 files changed, 401 insertions(+), 413 deletions(-)
New commits: commit 42326191c40131561bf4f307750b3d8aa98bbc57 Author: Matúš Kukan <[email protected]> Date: Tue Mar 5 09:01:24 2013 +0100 we need ucpp also for odk Change-Id: I15a2df171f49141c04f03c61ac3f30db25b6c44c diff --git a/ucpp/Module_ucpp.mk b/ucpp/Module_ucpp.mk index 2bb67d9..dc4c02f 100644 --- a/ucpp/Module_ucpp.mk +++ b/ucpp/Module_ucpp.mk @@ -9,9 +9,10 @@ $(eval $(call gb_Module_Module,ucpp)) -ifneq ($(CROSS_COMPILING),YES) +# if not cross-compiling or we need ucpp for ODK +ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,ucpp,\ - Executable_ucpp \ + Executable_ucpp \ UnpackedTarball_ucpp \ )) endif commit ce1bdc424f462236d8e6bc6c06e95d2f40b43eae Author: Matúš Kukan <[email protected]> Date: Mon Mar 4 15:32:05 2013 +0100 Let's use only one Makefile forwarding to gbuild. Well, there is still another one: solenv/gbuild/partial_build.mk This enables you to do in SRCDIR: make gb_Side=build -r -f Makefile.gbuild <target> which was not possible previously. Change-Id: I6f8ce1c6503124526986e192b7d3552b909fc157 diff --git a/Makefile.build b/Makefile.build deleted file mode 100644 index 322a7d7..0000000 --- a/Makefile.build +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -ifeq (,$(SOLARENV)) -include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_host.mk -endif - -gb_Side := host -include $(SOLARENV)/gbuild/gbuild.mk - -$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule.mk)) - -# vim: set noet sw=4 ts=4: diff --git a/Makefile.cross b/Makefile.cross deleted file mode 100644 index 711ee26..0000000 --- a/Makefile.cross +++ /dev/null @@ -1,17 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -include $(BUILDDIR)/config_build.mk - -gb_Side := build -include $(SOLARENV)/gbuild/gbuild.mk - -$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_cross_toolset.mk)) - -# vim: set noet sw=4 ts=4: diff --git a/Makefile.gbuild b/Makefile.gbuild new file mode 100644 index 0000000..65ff9f2 --- /dev/null +++ b/Makefile.gbuild @@ -0,0 +1,23 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +ifeq (,$(gb_Side)) +gb_Side := host +endif +ifeq (,$(BUILDDIR)) +BUILDDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) +endif + +include $(BUILDDIR)/config_$(gb_Side).mk + +include $(SOLARENV)/gbuild/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side).mk)) + +# vim: set noet sw=4 ts=4: diff --git a/Makefile.in b/Makefile.in index a605d14..915db2c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,7 +80,7 @@ $(1).subsequentcheck: cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck $(1).all: bootstrap fetch - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) endef @@ -125,7 +125,7 @@ gbuild_TARGETS := AllLangHelp \ Zip # build a generic gbuild target $(foreach target,$(gbuild_TARGETS),$(target)_%): - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $@ + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ # # Clean @@ -216,13 +216,13 @@ bootstrap: compilerplugins # Build # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build all slowcheck + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild all slowcheck build-nocheck : export SKIP_TESTS := YES build-nocheck : build cross-toolset: bootstrap fetch - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.cross + $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild # # Install @@ -404,11 +404,11 @@ findunusedcode: check: dev-install subsequentcheck subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) - $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $@ + $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ .PHONY : debugrun help slowcheck translations unitcheck debugrun help slowcheck translations unitcheck : - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $@ + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ endif # MAKE_RESTARTS diff --git a/Module_cross_toolset.mk b/Module_cross_toolset.mk deleted file mode 100644 index bc55322..0000000 --- a/Module_cross_toolset.mk +++ /dev/null @@ -1,96 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <[email protected]> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Module_Module,cross_toolset)) - -$(eval $(call gb_Module_add_moduledirs,cross_toolset,\ - autodoc \ - basegfx \ - binaryurp \ - bridges \ - cli_ure \ - codemaker \ - comphelper \ - cosv \ - cppu \ - cppuhelper \ - external \ - i18npool \ - i18nutil \ - idl \ - idlc \ - io \ - javaunohelper \ - jurt \ - jvmaccess \ - jvmfwk \ - l10ntools \ - o3tl \ - offapi \ - officecfg \ - oovbaapi \ - registry \ - remotebridges \ - ridljar \ - rsc \ - sal \ - salhelper \ - sax \ - setup_native \ - shell \ - solenv \ - soltools \ - stoc \ - store \ - tools \ - ucbhelper \ - udkapi \ - udm \ - unoidl \ - unoil \ - unotest \ - unotools \ - ure \ - xmlreader \ - $(call gb_Helper_optional,BOOST,boost) \ - $(call gb_Helper_optional,CLUCENE,clucene) \ - $(call gb_Helper_optional,CPPUNIT,cppunit) \ - $(call gb_Helper_optional_for_host,DESKTOP, \ - helpcompiler \ - xmlhelp \ - ) \ - $(call gb_Helper_optional,EXPAT,expat) \ - $(call gb_Helper_optional,ICU,icu) \ - $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ - $(call gb_Helper_optional,LIBXML2,libxml2) \ - $(call gb_Helper_optional,LIBXSLT,libxslt) \ - $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ - $(call gb_Helper_optional,UCPP,ucpp) \ - $(call gb_Helper_optional,ZLIB,zlib) \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/RepositoryModule.mk b/RepositoryModule.mk deleted file mode 100644 index 8050e46..0000000 --- a/RepositoryModule.mk +++ /dev/null @@ -1,271 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Norbert Thiebaud <[email protected]> (C) 2011, All Rights Reserved. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - - -$(eval $(call gb_Module_Module,libreoffice)) - -$(eval $(call gb_Module_add_moduledirs,libreoffice,\ - accessibility \ - $(call gb_Helper_optional,AFMS,afms) \ - android \ - animations \ - $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ - apple_remote \ - autodoc \ - avmedia \ - basctl \ - basebmp \ - basegfx \ - basic \ - bean \ - $(call gb_Helper_optional,BOOST,boost) \ - $(call gb_Helper_optional,BSH,beanshell) \ - binaryurp \ - $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ - bridges \ - $(call gb_Helper_optional,CAIRO,cairo) \ - canvas \ - chart2 \ - cli_ure \ - $(call gb_Helper_optional,CLUCENE,clucene) \ - $(call gb_Helper_optional,DESKTOP,codemaker) \ - comphelper \ - configmgr \ - connectivity \ - cosv \ - cppcanvas \ - cppu \ - cppuhelper \ - $(call gb_Helper_optional,CPPUNIT,cppunit) \ - cpputools \ - $(call gb_Helper_optional,CRASHREP,crashrep) \ - $(call gb_Helper_optional,CT2N,ct2n) \ - cui \ - $(call gb_Helper_optional,CURL,curl) \ - dbaccess \ - desktop \ - $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ - dtrans \ - drawinglayer \ - editeng \ - embeddedobj \ - embedserv \ - $(call gb_Helper_optional,EPM,epm) \ - eventattacher \ - $(call gb_Helper_optional,EXPAT,expat) \ - extensions \ - external \ - extras \ - fileaccess \ - filter \ - $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ - forms \ - formula \ - fpicker \ - framework \ - $(call gb_Helper_optional,FREETYPE,freetype) \ - $(call gb_Helper_optional,GRAPHITE,graphite) \ - $(call gb_Helper_optional,DESKTOP,helpcompiler) \ - $(call gb_Helper_optional,HELP,helpcontent2) \ - $(call gb_Helper_optional,HSQLDB,hsqldb) \ - $(call gb_Helper_optional,HUNSPELL,hunspell) \ - hwpfilter \ - $(call gb_Helper_optional,HYPHEN,hyphen) \ - i18npool \ - i18nutil \ - $(call gb_Helper_optional,ICU,icu) \ - idl \ - $(call gb_Helper_optional,DESKTOP,idlc) \ - instsetoo_native \ - io \ - ios \ - javaunohelper \ - $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ - $(call gb_Helper_optional,JPEG,jpeg) \ - jurt \ - jvmaccess \ - jvmfwk \ - $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ - $(call gb_Helper_optional,LCMS2,lcms2) \ - $(call gb_Helper_optional,CDR,libcdr) \ - $(call gb_Helper_optional,CMIS,libcmis) \ - $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ - $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ - $(call gb_Helper_optional,LIBPNG,libpng) \ - $(call gb_Helper_optional,MSPUB,libmspub) \ - $(call gb_Helper_optional,ORCUS,liborcus) \ - librelogo \ - $(call gb_Helper_optional,VISIO,libvisio) \ - $(call gb_Helper_optional,WPD,libwpd) \ - $(call gb_Helper_optional,WPG,libwpg) \ - $(call gb_Helper_optional,WPS,libwps) \ - $(call gb_Helper_optional,LIBXML2,libxml2) \ - libxmlsec \ - $(call gb_Helper_optional,LIBXSLT,libxslt) \ - lingucomponent \ - linguistic \ - lotuswordpro \ - $(call gb_Helper_optional,LPSOLVE,lpsolve) \ - $(call gb_Helper_optional,DESKTOP,l10ntools) \ - MathMLDTD \ - $(call gb_Helper_optional,MDDS,mdds) \ - Mesa \ - $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ - $(call gb_Helper_optional,MOZ,moz) \ - $(call gb_Helper_optional,MYSQLC,mysqlc) \ - $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ - $(call gb_Helper_optional,MYTHES,mythes) \ - $(call gb_Helper_optional,NEON,neon) \ - $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ - np_sdk \ - $(call gb_Helper_optional,NSS,nss) \ - o3tl \ - $(call gb_Helper_optional,ODK,odk) \ - offapi \ - officecfg \ - oovbaapi \ - oox \ - $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ - package \ - padmin \ - $(call gb_Helper_optional,POSTGRESQL,postgresql) \ - postprocess \ - psprint_config \ - $(call gb_Helper_optional,PYTHON,python3) \ - $(call gb_Helper_optional,PYUNO,pyuno) \ - $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ - readlicense_oo \ - $(call gb_Helper_optional,REDLAND,redland) \ - registry \ - remotebridges \ - reportbuilder \ - reportdesign \ - $(call gb_Helper_optional,RHINO,rhino) \ - ridljar \ - rsc \ - sal \ - salhelper \ - sane \ - sax \ - sc \ - scaddins \ - sccomp \ - $(call gb_Helper_optional,DESKTOP,scp2) \ - scripting \ - sd \ - sdext \ - $(call gb_Helper_optional,DESKTOP,setup_native) \ - sfx2 \ - shell \ - slideshow \ - smoketest \ - solenv \ - soltools \ - sot \ - starmath \ - stoc \ - store \ - svl \ - svtools \ - svgio \ - svx \ - sw \ - swext \ - sysui \ - test \ - testtools \ - $(call gb_Helper_optional,TOMCAT,tomcat) \ - toolkit \ - tools \ - touch \ - tubes \ - twain \ - ucb \ - ucbhelper \ - $(call gb_Helper_optional,UCPP,ucpp) \ - udkapi \ - udm \ - unixODBC \ - UnoControls \ - unodevtools \ - unoil \ - unoidl \ - unotest \ - unotools \ - unoxml \ - ure \ - uui \ - vbahelper \ - vcl \ - $(call gb_Helper_optional,VIGRA,vigra) \ - wizards \ - writerfilter \ - writerperfect \ - $(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \ - xmerge \ - $(call gb_Helper_optional,DESKTOP,xmlhelp) \ - xmloff \ - $(call gb_Helper_optional,XPDF,xpdf) \ - xmlreader \ - xmlscript \ - xmlsecurity \ - $(call gb_Helper_optional,XSLTML,xsltml) \ - $(call gb_Helper_optional,ZLIB,zlib) \ -)) - -ifeq ($(MERGELIBS),TRUE) -$(eval $(call gb_Module_add_targets,libreoffice,\ - Library_merged \ -)) -endif - -# Especially when building everything with symbols, the linking of the largest -# libraries takes enormous amounts of RAM. To prevent annoying OOM situations -# etc., try to prevent linking these in parallel by adding artificial build -# order dependencies here. -define repositorymodule_serialize1 -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) \ - :| $(foreach lib,$(2),$(call gb_Library_get_target,$(lib))) -endef - -define repositorymodule_serialize -$(if $(filter-out 0 1,$(words $(1))),\ -$(call repositorymodule_serialize1,$(firstword $(1)),$(wordlist 2,$(words $(1)),$(1)))) -$(if $(strip $(1)),\ -$(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) -endef - -ifeq (all,$(filter all,$(MAKECMDGOALS))) -$(eval $(call repositorymodule_serialize,\ - scfilt \ - $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ - sc msword swui sw sd \ - $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ - writerfilter cui chartcontroller oox \ - $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \ - xo vcl \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk new file mode 100644 index 0000000..bc55322 --- /dev/null +++ b/RepositoryModule_build.mk @@ -0,0 +1,96 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <[email protected]> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,cross_toolset)) + +$(eval $(call gb_Module_add_moduledirs,cross_toolset,\ + autodoc \ + basegfx \ + binaryurp \ + bridges \ + cli_ure \ + codemaker \ + comphelper \ + cosv \ + cppu \ + cppuhelper \ + external \ + i18npool \ + i18nutil \ + idl \ + idlc \ + io \ + javaunohelper \ + jurt \ + jvmaccess \ + jvmfwk \ + l10ntools \ + o3tl \ + offapi \ + officecfg \ + oovbaapi \ + registry \ + remotebridges \ + ridljar \ + rsc \ + sal \ + salhelper \ + sax \ + setup_native \ + shell \ + solenv \ + soltools \ + stoc \ + store \ + tools \ + ucbhelper \ + udkapi \ + udm \ + unoidl \ + unoil \ + unotest \ + unotools \ + ure \ + xmlreader \ + $(call gb_Helper_optional,BOOST,boost) \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,CPPUNIT,cppunit) \ + $(call gb_Helper_optional_for_host,DESKTOP, \ + helpcompiler \ + xmlhelp \ + ) \ + $(call gb_Helper_optional,EXPAT,expat) \ + $(call gb_Helper_optional,ICU,icu) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ + $(call gb_Helper_optional,LIBXML2,libxml2) \ + $(call gb_Helper_optional,LIBXSLT,libxslt) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ + $(call gb_Helper_optional,UCPP,ucpp) \ + $(call gb_Helper_optional,ZLIB,zlib) \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk new file mode 100644 index 0000000..8050e46 --- /dev/null +++ b/RepositoryModule_host.mk @@ -0,0 +1,271 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Norbert Thiebaud <[email protected]> (C) 2011, All Rights Reserved. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + + +$(eval $(call gb_Module_Module,libreoffice)) + +$(eval $(call gb_Module_add_moduledirs,libreoffice,\ + accessibility \ + $(call gb_Helper_optional,AFMS,afms) \ + android \ + animations \ + $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ + apple_remote \ + autodoc \ + avmedia \ + basctl \ + basebmp \ + basegfx \ + basic \ + bean \ + $(call gb_Helper_optional,BOOST,boost) \ + $(call gb_Helper_optional,BSH,beanshell) \ + binaryurp \ + $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ + bridges \ + $(call gb_Helper_optional,CAIRO,cairo) \ + canvas \ + chart2 \ + cli_ure \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,DESKTOP,codemaker) \ + comphelper \ + configmgr \ + connectivity \ + cosv \ + cppcanvas \ + cppu \ + cppuhelper \ + $(call gb_Helper_optional,CPPUNIT,cppunit) \ + cpputools \ + $(call gb_Helper_optional,CRASHREP,crashrep) \ + $(call gb_Helper_optional,CT2N,ct2n) \ + cui \ + $(call gb_Helper_optional,CURL,curl) \ + dbaccess \ + desktop \ + $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ + dtrans \ + drawinglayer \ + editeng \ + embeddedobj \ + embedserv \ + $(call gb_Helper_optional,EPM,epm) \ + eventattacher \ + $(call gb_Helper_optional,EXPAT,expat) \ + extensions \ + external \ + extras \ + fileaccess \ + filter \ + $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ + forms \ + formula \ + fpicker \ + framework \ + $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,GRAPHITE,graphite) \ + $(call gb_Helper_optional,DESKTOP,helpcompiler) \ + $(call gb_Helper_optional,HELP,helpcontent2) \ + $(call gb_Helper_optional,HSQLDB,hsqldb) \ + $(call gb_Helper_optional,HUNSPELL,hunspell) \ + hwpfilter \ + $(call gb_Helper_optional,HYPHEN,hyphen) \ + i18npool \ + i18nutil \ + $(call gb_Helper_optional,ICU,icu) \ + idl \ + $(call gb_Helper_optional,DESKTOP,idlc) \ + instsetoo_native \ + io \ + ios \ + javaunohelper \ + $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ + $(call gb_Helper_optional,JPEG,jpeg) \ + jurt \ + jvmaccess \ + jvmfwk \ + $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ + $(call gb_Helper_optional,LCMS2,lcms2) \ + $(call gb_Helper_optional,CDR,libcdr) \ + $(call gb_Helper_optional,CMIS,libcmis) \ + $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ + $(call gb_Helper_optional,LIBPNG,libpng) \ + $(call gb_Helper_optional,MSPUB,libmspub) \ + $(call gb_Helper_optional,ORCUS,liborcus) \ + librelogo \ + $(call gb_Helper_optional,VISIO,libvisio) \ + $(call gb_Helper_optional,WPD,libwpd) \ + $(call gb_Helper_optional,WPG,libwpg) \ + $(call gb_Helper_optional,WPS,libwps) \ + $(call gb_Helper_optional,LIBXML2,libxml2) \ + libxmlsec \ + $(call gb_Helper_optional,LIBXSLT,libxslt) \ + lingucomponent \ + linguistic \ + lotuswordpro \ + $(call gb_Helper_optional,LPSOLVE,lpsolve) \ + $(call gb_Helper_optional,DESKTOP,l10ntools) \ + MathMLDTD \ + $(call gb_Helper_optional,MDDS,mdds) \ + Mesa \ + $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ + $(call gb_Helper_optional,MOZ,moz) \ + $(call gb_Helper_optional,MYSQLC,mysqlc) \ + $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ + $(call gb_Helper_optional,MYTHES,mythes) \ + $(call gb_Helper_optional,NEON,neon) \ + $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ + np_sdk \ + $(call gb_Helper_optional,NSS,nss) \ + o3tl \ + $(call gb_Helper_optional,ODK,odk) \ + offapi \ + officecfg \ + oovbaapi \ + oox \ + $(call gb_Helper_optional,OPENLDAP,openldap) \ + $(call gb_Helper_optional,OPENSSL,openssl) \ + package \ + padmin \ + $(call gb_Helper_optional,POSTGRESQL,postgresql) \ + postprocess \ + psprint_config \ + $(call gb_Helper_optional,PYTHON,python3) \ + $(call gb_Helper_optional,PYUNO,pyuno) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ + readlicense_oo \ + $(call gb_Helper_optional,REDLAND,redland) \ + registry \ + remotebridges \ + reportbuilder \ + reportdesign \ + $(call gb_Helper_optional,RHINO,rhino) \ + ridljar \ + rsc \ + sal \ + salhelper \ + sane \ + sax \ + sc \ + scaddins \ + sccomp \ + $(call gb_Helper_optional,DESKTOP,scp2) \ + scripting \ + sd \ + sdext \ + $(call gb_Helper_optional,DESKTOP,setup_native) \ + sfx2 \ + shell \ + slideshow \ + smoketest \ + solenv \ + soltools \ + sot \ + starmath \ + stoc \ + store \ + svl \ + svtools \ + svgio \ + svx \ + sw \ + swext \ + sysui \ + test \ + testtools \ + $(call gb_Helper_optional,TOMCAT,tomcat) \ + toolkit \ + tools \ + touch \ + tubes \ + twain \ + ucb \ + ucbhelper \ + $(call gb_Helper_optional,UCPP,ucpp) \ + udkapi \ + udm \ + unixODBC \ + UnoControls \ + unodevtools \ + unoil \ + unoidl \ + unotest \ + unotools \ + unoxml \ + ure \ + uui \ + vbahelper \ + vcl \ + $(call gb_Helper_optional,VIGRA,vigra) \ + wizards \ + writerfilter \ + writerperfect \ + $(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \ + xmerge \ + $(call gb_Helper_optional,DESKTOP,xmlhelp) \ + xmloff \ + $(call gb_Helper_optional,XPDF,xpdf) \ + xmlreader \ + xmlscript \ + xmlsecurity \ + $(call gb_Helper_optional,XSLTML,xsltml) \ + $(call gb_Helper_optional,ZLIB,zlib) \ +)) + +ifeq ($(MERGELIBS),TRUE) +$(eval $(call gb_Module_add_targets,libreoffice,\ + Library_merged \ +)) +endif + +# Especially when building everything with symbols, the linking of the largest +# libraries takes enormous amounts of RAM. To prevent annoying OOM situations +# etc., try to prevent linking these in parallel by adding artificial build +# order dependencies here. +define repositorymodule_serialize1 +$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) \ + :| $(foreach lib,$(2),$(call gb_Library_get_target,$(lib))) +endef + +define repositorymodule_serialize +$(if $(filter-out 0 1,$(words $(1))),\ +$(call repositorymodule_serialize1,$(firstword $(1)),$(wordlist 2,$(words $(1)),$(1)))) +$(if $(strip $(1)),\ +$(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) +endef + +ifeq (all,$(filter all,$(MAKECMDGOALS))) +$(eval $(call repositorymodule_serialize,\ + scfilt \ + $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ + sc msword swui sw sd \ + $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ + writerfilter cui chartcontroller oox \ + $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \ + xo vcl \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile index c88b173..2375b03 100644 --- a/solenv/bin/callcatcher.Makefile +++ b/solenv/bin/callcatcher.Makefile @@ -23,9 +23,9 @@ export dbglevel:=2 include $(SOLARENV)/gbuild/gbuild.mk findunusedcode: - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.build + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild ooinstall -l $(DEVINSTALLDIR)/opt - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.build subsequentcheck + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck callanalyse $(WORKDIR)/LinkTarget/*/* > unusedcode.all # vim: set noet sw=4 ts=4:
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
