mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let's use only one Makefile forwarding to gbuild.

Browse Source 
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
This commit is contained in:
Matúš Kukan 2013-03-04 15:32:05 +01:00
parent 61add5c77d
commit ce1bdc424f
6 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.cross
View File

@ -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:

12
Makefile.build → Makefile.gbuild
View File

@ -7,13 +7,17 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
ifeq (,$(SOLARENV)) ifeq (,$(gb_Side))
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_host.mk gb_Side := host
endif
ifeq (,$(BUILDDIR))
BUILDDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
endif endif
gb_Side := host include $(BUILDDIR)/config_$(gb_Side).mk
include $(SOLARENV)/gbuild/gbuild.mk include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule.mk)) $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side).mk))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

12
Makefile.in
View File

@ -80,7 +80,7 @@ $(1).subsequentcheck:
cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck
$(1).all: bootstrap fetch $(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 endef
@ -125,7 +125,7 @@ gbuild_TARGETS := AllLangHelp \
Zip Zip
# build a generic gbuild target # build a generic gbuild target
$(foreach target,$(gbuild_TARGETS),$(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 # Clean
@ -216,13 +216,13 @@ bootstrap: compilerplugins
# Build # Build
# #
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) 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 : export SKIP_TESTS := YES
build-nocheck : build build-nocheck : build
cross-toolset: bootstrap fetch 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 # Install
@ -404,11 +404,11 @@ findunusedcode:
check: dev-install subsequentcheck check: dev-install subsequentcheck
subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) 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 .PHONY : debugrun help slowcheck translations unitcheck
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 endif # MAKE_RESTARTS

0
Module_cross_toolset.mk → RepositoryModule_build.mk
View File

0
RepositoryModule.mk → RepositoryModule_host.mk
View File

4
solenv/bin/callcatcher.Makefile
View File

@ -23,9 +23,9 @@ export dbglevel:=2
include $(SOLARENV)/gbuild/gbuild.mk include $(SOLARENV)/gbuild/gbuild.mk
findunusedcode: findunusedcode:
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.build $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
ooinstall -l $(DEVINSTALLDIR)/opt 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 callanalyse $(WORKDIR)/LinkTarget/*/* > unusedcode.all
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: