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

6 files changed, 16 insertions, 29 deletions

diff --git a/Makefile.cross b/Makefile.cross
deleted file mode 100644
index 711ee269fe63..000000000000
--- 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.build b/Makefile.gbuild
index 322a7d74141c..65ff9f25fea3 100644
--- a/Makefile.build
+++ b/Makefile.gbuild
@@ -7,13 +7,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-ifeq (,$(SOLARENV))
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_host.mk
+ifeq (,$(gb_Side))
+gb_Side := host
+endif
+ifeq (,$(BUILDDIR))
+BUILDDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 endif
 
-gb_Side := host
+include $(BUILDDIR)/config_$(gb_Side).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:
diff --git a/Makefile.in b/Makefile.in
index a605d14846cd..915db2c68d3e 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/RepositoryModule_build.mk
index bc553227bdcf..bc553227bdcf 100644
--- a/Module_cross_toolset.mk
+++ b/RepositoryModule_build.mk
diff --git a/RepositoryModule.mk b/RepositoryModule_host.mk
index 8050e46caebd..8050e46caebd 100644
--- a/RepositoryModule.mk
+++ b/RepositoryModule_host.mk
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index c88b17359b57..2375b039a3ff 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: