switch to include-based build rather than sourced-based build

107 files changed, 1220 insertions, 4155 deletions

diff --git a/Makefile b/Makefile
index ed8e30e6a8a6..29093cd2ca79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,395 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
+
+.PHONY : all bootstrap fetch build clean clean-build clean-host
+all: build
+
+SHELL=/usr/bin/env bash
+SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
+
+ifeq ($(gb_Side),)
+gb_Side:=host
+endif
+
+include $(SRCDIR)/config_$(gb_Side).mk
+
+ifneq ($(verbose),)
+GMAKE_OPTIONS:=-rs
+else
+GMAKE_OPTIONS:=-r
+endif
+
+gbuild_modules:= \
+MathMLDTD\
+Mesa\
+UnoControls\
+accessibility\
+animations\
+avmedia\
+basctl\
+basebmp\
+basegfx\
+basic\
+bean\
+binaryurp\
+canvas\
+chart2\
+comphelper\
+configmgr\
+cppcanvas\
+cppu\
+cppuhelper\
+cui\
+dbaccess\
+desktop\
+drawinglayer\
+dtrans\
+editeng\
+eventattacher\
+extensions\
+fileaccess\
+filter\
+forms\
+formula\
+fpicker\
+framework\
+hwpfilter\
+i18npool\
+i18nutil\
+idl\
+lingucomponent\
+linguistic\
+lotuswordpro\
+nlpsolver\
+np_sdk\
+o3tl\
+offapi\
+officecfg\
+oovbaapi\
+oox\
+package\
+padmin\
+psprint_config\
+qadevOOo\
+regexp\
+reportdesign\
+rsc\
+sal\
+salhelper\
+sane\
+sax\
+sc\
+scaddins\
+sccomp\
+scripting\
+sd\
+sfx2\
+slideshow\
+sot\
+starmath\
+svl\
+svtools\
+svx\
+sw\
+swext\
+tail_build\
+test\
+toolkit\
+tools\
+twain\
+ucb\
+ucbhelper\
+udkapi\
+unixODBC\
+unotools\
+unoxml\
+ure\
+uui\
+vbahelper\
+vcl\
+wizards\
+writerfilter\
+writerperfect\
+xmerge\
+xml2cmp\
+xmloff\
+xmlreader\
+xmlscript\
+xmlsecurity\
+
+dmake_modules:=\
+afms\
+apache-commons\
+apple_remote\
+autodoc\
+beanshell\
+berkeleydb\
+binfilter \
+boost\
+bridges\
+cairo\
+cli_ure\
+codemaker\
+connectivity\
+cosv\
+cppunit\
+cpputools\
+crashrep\
+ct2n\
+curl\
+dictionaries \
+embeddedobj\
+embedserv\
+epm\
+expat\
+external\
+extras\
+fontconfig\
+freetype\
+gdk-pixbuf\
+gettext\
+glib\
+graphite\
+helpconten2 \
+hsqldb\
+hunspell\
+hyphen\
+icc\
+icu\
+idlc\
+instsetoo_native\
+io\
+javaunohelper\
+jfreereport\
+jpeg\
+jurt\
+jvmaccess\
+jvmfwk\
+l10ntools\
+languagetool\
+libcdr\
+libcmis\
+libcroco\
+libexttextcat\
+libgsf\
+libpng\
+librsvg\
+libvisio\
+libwpd\
+libwpg\
+libwps\
+libxml2\
+libxmlsec\
+libxslt\
+lpsolve\
+lucene\
+mdds\
+migrationanalysis\
+more_fonts\
+moz\
+mysqlc\
+mysqlcppconn\
+mythes\
+neon\
+nss\
+odk\
+openssl\
+packimages\
+pango\
+postgresql\
+postprocess\
+python\
+pyuno\
+rdbmaker\
+readlicense_oo\
+redland\
+registry\
+remotebridges\
+reportbuilder\
+rhino\
+ridljar\
+saxon\
+scp2\
+sdext\
+setup_native\
+shell\
+smoketest\
+solenv\
+soltools\
+stax\
+stlport\
+stoc\
+store\
+sysui\
+tomcat\
+udm\
+unodevtools\
+unoil\
+unotest\
+vigra\
+x11_extensions\
+xmlhelp\
+xpdf\
+xsltml\
+zlib\
+
+define gbuild_module_rules
+.PHONY: $(1) $(1).clean
+
+$(1): bootstrap fetch
+	cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
+
+$(1).clean:
+	cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean
+
+endef
+
+define gbuild_modules_rules
+$(foreach m,$(1),$(call gbuild_module_rules,$(m)))
+endef
+
+define dmake_module_rules
+.PHONY: $(1) $(1).all $(1).deliver $(1).clean
+
+$(1): bootstrap fetch
+	cd $(1) && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
+
+$(1).all: bootstrap fetch
+	cd $(1) && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+
+$(1).deliver: bootstrap fetch
+	cd $(1) && $(SOLARENV)/bin/deliver.pl
+
+$(1).clean:
+	rm -fr $(1)/$(INPATH)
+
+endef
+
+define dmake_modules_rules
+$(foreach m,$(1),$(call dmake_module_rules,$(m)))
+endef
+
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Build
+#
+build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+	cd instsetoo_native && \
+	$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+
+cross-toolset:
+	cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
+
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# Partial Build
 #
-# This file is part of OpenOffice.org.
+$(eval $(call gbuild_modules_rules,$(gbuild_modules)))
+
+$(eval $(call dmake_modules_rules,$(dmake_modules)))
+
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+# Clean
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
+clean: clean-host clean-build
+
+clean-host:
+	rm -fr $(SRCDIR)/*/$(INPATH)
+	rm -fr $(SRCDIR)/workdir/*
+	rm -fr $(SRCDIR)/solver/$(INPATH)
+	rm -fr install
+
+clean-build:
+ifeq ($(CROSS_COMPILING),YES)
+	rm -rf */$(INPATH_FOR_BUILD)
+endif
+
 #
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
+# Distclean
 #
-#*************************************************************************
+distclean : clean
+ifeq ($(BUILD_DMAKE),YES)
+	(if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(GMAKE_PARALLELISM) -C dmake distclean; fi) && \
+	rm -f solenv/*/bin/dmake*
+endif
+	rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
+    bin/repo-list config.log config.status configure \
+	desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
+	config_host.mk.last set_soenv.stamp src.downloaded warn
 
 # The real targets are in solenv/gbuild/Module.mk, resp.
 # solenv/gbuild/extensions/post_BuildplTargets.mk, this file only forwards
 # the calls - please look there if you want to edit what this toplevel
 # Makefile does.
 
-SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
 
-ifeq ($(strip $(gb_SourceEnvAndRecurse_STAGE)),)
-include $(SRCDIR)/solenv/gbuild/source_and_rerun.mk
-endif
+#
+# Bootstap
+#
+$(WORKDIR)/bootstrap:
+	@cd $(SRCDIR) && ./bootstrap
+	@mkdir -p $(dir $@) && touch $@
+
+bootstrap: $(WORKDIR)/bootstrap
+
+#
+# Fetch
+#
+fetch: src.downloaded
 
-ifeq ($(gb_SourceEnvAndRecurse_STAGE),reconfigure)
-SOLARENV:=$(SRCDIR)/solenv
+src.downloaded : ooo.lst download
+ifeq (@DO_FETCH_TARBALLS@,YES)
+	./download $(SRCDIR)/ooo.lst && touch $@
+else
+	@echo "Automatic fetching of external tarballs is disabled."
 endif
 
-ifneq ($(filter reconfigure gbuild buildpl,$(gb_SourceEnvAndRecurse_STAGE)),)
+#
+# Install
+#
+
+install:
+	echo "Installing in $(INSTALLDIR)..." && \
+	ooinstall "$(INSTALLDIR)" && \
+	echo "" && \
+	echo "Installation finished, you can now execute:" && \
+	echo "$(INSTALLDIR)/program/soffice"
+
+#dev-install:  $(WORKDIR)/bootstrap \
+#			  $(ROOT_SRC)/src.downloaded \
+#			  $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \
+#			| $(filter build,$(MAKECMDGOALS)) \
+#			  $(if $(filter check,$(MAKECMDGOALS)),build)
+#	@rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
+#	cd smoketestoo_native && \
+#	$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+
+distro-pack-install: install
+	$(SRCDIR)/bin/distro-install-clean-up
+	$(SRCDIR)/bin/distro-install-desktop-integration
+	$(SRCDIR)/bin/distro-install-sdk
+	$(SRCDIR)/bin/distro-install-file-lists
+
+id:
+	@create-ids
+
+tags:
+	@create-tags
+
+docs:
+	@mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
+
+findunusedcode:
+	@which callcatcher > /dev/null 2>&1 || \
+	    (echo "callcatcher not installed" && false)
+	@sed -e s,$$INPATH,callcatcher,g $(SRCDIR)/config_host.mk > $(SRCDIR)/config_host_callcatcher.mk
+	@mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
+	    ln -sf $(SRCDIR)/solenv/$(INPATH)/bin/dmake \
+		$(SRCDIR)/solenv/callcatcher/bin/dmake
+	@$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile
+	@grep ::.*\( unusedcode.all | grep -v ^cppu:: > unusedcode.easy
+
+ifneq ( $(filter-out check debugrun dev-install subsequentcheck unitcheck,$(MAKECMDGOALS)),$(MAKECMDGOALS))
+gb_SourceEnvAndRecurse_STAGE=buildpl
 include $(SOLARENV)/gbuild/gbuild.mk
 $(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/MathMLDTD/Makefile b/MathMLDTD/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/MathMLDTD/Makefile
+++ b/MathMLDTD/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/Mesa/Makefile b/Mesa/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/Mesa/Makefile
+++ b/Mesa/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/UnoControls/Makefile b/UnoControls/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/UnoControls/Makefile
+++ b/UnoControls/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/animations/Makefile b/animations/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/animations/Makefile
+++ b/animations/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Makefile b/avmedia/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/avmedia/Makefile
+++ b/avmedia/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/basctl/Makefile b/basctl/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/basctl/Makefile
+++ b/basctl/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/basebmp/Makefile b/basebmp/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/basebmp/Makefile
+++ b/basebmp/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/basegfx/Makefile b/basegfx/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/basegfx/Makefile
+++ b/basegfx/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/basic/Makefile b/basic/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/basic/Makefile
+++ b/basic/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/bean/Makefile b/bean/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/bean/Makefile
+++ b/bean/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/binaryurp/Makefile b/binaryurp/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/binaryurp/Makefile
+++ b/binaryurp/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/canvas/Makefile b/canvas/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/canvas/Makefile
+++ b/canvas/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/Makefile b/chart2/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/chart2/Makefile
+++ b/chart2/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/comphelper/Makefile b/comphelper/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/comphelper/Makefile
+++ b/comphelper/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/config_host.mk.in b/config_host.mk.in
index 5f01d439c99a..23c758edeaa8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -2,515 +2,515 @@
  # this file is intented to be able to be included in a Makefile
  # or to be sourced in a shell session
  #
-export SRC_ROOT="@SRC_ROOT@"
+export SRC_ROOT=@SRC_ROOT@
 
-export ABOUT_BITMAP="@ABOUT_BITMAP@"
-export ALIGNOF_DOUBLE="@ALIGNOF_DOUBLE@"
-export ALIGNOF_INT="@ALIGNOF_INT@"
-export ALIGNOF_LONG="@ALIGNOF_LONG@"
-export ALIGNOF_SHORT="@ALIGNOF_SHORT@"
-export ALLOC="@ALLOC@"
-export ANT="@ANT@"
-export ANT_HOME="@ANT_HOME@"
-export ANT_LIB="@ANT_LIB@"
-export ANCIENT_BISON="@ANCIENT_BISON@"
-export ANDROID_NDK_HOME="@ANDROID_NDK_HOME@"
-export ANDROID_SDK_HOME="@ANDROID_SDK_HOME@"
-export AR="@AR@"
-export ATL_INCLUDE="@ATL_INCLUDE@"
-export ATL_LIB="@ATL_LIB@"
-export AWTLIB='@AWTLIB@'
-export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@"
-export BSH_JAR="@BSH_JAR@"
-export BUILD_DMAKE="@BUILD_DMAKE@"
-export BUILD_EPM="@BUILD_EPM@"
-export BUILD_MOZAB="@BUILD_MOZAB@"
-export BUILD_NCPUS="@BUILD_NCPUS@"
-export BUILD_PLATFORM="@build@"
-export BUILD_POSTGRESQL_SDBC="@BUILD_POSTGRESQL_SDBC@"
-export BUILD_STAX="@BUILD_STAX@"
-export BUILD_TYPE="@BUILD_TYPE@"
-export BUILD_UNOWINREG="@BUILD_UNOWINREG@"
-export BUILD_VER_STRING="@BUILD_VER_STRING@"
-export BUILD_X64="@BUILD_X64@"
-export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
-export CAIRO_LIBS="@CAIRO_LIBS@"
-export CC="@CC@"
-export CC_FOR_BUILD="@CC_FOR_BUILD@"
-export CDR_CFLAGS="@CDR_CFLAGS@"
-export CDR_LIBS="@CDR_LIBS@"
-export CLASSPATH="@CLASSPATH@"
-export CL_X64="@CL_X64@"
-export COM="@COM@"
-export COMEX="@COMEX@"
-export COMMONS_CODEC_JAR="@COMMONS_CODEC_JAR@"
-export COMMONS_HTTPCLIENT_JAR="@COMMONS_HTTPCLIENT_JAR@"
-export COMMONS_LANG_JAR="@COMMONS_LANG_JAR@"
-export COMMONS_LOGGING_JAR="@COMMONS_LOGGING_JAR@"
-export COMPATH="@COMPATH@"
-export COMP_ENV="@OUTPATH@"
-export COM_FOR_BUILD="@COM_FOR_BUILD@"
-export CPPUNIT_CFLAGS="@CPPUNIT_CFLAGS@"
-export CPPUNIT_LIBS="@CPPUNIT_LIBS@"
-export CPU="@CPU@"
-export CPUNAME="@CPUNAME@"
-export CPUNAME_FOR_BUILD="@CPUNAME_FOR_BUILD@"
-export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
-export CROSS_COMPILING="@CROSS_COMPILING@"
-export CT2N_EXTENSION_PACK="@CT2N_EXTENSION_PACK@"
-export CURL_CFLAGS="@CURL_CFLAGS@"
-export CURL_LIBS="@CURL_LIBS@"
-export CXX="@CXX@"
-export CXX_FOR_BUILD="@CXX_FOR_BUILD@"
-export CXX_X64_BINARY="@CXX_X64_BINARY@"
-export DATADIR="@DATADIR@"
-export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
-export DBUSMENUGTK_LIBS="@DBUSMENUGTK_LIBS@"
-export DBUS_CFLAGS="@DBUS_CFLAGS@"
-export DBUS_LIBS="@DBUS_LIBS@"
-export DB_CPPLIB="@DB_CPPLIB@"
-export DB_LIB="@DB_LIB@"
-export debug="@ENABLE_DEBUG@"
-export DEFAULT_MOZILLA_TOOLKIT="@MOZILLA_TOOLKIT@"
-export DEFAULT_TO_ENGLISH_FOR_PACKING="yes"
-export DIAGRAM_EXTENSION_PACK="@DIAGRAM_EXTENSION_PACK@"
-export DICT_SYSTEM_DIR="@DICT_SYSTEM_DIR@"
-export DIRECTXSDK_LIB="@DIRECTXSDK_LIB@"
-export DISABLE_ACTIVEX="@DISABLE_ACTIVEX@"
-export DISABLE_ATL="@DISABLE_ATL@"
-export DISABLE_LINKOO="@DISABLE_LINKOO@"
-export DISABLE_NEON="@DISABLE_NEON@"
-export DISABLE_PYTHON="@DISABLE_PYTHON@"
-export DISABLE_STRIP="@DISABLE_STRIP@"
-export DLLTOOL="@DLLTOOL@"
-export DMAKEROOT="@SRC_ROOT@/solenv/inc/startup"
-export DOCDIR="@DOCDIR@"
-export DOXYGEN="@DOXYGEN@"
-export DO_FETCH_TARBALLS="@DO_FETCH_TARBALLS@"
-export DPKG="@DPKG@"
-export DYNAMIC_CRT="@DYNAMIC_CRT@"
-export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
-export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@"
-export ENABLE_DBUS="@ENABLE_DBUS@"
-export ENABLE_DIRECTX="@ENABLE_DIRECTX@"
-export ENABLE_EVOAB2="@ENABLE_EVOAB2@"
-export ENABLE_GCONF="@ENABLE_GCONF@"
-export ENABLE_GIO="@ENABLE_GIO@"
-export ENABLE_GNOMEVFS="@ENABLE_GNOMEVFS@"
-export ENABLE_GRAPHITE="@ENABLE_GRAPHITE@"
-export ENABLE_GSTREAMER="@ENABLE_GSTREAMER@"
-export ENABLE_GTK3="@ENABLE_GTK3@"
-export ENABLE_GTK="@ENABLE_GTK@"
-export ENABLE_GTK_PRINT="@ENABLE_GTK_PRINT@"
-export ENABLE_KAB="@ENABLE_KAB@"
-export ENABLE_KDE4="@ENABLE_KDE4@"
-export ENABLE_KDE="@ENABLE_KDE@"
-export ENABLE_LIBRSVG="@ENABLE_LIBRSVG@"
-export ENABLE_LOCKDOWN="@ENABLE_LOCKDOWN@"
-export ENABLE_LOMENUBAR="@ENABLE_LOMENUBAR@"
-export ENABLE_LTO="@ENABLE_LTO@"
-export ENABLE_MEDIAWIKI="@ENABLE_MEDIAWIKI@"
-export ENABLE_MINIMIZER="@ENABLE_MINIMIZER@"
-export ENABLE_MYSQLC="@ENABLE_MYSQLC@"
-export ENABLE_NSPLUGIN="@ENABLE_NSPLUGIN@"
-export ENABLE_ONLINE_UPDATE="@ENABLE_ONLINE_UPDATE@"
-export ENABLE_OPENGL="@ENABLE_OPENGL@"
-export ENABLE_OXYGENOFFICE="@ENABLE_OXYGENOFFICE@"
-export ENABLE_PDFIMPORT="@ENABLE_PDFIMPORT@"
-export ENABLE_PRESENTER_SCREEN="@ENABLE_PRESENTER_SCREEN@"
-export ENABLE_QUICKSTART_LIBPNG="@ENABLE_QUICKSTART_LIBPNG@"
-export ENABLE_RANDR="@ENABLE_RANDR@"
-export ENABLE_RELEASE_BUILD="@ENABLE_RELEASE_BUILD@"
-export ENABLE_REPORTBUILDER="@ENABLE_REPORTBUILDER@"
-export ENABLE_SCRIPTING_BEANSHELL="@ENABLE_SCRIPTING_BEANSHELL@"
-export ENABLE_SCRIPTING_JAVASCRIPT="@ENABLE_SCRIPTING_JAVASCRIPT@"
-export ENABLE_SCRIPTING_PYTHON="@ENABLE_SCRIPTING_PYTHON@"
-export ENABLE_SILENT_MSI="@ENABLE_SILENT_MSI@"
-export ENABLE_SYMBOLS="@ENABLE_SYMBOLS@"
-export ENABLE_SYSTRAY_GTK="@ENABLE_SYSTRAY_GTK@"
-export ENABLE_UGLY="@ENABLE_UGLY@"
-export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
-export ENABLE_ZENITY="@ENABLE_ZENITY@"
-export EPM="@EPM@"
-export EPM_FLAGS="@EPM_FLAGS@"
-export EXTERNAL_WARNINGS_NOT_ERRORS="@EXTERNAL_WARNINGS_NOT_ERRORS@"
-@x_Cygwin@ export FIND="@WIN_FIND@"
-export FLUTE_JAR="@FLUTE_JAR@"
-export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
-export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
-export FRAMEWORKSHOME="@FRAMEWORKSHOME@"
-export FREETYPE_CFLAGS="@FREETYPE_CFLAGS@"
-export FREETYPE_LIBS="@FREETYPE_LIBS@"
-export GCONF_CFLAGS="@GCONF_CFLAGS@"
-export GCONF_LIBS="@GCONF_LIBS@"
-export GIO_CFLAGS="@GIO_CFLAGS@"
-export GIO_LIBS="@GIO_LIBS@"
-export GIT_LINK_SRC="@GIT_LINK_SRC@"
-export GIT_REPO_NAMES="@GIT_REPO_NAMES@"
-export GMAKE_MODULE_PARALLELISM="@GMAKE_MODULE_PARALLELISM@"
-export GMAKE_PARALLELISM="@GMAKE_PARALLELISM@"
-export GNOMEVFS_CFLAGS="@GNOMEVFS_CFLAGS@"
-export GNOMEVFS_LIBS="@GNOMEVFS_LIBS@"
-@x_GNUCP@ export GNUCOPY="@GNUCP@"
-export GNUMAKE="@GNUMAKE@"
-export GNUPATCH="@GNUPATCH@"
-export GNUTAR="@GNUTAR@"
-export GOBJECT_CFLAGS="@GOBJECT_CFLAGS@"
-export GOBJECT_LIBS="@GOBJECT_LIBS@"
-export GOOGLE_DOCS_EXTENSION_PACK="@GOOGLE_DOCS_EXTENSION_PACK@"
-export GPERF="@GPERF@"
-export GPERF="@GPERF@"
-export GRAPHITE_CFLAGS="@GRAPHITE_CFLAGS@"
-export GRAPHITE_LIBS="@GRAPHITE_LIBS@"
-@x_Cygwin@ export GREP="@WIN_GREP@"
-export GSTREAMER_CFLAGS="@GSTREAMER_CFLAGS@"
-export GSTREAMER_LIBS="@GSTREAMER_LIBS@"
-export GTHREAD_CFLAGS="@GTHREAD_CFLAGS@"
-export GTHREAD_LIBS="@GTHREAD_LIBS@"
-export GTK3_CFLAGS="@GTK3_CFLAGS@"
-export GTK3_LIBS="@GTK3_LIBS@"
-export GTK_CFLAGS="@GTK_CFLAGS@"
-export GTK_LIBS="@GTK_LIBS@"
-export GTK_PRINT_CFLAGS="@GTK_PRINT_CFLAGS@"
-export GTK_PRINT_LIBS="@GTK_PRINT_LIBS@"
-export GUI="@GUI@"
-export GUIBASE="@GUIBASE@"
-export GUIBASE_FOR_BUILD="@GUIBASE_FOR_BUILD@"
-export GUI_FOR_BUILD="@GUI_FOR_BUILD@"
-export GXX_INCLUDE_PATH="@GXX_INCLUDE_PATH@"
-export HAVE_CXX0X="@HAVE_CXX0X@"
-export HAVE_GCC_AVX="@HAVE_GCC_AVX@"
-export HAVE_GCC_NO_LONG_DOUBLE="@HAVE_GCC_NO_LONG_DOUBLE@"
-export HAVE_GCC_VISIBILITY_BROKEN="@HAVE_GCC_VISIBILITY_BROKEN@"
-export HAVE_GCC_VISIBILITY_FEATURE="@HAVE_GCC_VISIBILITY_FEATURE@"
-export HAVE_GETOPT="@HAVE_GETOPT@"
-export HAVE_LD_BSYMBOLIC_FUNCTIONS="@HAVE_LD_BSYMBOLIC_FUNCTIONS@"
-export HAVE_LD_HASH_STYLE="@HAVE_LD_HASH_STYLE@"
-export HAVE_POSIX_FALLOCATE="@HAVE_POSIX_FALLOCATE@"
-export HAVE_READDIR_R="@HAVE_READDIR_R@"
-export HAVE_THREADSAFE_STATICS="@HAVE_THREADSAFE_STATICS@"
-export HOST_PLATFORM="@host@"
-export HSQLDB_JAR="@HSQLDB_JAR@"
-export HUNART_EXTENSION_PACK="@HUNART_EXTENSION_PACK@"
-export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
-export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
-export HYPHEN_LIB="@HYPHEN_LIB@"
-export HYPH_SYSTEM_DIR="@HYPH_SYSTEM_DIR@"
-export ICU_MAJOR="@ICU_MAJOR@"
-export ICU_MICRO="@ICU_MICRO@"
-export ICU_MINOR="@ICU_MINOR@"
-export ICU_RECLASSIFIED_CLOSE_PARENTHESIS="@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@"
-export ILIB="@ILIB@"
-@x_Cygwin@ export INCLUDE=""
-export INPATH="@INPATH@"
-export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
-export INSTALLDIR="@INSTALLDIR@"
-export INSTALLDIRNAME="@INSTALLDIRNAME@"
-export INTRO_BIPMAP="@INTRO_BITMAP@"
-export JAVAFLAGS="@JAVAFLAGS@"
-export JAVAIFLAGS="@JAVAIFLAGS@"
-export JAVAINTERPRETER="@JAVAINTERPRETER@"
-export JAVACISGCJ="@JAVACISGCJ@"
-export JAVACISKAFFE="@JAVACISKAFFE@"
-export JAVACOMPILER="@JAVACOMPILER@"
-export JAVADOC="@JAVADOC@"
-@x_JAVALIB@ export JAVALIB="@JAVALIB@"
-export JAVA_HOME="@JAVA_HOME@"
-export JAVA_SOURCE_VER="@JAVA_SOURCE_VER@"
-export JAVA_TARGET_VER="@JAVA_TARGET_VER@"
-export JDK="@JDK@"
-@x_JDKLIB@ export JDKLIB="@JDKLIB@"
-export JITC_PROCESSOR_TYPE="@JITC_PROCESSOR_TYPE@"
-export JFREEREPORT_JAR="@JFREEREPORT_JAR@"
-export JVM_ONE_PATH_CHECK="@JVM_ONE_PATH_CHECK@"
-export KDE4_CFLAGS="@KDE4_CFLAGS@"
-export KDE4_LIBS="@KDE4_LIBS@"
-export KDE_CFLAGS="@KDE_CFLAGS@"
-export KDE_GLIB_CFLAGS="@KDE_GLIB_CFLAGS@"
-export KDE_GLIB_LIBS="@KDE_GLIB_LIBS@"
-export KDE_HAVE_GLIB="@KDE_HAVE_GLIB@"
-export KDE_LIBS="@KDE_LIBS@"
-export L10N_MODULE="@L10N_MODULE@"
-export LFS_CFLAGS="@LFS_CFLAGS@"
-export LIBBASE_JAR="@LIBBASE_JAR@"
-export LIBCMIS_CFLAGS="@LIBCMIS_CFLAGS@"
-export LIBCMIS_LIBS="@LIBCMIS_LIBS@"
-export LIBDIR="@LIBDIR@"
-export LIBEXTTEXTCAT_CFLAGS="@LIBEXTTEXTCAT_CFLAGS@"
-export LIBEXTTEXTCAT_LIBS="@LIBEXTTEXTCAT_LIBS@"
-export LIBFONTS_JAR="@LIBFONTS_JAR@"
-export LIBFORMULA_JAR="@LIBFORMULA_JAR@"
-export LIBLAYOUT_JAR="@LIBLAYOUT_JAR@"
-export LIBLOADER_JAR="@LIBLOADER_JAR@"
-export LIBMGR_X64_BINARY="@LIBMGR_X64_BINARY@"
-export LIBMYSQL_PATH="@LIBMYSQL_PATH@"
-export LIBPNG_CFLAGS="@LIBPNG_CFLAGS@"
-export LIBPNG_LIBS="@LIBPNG_LIBS@"
-export LIBREPOSITORY_JAR="@LIBREPOSITORY_JAR@"
-export LIBSERIALIZER_JAR="@LIBSERIALIZER_JAR@"
-export LIBXML_CFLAGS="@LIBXML_CFLAGS@"
-export LIBXML_JAR="@LIBXML_JAR@"
-export LIBXML_LIBS="@LIBXML_LIBS@"
-export LIBXSLT_CFLAGS="@LIBXSLT_CFLAGS@"
-export LIBXSLT_LIBS="@LIBXSLT_LIBS@"
-export LINK_X64_BINARY="@LINK_X64_BINARY@"
-@x_Cygwin@ export LS="@WIN_LS@"
-export LUCENE_ANALYZERS_JAR="@LUCENE_ANALYZERS_JAR@"
-export LUCENE_CORE_JAR="@LUCENE_CORE_JAR@"
-export MANDIR="@MANDIR@"
-export MACOSX_DEPLOYMENT_TARGET="@MACOSX_DEPLOYMENT_TARGET@"
-export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD="@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@"
-export MACOSX_SDK_PATH="@MACOSX_SDK_PATH@"
-export MAC_OS_X_VERSION_MAX_ALLOWED="@MAC_OS_X_VERSION_MAX_ALLOWED@"
-export MAC_OS_X_VERSION_MIN_REQUIRED="@MAC_OS_X_VERSION_MIN_REQUIRED@"
-export MDDS_CPPFLAGS="@MDDS_CPPFLAGS@"
-export MERGELIBS="@MERGELIBS@"
-export MFC_INCLUDE="@MFC_INCLUDE@"
-export MFC_LIB="@MFC_LIB@"
-export MINGWCXX="@MINGWCXX@"
-export MINGWSTRIP="@MINGWSTRIP@"
-export MINGW_CLIB_DIR="@MINGW_CLIB_DIR@"
-export MINGW_EXTERNAL_DLLS="@MINGW_EXTERNAL_DLLS@"
-export MINGW_GCCDLL="@MINGW_GCCDLL@"
-export MINGW_GXXDLL="@MINGW_GXXDLL@"
-export MINGW_SHARED_GCCLIB="@MINGW_SHARED_GCCLIB@"
-export MINGW_SHARED_GXXLIB="@MINGW_SHARED_GXXLIB@"
-export MINGW_SHARED_LIBSTDCPP="@MINGW_SHARED_LIBSTDCPP@"
-export MKDEPENDSOLVER="TRUE"
-export ML_EXE="@ML_EXE@"
-export MOC4="@MOC4@"
-export MOC="@MOC@"
-export MOZILLABUILD="@MOZILLABUILD@"
-export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@"
-export MOZILLA_VERSION="@MOZILLA_VERSION@"
-export MOZ_FLAVOUR="@MOZ_FLAVOUR@"
-export MOZ_INC="@MOZ_INC@"
-export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@"
-export MOZ_LIB="@MOZ_LIB@"
-export MOZ_LIB_XPCOM="@MOZ_LIB_XPCOM@"
-export MYSQL_DEFINES="@MYSQL_DEFINES@"
-export MYSQL_INC="@MYSQL_INC@"
-export MYSQL_LIB="@MYSQL_LIB@"
-export MYTHES_CFLAGS="@MYTHES_CFLAGS@"
-export MYTHES_LIBS="@MYTHES_LIBS@"
-export NEON_CFLAGS="@NEON_CFLAGS@"
-export NEON_LIBS="@NEON_LIBS@"
-export NEON_VERSION="@NEON_VERSION@"
-export NM="@NM@"
-export nodep="@nodep@"
-export NSS_CFLAGS="@NSS_CFLAGS@"
-export NSS_LIBS="@NSS_LIBS@"
-export NUMBERTEXT_EXTENSION_PACK="@NUMBERTEXT_EXTENSION_PACK@"
-export OBJDUMP="@OBJDUMP@"
-export OOOBLOGGER_EXTENSION_PACK="@OOOBLOGGER_EXTENSION_PACK@"
-export OOODMAKEMODE="YES"
-export OOOP_FONTS_PACK="@OOOP_FONTS_PACK@"
-export OOOP_GALLERY_PACK="@OOOP_GALLERY_PACK@"
-export OOOP_SAMPLES_PACK="@OOOP_SAMPLES_PACK@"
-export OOOP_TEMPLATES_PACK="@OOOP_TEMPLATES_PACK@"
-export OOO_JUNIT_JAR="@OOO_JUNIT_JAR@"
-export OOO_SHELL="@BASH@"
-export OOO_VENDOR="@OOO_VENDOR@"
-export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
-export OPENSSL_LIBS="@OPENSSL_LIBS@"
-export OS="@OS@"
-export OSVERSION="@OSVERSION@"
-export OS_FOR_BUILD="@OS_FOR_BUILD@"
-export OUTDIR="@OUTDIR@"
-export OUTDIR_FOR_BUILD="@OUTDIR_FOR_BUILD@"
-export OUTPATH="@OUTPATH@"
-export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@"
-export OXYGENOFFICE_PACK="@OXYGENOFFICE_PACK@"
-export PATH="@LO_PATH@"
-export PATH_FOR_BUILD="@LO_PATH_FOR_BUILD@"
-export PATH_SEPERATOR="@P_SEP@"
-export PERL="@PERL@"
-export PKGFORMAT="@PKGFORMAT@"
-export PKGMK="@PKGMK@"
-export PKG_CONFIG="@PKG_CONFIG@"
-export POPPLER_CFLAGS="@POPPLER_CFLAGS@"
-export POPPLER_LIBS="@POPPLER_LIBS@"
-export POSTGRESQL_INC="@POSTGRESQL_INC@"
-export POSTGRESQL_LIB="@POSTGRESQL_LIB@"
-export PREBUILD_MOZAB="@PREBUILD_MOZAB@"
-export PREFIXDIR="@PREFIXDIR@"
-export PRODUCT="@PRODUCT@"
-export PRODUCTNAME="@PRODUCTNAME@"
-export PRODUCTVERSION="@PRODUCTVERSION@"
-export PROGRESSBARCOLOR="@PROGRESSBARCOLOR@"
-export PROGRESSFRAMECOLOR="@PROGRESSFRAMECOLOR@"
-export PROGRESSPOSITION="@PROGRESSPOSITION@"
-export PROGRESSSIZE="@PROGRESSSIZE@"
-export PROEXT="@PROEXT@"
-export PSPRINT="TRUE"
-export PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
-export PTHREAD_LIBS="@PTHREAD_LIBS@"
-export PYTHON="@PYTHON@"
-export PYTHON_CFLAGS="@PYTHON_CFLAGS@"
-export PYTHON_LIBS="@PYTHON_LIBS@"
-export RANLIB="@RANLIB@"
-export REDLAND_CFLAGS="@REDLAND_CFLAGS@"
-export REDLAND_LIBS="@REDLAND_LIBS@"
-export RPM="@RPM@"
-export SAC_JAR="@SAC_JAR@"
-export SAL_ENABLE_FILE_LOCKING="1"
-export SAMPLEICC_CFLAGS="@SAMPLEICC_CFLAGS@"
-export SAMPLEICC_LIBS="@SAMPLEICC_LIBS@"
-export SAXON_JAR="@SAXON_JAR@"
-export SCPDEFS='@SCPDEFS@'
-export SERVLETAPI_JAR="@SERVLETAPI_JAR@"
-export SHOWINCLUDES_PREFIX="@SHOWINCLUDES_PREFIX@"
-export SIZEOF_DOUBLE="@SIZEOF_DOUBLE@"
-export SIZEOF_INT="@SIZEOF_INT@"
-export SIZEOF_LONG="@SIZEOF_LONG@"
-export SIZEOF_LONGLONG="@SIZEOF_LONGLONG@"
-export SIZEOF_POINTER="@SIZEOF_POINTER@"
-export SIZEOF_SHORT="@SIZEOF_SHORT@"
-export SOLARENV="@SRC_ROOT@/solenv"
-export SOLAREXTRALIB="@SOLAREXTRALIB@"
-export SOLARINC="@SOLARINC@"
-export SOLARINC_FOR_BUILD="@SOLARINC_FOR_BUILD@"
-export SOLARLIB="@SOLARLIB@"
-export SOLARLIB_FOR_BUILD="@SOLARLIB_FOR_BUILD@"
-export SOLARVER="@SRC_ROOT@/solver"
-export SOLARVERSION="@SRC_ROOT@/solver"
-export SOLAR_JAVA="@SOLAR_JAVA@"
-export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@"
-export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@"
-export SRCDIR="@SRC_ROOT@"
-export STARTCENTER_LEFT_BITMAP="@STARTCENTER_LEFT_BITMAP@"
-export STARTCENTER_RIGHT_BITMAP="@STARTCENTER_RIGHT_BITMAP@"
-export STARTCENTER_RTL_LEFT_BITMAP="@STARTCENTER_RTL_LEFT_BITMAP@"
-export STARTCENTER_RTL_RIGHT_BITMAP="@STARTCENTER_RTL_RIGHT_BITMAP@"
-export STARTCENTER_SPACE_BITMAP="@STARTCENTER_SPACE_BITMAP@"
-export STRIP="@STRIP@"
-export SUNTEMPLATES_DE_PACK="@SUNTEMPLATES_DE_PACK@"
-export SUNTEMPLATES_EN_US_PACK="@SUNTEMPLATES_EN_US_PACK@"
-export SUNTEMPLATES_ES_PACK="@SUNTEMPLATES_ES_PACK@"
-export SUNTEMPLATES_FR_PACK="@SUNTEMPLATES_FR_PACK@"
-export SUNTEMPLATES_HU_PACK="@SUNTEMPLATES_HU_PACK@"
-export SUNTEMPLATES_IT_PACK="@SUNTEMPLATES_IT_PACK@"
-export SYSBASE="@SYSBASE@"
-export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@"
-export SYSTEM_BOOST="@SYSTEM_BOOST@"
-export SYSTEM_BSH="@SYSTEM_BSH@"
-export SYSTEM_CAIRO="@SYSTEM_CAIRO@"
-export SYSTEM_CPPUNIT="@SYSTEM_CPPUNIT@"
-export SYSTEM_CURL="@SYSTEM_CURL@"
-export SYSTEM_DB="@SYSTEM_DB@"
-export SYSTEM_DB_CFLAGS="@SYSTEM_DB_CFLAGS@"
-export SYSTEM_DICTS="@SYSTEM_DICTS@"
-export SYSTEM_EXPAT="@SYSTEM_EXPAT@"
-export SYSTEM_GDKPIXBUF="@SYSTEM_GDKPIXBUF@"
-export SYSTEM_GENBRK="@SYSTEM_GENBRK@"
-export SYSTEM_GENCCODE="@SYSTEM_GENCCODE@"
-export SYSTEM_GENCMN="@SYSTEM_GENCMN@"
-export SYSTEM_GETTEXT="@SYSTEM_GETTEXT@"
-export SYSTEM_GLIB="@SYSTEM_GLIB@"
-export SYSTEM_GRAPHITE="@SYSTEM_GRAPHITE@"
-export SYSTEM_HSQLDB="@SYSTEM_HSQLDB@"
-export SYSTEM_HUNSPELL="@SYSTEM_HUNSPELL@"
-export SYSTEM_HYPH="@SYSTEM_HYPH@"
-export SYSTEM_ICU="@SYSTEM_ICU@"
-export SYSTEM_JFREEREPORT="@SYSTEM_JFREEREPORT@"
-export SYSTEM_JPEG="@SYSTEM_JPEG@"
-export SYSTEM_LIBC="@SYSTEM_LIBC@"
-export SYSTEM_LIBCDR="@SYSTEM_LIBCDR@"
-export SYSTEM_LIBCMIS="@SYSTEM_LIBCMIS@"
-export SYSTEM_LIBCROCO="@SYSTEM_LIBCROCO@"
-export SYSTEM_LIBEXTTEXTCAT="@SYSTEM_LIBEXTTEXTCAT@"
-export SYSTEM_LIBEXTTEXTCAT_DATA="@SYSTEM_LIBEXTTEXTCAT_DATA@"
-export SYSTEM_LIBGSF="@SYSTEM_LIBGSF@"
-export SYSTEM_LIBJPEG="@SYSTEM_LIBJPEG@"
-export SYSTEM_LIBPNG="@SYSTEM_LIBPNG@"
-export SYSTEM_LIBRSVG="@SYSTEM_LIBRSVG@"
-export SYSTEM_LIBVISIO="@SYSTEM_LIBVISIO@"
-export SYSTEM_LIBWPD="@SYSTEM_LIBWPD@"
-export SYSTEM_LIBWPG="@SYSTEM_LIBWPG@"
-export SYSTEM_LIBWPS="@SYSTEM_LIBWPS@"
-export SYSTEM_LIBXML="@SYSTEM_LIBXML@"
-export SYSTEM_LIBXSLT="@SYSTEM_LIBXSLT@"
-export SYSTEM_LIBXSLT_FOR_BUILD="@SYSTEM_LIBXSLT_FOR_BUILD@"
-export SYSTEM_LPSOLVE="@SYSTEM_LPSOLVE@"
-export SYSTEM_LUCENE="@SYSTEM_LUCENE@"
-export SYSTEM_MDDS="@SYSTEM_MDDS@"
-export SYSTEM_MESA_HEADERS="@SYSTEM_MESA_HEADERS@"
-export SYSTEM_MOZILLA="@SYSTEM_MOZILLA@"
-export SYSTEM_MOZILLA_HEADERS="@SYSTEM_MOZILLA_HEADERS@"
-export SYSTEM_MYSQL="@SYSTEM_MYSQL@"
-export SYSTEM_MYSQL_CPPCONN="@SYSTEM_MYSQL_CPPCONN@"
-export SYSTEM_MYTHES="@SYSTEM_MYTHES@"
-export SYSTEM_NEON="@SYSTEM_NEON@"
-export SYSTEM_NSS="@SYSTEM_NSS@"
-export SYSTEM_ODBC_HEADERS="@SYSTEM_ODBC_HEADERS@"
-export SYSTEM_OPENSSL="@SYSTEM_OPENSSL@"
-export SYSTEM_PANGO="@SYSTEM_PANGO@"
-export SYSTEM_POPPLER="@SYSTEM_POPPLER@"
-export SYSTEM_POSTGRESQL="@SYSTEM_POSTGRESQL@"
-export SYSTEM_PYTHON="@SYSTEM_PYTHON@"
-export SYSTEM_REDLAND="@SYSTEM_REDLAND@"
-export SYSTEM_SAMPLEICC="@SYSTEM_SAMPLEICC@"
-export SYSTEM_SANE_HEADER="@SYSTEM_SANE_HEADER@"
-export SYSTEM_SAXON="@SYSTEM_SAXON@"
-export SYSTEM_SERVLETAPI="@SYSTEM_SERVLETAPI@"
-export SYSTEM_STDLIBS="@SYSTEM_STDLIBS@"
-export SYSTEM_VIGRA="@SYSTEM_VIGRA@"
-export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
-export TARFILE_LOCATION="@TARFILE_LOCATION@"
-export THES_SYSTEM_DIR="@THES_SYSTEM_DIR@"
-@x_Cygwin@ export TMP="@TMP_DIRECTORY@"
-export TMPDIR="@TEMP_DIRECTORY@"
-export TYPO_EXTENSION_PACK="@TYPO_EXTENSION_PACK@"
-export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@"
-export UPD="@UPD@"
-export USE_FT_EMBOLDEN="@USE_FT_EMBOLDEN@"
-export use_shl_version="@use_shl_version@"
-export USE_XINERAMA="@USE_XINERAMA@"
-export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"
-export VALIDATOR_EXTENSION_PACK="@VALIDATOR_EXTENSION_PACK@"
-export VERBOSE="@VERBOSE@"
-export VISIO_CFLAGS="@VISIO_CFLAGS@"
-export VISIO_LIBS="@VISIO_LIBS@"
-export WATCH_WINDOW_EXTENSION_PACK="@WATCH_WINDOW_EXTENSION_PACK@"
-export WINDOWS_SDK_HOME="@WINDOWS_SDK_HOME@"
-export WINDRES="@WINDRES@"
-export WITHOUT_AFMS="@WITHOUT_AFMS@"
-export WITHOUT_PPDS="@WITHOUT_PPDS@"
-export WITH_AGFA_MONOTYPE_FONTS="@WITH_AGFA_MONOTYPE_FONTS@"
-export WITH_BINFILTER="@WITH_BINFILTER@"
-export WITH_COMPAT_OOWRAPPERS="@WITH_COMPAT_OOWRAPPERS@"
-export WITH_EXTENSION_INTEGRATION="@WITH_EXTENSION_INTEGRATION@"
-export WITH_EXTRA_FONT="@WITH_EXTRA_FONT@"
-export WITH_EXTRA_GALLERY="@WITH_EXTRA_GALLERY@"
-export WITH_EXTRA_SAMPLE="@WITH_EXTRA_SAMPLE@"
-export WITH_EXTRA_TEMPLATE="@WITH_EXTRA_TEMPLATE@"
-export WITH_FONTS="@WITH_FONTS@"
-export WITH_GSSAPI="@WITH_GSSAPI@"
-export WITH_HELPPACK_INTEGRATION="@WITH_HELPPACK_INTEGRATION@"
-export WITH_KRB5="@WITH_KRB5@"
-export WITH_LANG="@WITH_LANG@"
-export WITH_LANG_LIST="@WITH_LANG_LIST@"
-export WITH_LDAP="@WITH_LDAP@"
-export WITH_LINKER_HASH_STYLE="@WITH_LINKER_HASH_STYLE@"
-export WITH_MOZILLA="@WITH_MOZILLA@"
-export WITH_MYSPELL_DICTS="@WITH_MYSPELL_DICTS@"
-export WITH_OPENLDAP="@WITH_OPENLDAP@"
-export WITH_POOR_HELP_LOCALIZATIONS="@WITH_POOR_HELP_LOCALIZATIONS@"
-export WITH_STLPORT="@WITH_STLPORT@"
-export WITH_THEMES="@WITH_THEMES@"
-export WORDS_BIGENDIAN="@WORDS_BIGENDIAN@"
-export WORKDIR="@WORKDIR@"
-export WORKDIR_FOR_BUILD="@WORKDIR_FOR_BUILD@"
-export WORK_STAMP="@SOURCEVERSION@"
-export WPD_CFLAGS="@WPD_CFLAGS@"
-export WPD_LIBS="@WPD_LIBS@"
-export WPG_CFLAGS="@WPG_CFLAGS@"
-export WPG_LIBS="@WPG_LIBS@"
-export WPS_CFLAGS="@WPS_CFLAGS@"
-export WPS_LIBS="@WPS_LIBS@"
-export XCLASSPATH="@XCLASSPATH@"
-export XINERAMA_LINK="@XINERAMA_LINK@"
-export XRANDR_CFLAGS="@XRANDR_CFLAGS@"
-export XRANDR_DLOPEN="@XRANDR_DLOPEN@"
-export XRANDR_LIBS="@XRANDR_LIBS@"
-export XSLTPROC="@XSLTPROC@"
+export ABOUT_BITMAP=@ABOUT_BITMAP@
+export ALIGNOF_DOUBLE=@ALIGNOF_DOUBLE@
+export ALIGNOF_INT=@ALIGNOF_INT@
+export ALIGNOF_LONG=@ALIGNOF_LONG@
+export ALIGNOF_SHORT=@ALIGNOF_SHORT@
+export ALLOC=@ALLOC@
+export ANT=@ANT@
+export ANT_HOME=@ANT_HOME@
+export ANT_LIB=@ANT_LIB@
+export ANCIENT_BISON=@ANCIENT_BISON@
+export ANDROID_NDK_HOME=@ANDROID_NDK_HOME@
+export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
+export AR=@AR@
+export ATL_INCLUDE=@ATL_INCLUDE@
+export ATL_LIB=@ATL_LIB@
+export AWTLIB=@AWTLIB@
+export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
+export BSH_JAR=@BSH_JAR@
+export BUILD_DMAKE=@BUILD_DMAKE@
+export BUILD_EPM=@BUILD_EPM@
+export BUILD_MOZAB=@BUILD_MOZAB@
+export BUILD_NCPUS=@BUILD_NCPUS@
+export BUILD_PLATFORM=@build@
+export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
+export BUILD_STAX=@BUILD_STAX@
+export BUILD_TYPE=@BUILD_TYPE@
+export BUILD_UNOWINREG=@BUILD_UNOWINREG@
+export BUILD_VER_STRING=@BUILD_VER_STRING@
+export BUILD_X64=@BUILD_X64@
+export CAIRO_CFLAGS=@CAIRO_CFLAGS@
+export CAIRO_LIBS=@CAIRO_LIBS@
+export CC=@CC@
+export CC_FOR_BUILD=@CC_FOR_BUILD@
+export CDR_CFLAGS=@CDR_CFLAGS@
+export CDR_LIBS=@CDR_LIBS@
+export CLASSPATH=@CLASSPATH@
+export CL_X64=@CL_X64@
+export COM=@COM@
+export COMEX=@COMEX@
+export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@
+export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@
+export COMMONS_LANG_JAR=@COMMONS_LANG_JAR@
+export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@
+export COMPATH=@COMPATH@
+export COMP_ENV=@OUTPATH@
+export COM_FOR_BUILD=@COM_FOR_BUILD@
+export CPPUNIT_CFLAGS=@CPPUNIT_CFLAGS@
+export CPPUNIT_LIBS=@CPPUNIT_LIBS@
+export CPU=@CPU@
+export CPUNAME=@CPUNAME@
+export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
+export CPU_FOR_BUILD=@CPU_FOR_BUILD@
+export CROSS_COMPILING=@CROSS_COMPILING@
+export CT2N_EXTENSION_PACK=@CT2N_EXTENSION_PACK@
+export CURL_CFLAGS=@CURL_CFLAGS@
+export CURL_LIBS=@CURL_LIBS@
+export CXX=@CXX@
+export CXX_FOR_BUILD=@CXX_FOR_BUILD@
+export CXX_X64_BINARY=@CXX_X64_BINARY@
+export DATADIR=@DATADIR@
+export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@
+export DBUSMENUGTK_LIBS=@DBUSMENUGTK_LIBS@
+export DBUS_CFLAGS=@DBUS_CFLAGS@
+export DBUS_LIBS=@DBUS_LIBS@
+export DB_CPPLIB=@DB_CPPLIB@
+export DB_LIB=@DB_LIB@
+export debug=@ENABLE_DEBUG@
+export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
+export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
+export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
+export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
+export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
+export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
+export DISABLE_ATL=@DISABLE_ATL@
+export DISABLE_LINKOO=@DISABLE_LINKOO@
+export DISABLE_NEON=@DISABLE_NEON@
+export DISABLE_PYTHON=@DISABLE_PYTHON@
+export DISABLE_STRIP=@DISABLE_STRIP@
+export DLLTOOL=@DLLTOOL@
+export DMAKEROOT=@SRC_ROOT@/solenv/inc/startup
+export DOCDIR=@DOCDIR@
+export DOXYGEN=@DOXYGEN@
+export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
+export DPKG=@DPKG@
+export DYNAMIC_CRT=@DYNAMIC_CRT@
+export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
+export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
+export ENABLE_DBUS=@ENABLE_DBUS@
+export ENABLE_DIRECTX=@ENABLE_DIRECTX@
+export ENABLE_EVOAB2=@ENABLE_EVOAB2@
+export ENABLE_GCONF=@ENABLE_GCONF@
+export ENABLE_GIO=@ENABLE_GIO@
+export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
+export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
+export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
+export ENABLE_GTK3=@ENABLE_GTK3@
+export ENABLE_GTK=@ENABLE_GTK@
+export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
+export ENABLE_KAB=@ENABLE_KAB@
+export ENABLE_KDE4=@ENABLE_KDE4@
+export ENABLE_KDE=@ENABLE_KDE@
+export ENABLE_LIBRSVG=@ENABLE_LIBRSVG@
+export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
+export ENABLE_LOMENUBAR=@ENABLE_LOMENUBAR@
+export ENABLE_LTO=@ENABLE_LTO@
+export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
+export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@
+export ENABLE_MYSQLC=@ENABLE_MYSQLC@
+export ENABLE_NSPLUGIN=@ENABLE_NSPLUGIN@
+export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
+export ENABLE_OPENGL=@ENABLE_OPENGL@
+export ENABLE_OXYGENOFFICE=@ENABLE_OXYGENOFFICE@
+export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
+export ENABLE_PRESENTER_SCREEN=@ENABLE_PRESENTER_SCREEN@
+export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@
+export ENABLE_RANDR=@ENABLE_RANDR@
+export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
+export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
+export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
+export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
+export ENABLE_SCRIPTING_PYTHON=@ENABLE_SCRIPTING_PYTHON@
+export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
+export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
+export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@
+export ENABLE_UGLY=@ENABLE_UGLY@
+export ENABLE_XMLSEC=@ENABLE_XMLSEC@
+export ENABLE_ZENITY=@ENABLE_ZENITY@
+export EPM=@EPM@
+export EPM_FLAGS=@EPM_FLAGS@
+export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
+@x_Cygwin@ export FIND=@WIN_FIND@
+export FLUTE_JAR=@FLUTE_JAR@
+export FONTCONFIG_CFLAGS=@FONTCONFIG_CFLAGS@
+export FONTCONFIG_LIBS=@FONTCONFIG_LIBS@
+export FRAMEWORKSHOME=@FRAMEWORKSHOME@
+export FREETYPE_CFLAGS=@FREETYPE_CFLAGS@
+export FREETYPE_LIBS=@FREETYPE_LIBS@
+export GCONF_CFLAGS=@GCONF_CFLAGS@
+export GCONF_LIBS=@GCONF_LIBS@
+export GIO_CFLAGS=@GIO_CFLAGS@
+export GIO_LIBS=@GIO_LIBS@
+export GIT_LINK_SRC=@GIT_LINK_SRC@
+export GIT_REPO_NAMES=@GIT_REPO_NAMES@
+export GMAKE_MODULE_PARALLELISM=@GMAKE_MODULE_PARALLELISM@
+export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@
+export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@
+export GNOMEVFS_LIBS=@GNOMEVFS_LIBS@
+@x_GNUCP@ export GNUCOPY=@GNUCP@
+export GNUMAKE=@GNUMAKE@
+export GNUPATCH=@GNUPATCH@
+export GNUTAR=@GNUTAR@
+export GOBJECT_CFLAGS=@GOBJECT_CFLAGS@
+export GOBJECT_LIBS=@GOBJECT_LIBS@
+export GOOGLE_DOCS_EXTENSION_PACK=@GOOGLE_DOCS_EXTENSION_PACK@
+export GPERF=@GPERF@
+export GPERF=@GPERF@
+export GRAPHITE_CFLAGS=@GRAPHITE_CFLAGS@
+export GRAPHITE_LIBS=@GRAPHITE_LIBS@
+@x_Cygwin@ export GREP=@WIN_GREP@
+export GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@
+export GSTREAMER_LIBS=@GSTREAMER_LIBS@
+export GTHREAD_CFLAGS=@GTHREAD_CFLAGS@
+export GTHREAD_LIBS=@GTHREAD_LIBS@
+export GTK3_CFLAGS=@GTK3_CFLAGS@
+export GTK3_LIBS=@GTK3_LIBS@
+export GTK_CFLAGS=@GTK_CFLAGS@
+export GTK_LIBS=@GTK_LIBS@
+export GTK_PRINT_CFLAGS=@GTK_PRINT_CFLAGS@
+export GTK_PRINT_LIBS=@GTK_PRINT_LIBS@
+export GUI=@GUI@
+export GUIBASE=@GUIBASE@
+export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@
+export GUI_FOR_BUILD=@GUI_FOR_BUILD@
+export GXX_INCLUDE_PATH=@GXX_INCLUDE_PATH@
+export HAVE_CXX0X=@HAVE_CXX0X@
+export HAVE_GCC_AVX=@HAVE_GCC_AVX@
+export HAVE_GCC_NO_LONG_DOUBLE=@HAVE_GCC_NO_LONG_DOUBLE@
+export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@
+export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
+export HAVE_GETOPT=@HAVE_GETOPT@
+export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
+export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
+export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
+export HAVE_READDIR_R=@HAVE_READDIR_R@
+export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
+export HOST_PLATFORM=@host@
+export HSQLDB_JAR=@HSQLDB_JAR@
+export HUNART_EXTENSION_PACK=@HUNART_EXTENSION_PACK@
+export HUNSPELL_CFLAGS=@HUNSPELL_CFLAGS@
+export HUNSPELL_LIBS=@HUNSPELL_LIBS@
+export HYPHEN_LIB=@HYPHEN_LIB@
+export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
+export ICU_MAJOR=@ICU_MAJOR@
+export ICU_MICRO=@ICU_MICRO@
+export ICU_MINOR=@ICU_MINOR@
+export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
+export ILIB=@ILIB@
+@x_Cygwin@ export INCLUDE=
+export INPATH=@INPATH@
+export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
+export INSTALLDIR=@INSTALLDIR@
+export INSTALLDIRNAME=@INSTALLDIRNAME@
+export INTRO_BIPMAP=@INTRO_BITMAP@
+export JAVAFLAGS=@JAVAFLAGS@
+export JAVAIFLAGS=@JAVAIFLAGS@
+export JAVAINTERPRETER=@JAVAINTERPRETER@
+export JAVACISGCJ=@JAVACISGCJ@
+export JAVACISKAFFE=@JAVACISKAFFE@
+export JAVACOMPILER=@JAVACOMPILER@
+export JAVADOC=@JAVADOC@
+@x_JAVALIB@ export JAVALIB=@JAVALIB@
+export JAVA_HOME=@JAVA_HOME@
+export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
+export JAVA_TARGET_VER=@JAVA_TARGET_VER@
+export JDK=@JDK@
+@x_JDKLIB@ export JDKLIB=@JDKLIB@
+export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
+export JFREEREPORT_JAR=@JFREEREPORT_JAR@
+export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
+export KDE4_CFLAGS=@KDE4_CFLAGS@
+export KDE4_LIBS=@KDE4_LIBS@
+export KDE_CFLAGS=@KDE_CFLAGS@
+export KDE_GLIB_CFLAGS=@KDE_GLIB_CFLAGS@
+export KDE_GLIB_LIBS=@KDE_GLIB_LIBS@
+export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@
+export KDE_LIBS=@KDE_LIBS@
+export L10N_MODULE=@L10N_MODULE@
+export LFS_CFLAGS=@LFS_CFLAGS@
+export LIBBASE_JAR=@LIBBASE_JAR@
+export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@
+export LIBCMIS_LIBS=@LIBCMIS_LIBS@
+export LIBDIR=@LIBDIR@
+export LIBEXTTEXTCAT_CFLAGS=@LIBEXTTEXTCAT_CFLAGS@
+export LIBEXTTEXTCAT_LIBS=@LIBEXTTEXTCAT_LIBS@
+export LIBFONTS_JAR=@LIBFONTS_JAR@
+export LIBFORMULA_JAR=@LIBFORMULA_JAR@
+export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
+export LIBLOADER_JAR=@LIBLOADER_JAR@
+export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
+export LIBMYSQL_PATH=@LIBMYSQL_PATH@
+export LIBPNG_CFLAGS=@LIBPNG_CFLAGS@
+export LIBPNG_LIBS=@LIBPNG_LIBS@
+export LIBREPOSITORY_JAR=@LIBREPOSITORY_JAR@
+export LIBSERIALIZER_JAR=@LIBSERIALIZER_JAR@
+export LIBXML_CFLAGS=@LIBXML_CFLAGS@
+export LIBXML_JAR=@LIBXML_JAR@
+export LIBXML_LIBS=@LIBXML_LIBS@
+export LIBXSLT_CFLAGS=@LIBXSLT_CFLAGS@
+export LIBXSLT_LIBS=@LIBXSLT_LIBS@
+export LINK_X64_BINARY=@LINK_X64_BINARY@
+export LO_PATH=@LO_PATH@
+@x_Cygwin@ export LS=@WIN_LS@
+export LUCENE_ANALYZERS_JAR=@LUCENE_ANALYZERS_JAR@
+export LUCENE_CORE_JAR=@LUCENE_CORE_JAR@
+export MANDIR=@MANDIR@
+export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
+export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD=@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@
+export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
+export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
+export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@
+export MDDS_CPPFLAGS=@MDDS_CPPFLAGS@
+export MERGELIBS=@MERGELIBS@
+export MFC_INCLUDE=@MFC_INCLUDE@
+export MFC_LIB=@MFC_LIB@
+export MINGWCXX=@MINGWCXX@
+export MINGWSTRIP=@MINGWSTRIP@
+export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
+export MINGW_EXTERNAL_DLLS=@MINGW_EXTERNAL_DLLS@
+export MINGW_GCCDLL=@MINGW_GCCDLL@
+export MINGW_GXXDLL=@MINGW_GXXDLL@
+export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@
+export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@
+export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@
+export MKDEPENDSOLVER=TRUE
+export ML_EXE=@ML_EXE@
+export MOC4=@MOC4@
+export MOC=@MOC@
+export MOZILLABUILD=@MOZILLABUILD@
+export MOZILLA_HEADERS_CFLAGS=@MOZILLA_HEADERS_CFLAGS@
+export MOZILLA_VERSION=@MOZILLA_VERSION@
+export MOZ_FLAVOUR=@MOZ_FLAVOUR@
+export MOZ_INC=@MOZ_INC@
+export MOZ_LDAP_CFLAGS=@MOZ_LDAP_CFLAGS@
+export MOZ_LIB=@MOZ_LIB@
+export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
+export MYSQL_DEFINES=@MYSQL_DEFINES@
+export MYSQL_INC=@MYSQL_INC@
+export MYSQL_LIB=@MYSQL_LIB@
+export MYTHES_CFLAGS=@MYTHES_CFLAGS@
+export MYTHES_LIBS=@MYTHES_LIBS@
+export NEON_CFLAGS=@NEON_CFLAGS@
+export NEON_LIBS=@NEON_LIBS@
+export NEON_VERSION=@NEON_VERSION@
+export NM=@NM@
+export nodep=@nodep@
+export NSS_CFLAGS=@NSS_CFLAGS@
+export NSS_LIBS=@NSS_LIBS@
+export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
+export OBJDUMP=@OBJDUMP@
+export OOOBLOGGER_EXTENSION_PACK=@OOOBLOGGER_EXTENSION_PACK@
+export OOODMAKEMODE=YES
+export OOOP_FONTS_PACK=@OOOP_FONTS_PACK@
+export OOOP_GALLERY_PACK=@OOOP_GALLERY_PACK@
+export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@
+export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
+export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
+export OOO_SHELL=@BASH@
+export OOO_VENDOR=@OOO_VENDOR@
+export OPENSSL_CFLAGS=@OPENSSL_CFLAGS@
+export OPENSSL_LIBS=@OPENSSL_LIBS@
+export OS=@OS@
+export OSVERSION=@OSVERSION@
+export OS_FOR_BUILD=@OS_FOR_BUILD@
+export OUTDIR=@OUTDIR@
+export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@
+export OUTPATH=@OUTPATH@
+export OUTPATH_FOR_BUILD=@OUTPATH_FOR_BUILD@
+export OXYGENOFFICE_PACK=@OXYGENOFFICE_PACK@
+export PATH=@LO_PATH@
+export PATH_SEPERATOR=@P_SEP@
+export PERL=@PERL@
+export PKGFORMAT=@PKGFORMAT@
+export PKGMK=@PKGMK@
+export PKG_CONFIG=@PKG_CONFIG@
+export POPPLER_CFLAGS=@POPPLER_CFLAGS@
+export POPPLER_LIBS=@POPPLER_LIBS@
+export POSTGRESQL_INC=@POSTGRESQL_INC@
+export POSTGRESQL_LIB=@POSTGRESQL_LIB@
+export PREBUILD_MOZAB=@PREBUILD_MOZAB@
+export PREFIXDIR=@PREFIXDIR@
+export PRODUCT=@PRODUCT@
+export PRODUCTNAME=@PRODUCTNAME@
+export PRODUCTVERSION=@PRODUCTVERSION@
+export PROGRESSBARCOLOR=@PROGRESSBARCOLOR@
+export PROGRESSFRAMECOLOR=@PROGRESSFRAMECOLOR@
+export PROGRESSPOSITION=@PROGRESSPOSITION@
+export PROGRESSSIZE=@PROGRESSSIZE@
+export PROEXT=@PROEXT@
+export PSPRINT=TRUE
+export PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
+export PTHREAD_LIBS=@PTHREAD_LIBS@
+export PYTHON=@PYTHON@
+export PYTHON_CFLAGS=@PYTHON_CFLAGS@
+export PYTHON_LIBS=@PYTHON_LIBS@
+export RANLIB=@RANLIB@
+export REDLAND_CFLAGS=@REDLAND_CFLAGS@
+export REDLAND_LIBS=@REDLAND_LIBS@
+export RPM=@RPM@
+export SAC_JAR=@SAC_JAR@
+export SAL_ENABLE_FILE_LOCKING=1
+export SAMPLEICC_CFLAGS=@SAMPLEICC_CFLAGS@
+export SAMPLEICC_LIBS=@SAMPLEICC_LIBS@
+export SAXON_JAR=@SAXON_JAR@
+export SCPDEFS=@SCPDEFS@
+export SERVLETAPI_JAR=@SERVLETAPI_JAR@
+export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
+export SIZEOF_DOUBLE=@SIZEOF_DOUBLE@
+export SIZEOF_INT=@SIZEOF_INT@
+export SIZEOF_LONG=@SIZEOF_LONG@
+export SIZEOF_LONGLONG=@SIZEOF_LONGLONG@
+export SIZEOF_POINTER=@SIZEOF_POINTER@
+export SIZEOF_SHORT=@SIZEOF_SHORT@
+export SOLARENV=@SRC_ROOT@/solenv
+export SOLAREXTRALIB=@SOLAREXTRALIB@
+export SOLARINC=@SOLARINC@
+export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
+export SOLARLIB=@SOLARLIB@
+export SOLARLIB_FOR_BUILD=@SOLARLIB_FOR_BUILD@
+export SOLARVER=@SRC_ROOT@/solver
+export SOLARVERSION=@SRC_ROOT@/solver
+export SOLAR_JAVA=@SOLAR_JAVA@
+export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
+export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
+export SRCDIR=@SRC_ROOT@
+export STARTCENTER_LEFT_BITMAP=@STARTCENTER_LEFT_BITMAP@
+export STARTCENTER_RIGHT_BITMAP=@STARTCENTER_RIGHT_BITMAP@
+export STARTCENTER_RTL_LEFT_BITMAP=@STARTCENTER_RTL_LEFT_BITMAP@
+export STARTCENTER_RTL_RIGHT_BITMAP=@STARTCENTER_RTL_RIGHT_BITMAP@
+export STARTCENTER_SPACE_BITMAP=@STARTCENTER_SPACE_BITMAP@
+export STRIP=@STRIP@
+export SUNTEMPLATES_DE_PACK=@SUNTEMPLATES_DE_PACK@
+export SUNTEMPLATES_EN_US_PACK=@SUNTEMPLATES_EN_US_PACK@
+export SUNTEMPLATES_ES_PACK=@SUNTEMPLATES_ES_PACK@
+export SUNTEMPLATES_FR_PACK=@SUNTEMPLATES_FR_PACK@
+export SUNTEMPLATES_HU_PACK=@SUNTEMPLATES_HU_PACK@
+export SUNTEMPLATES_IT_PACK=@SUNTEMPLATES_IT_PACK@
+export SYSBASE=@SYSBASE@
+export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@
+export SYSTEM_BOOST=@SYSTEM_BOOST@
+export SYSTEM_BSH=@SYSTEM_BSH@
+export SYSTEM_CAIRO=@SYSTEM_CAIRO@
+export SYSTEM_CPPUNIT=@SYSTEM_CPPUNIT@
+export SYSTEM_CURL=@SYSTEM_CURL@
+export SYSTEM_DB=@SYSTEM_DB@
+export SYSTEM_DB_CFLAGS=@SYSTEM_DB_CFLAGS@
+export SYSTEM_DICTS=@SYSTEM_DICTS@
+export SYSTEM_EXPAT=@SYSTEM_EXPAT@
+export SYSTEM_GDKPIXBUF=@SYSTEM_GDKPIXBUF@
+export SYSTEM_GENBRK=@SYSTEM_GENBRK@
+export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
+export SYSTEM_GENCMN=@SYSTEM_GENCMN@
+export SYSTEM_GETTEXT=@SYSTEM_GETTEXT@
+export SYSTEM_GLIB=@SYSTEM_GLIB@
+export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@
+export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@
+export SYSTEM_HUNSPELL=@SYSTEM_HUNSPELL@
+export SYSTEM_HYPH=@SYSTEM_HYPH@
+export SYSTEM_ICU=@SYSTEM_ICU@
+export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@
+export SYSTEM_JPEG=@SYSTEM_JPEG@
+export SYSTEM_LIBC=@SYSTEM_LIBC@
+export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@
+export SYSTEM_LIBCMIS=@SYSTEM_LIBCMIS@
+export SYSTEM_LIBCROCO=@SYSTEM_LIBCROCO@
+export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
+export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
+export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@
+export SYSTEM_LIBJPEG=@SYSTEM_LIBJPEG@
+export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
+export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@
+export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@
+export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@
+export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
+export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@
+export SYSTEM_LIBXML=@SYSTEM_LIBXML@
+export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@
+export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
+export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@
+export SYSTEM_LUCENE=@SYSTEM_LUCENE@
+export SYSTEM_MDDS=@SYSTEM_MDDS@
+export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@
+export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@
+export SYSTEM_MOZILLA_HEADERS=@SYSTEM_MOZILLA_HEADERS@
+export SYSTEM_MYSQL=@SYSTEM_MYSQL@
+export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@
+export SYSTEM_MYTHES=@SYSTEM_MYTHES@
+export SYSTEM_NEON=@SYSTEM_NEON@
+export SYSTEM_NSS=@SYSTEM_NSS@
+export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
+export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
+export SYSTEM_PANGO=@SYSTEM_PANGO@
+export SYSTEM_POPPLER=@SYSTEM_POPPLER@
+export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
+export SYSTEM_PYTHON=@SYSTEM_PYTHON@
+export SYSTEM_REDLAND=@SYSTEM_REDLAND@
+export SYSTEM_SAMPLEICC=@SYSTEM_SAMPLEICC@
+export SYSTEM_SANE_HEADER=@SYSTEM_SANE_HEADER@
+export SYSTEM_SAXON=@SYSTEM_SAXON@
+export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@
+export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@
+export SYSTEM_VIGRA=@SYSTEM_VIGRA@
+export SYSTEM_ZLIB=@SYSTEM_ZLIB@
+export TARFILE_LOCATION=@TARFILE_LOCATION@
+export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
+@x_Cygwin@ export TMP=@TMP_DIRECTORY@
+export TMPDIR=@TEMP_DIRECTORY@
+export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
+export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
+export UPD=@UPD@
+export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
+export use_shl_version=@use_shl_version@
+export USE_XINERAMA=@USE_XINERAMA@
+export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@
+export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
+export VERBOSE=@VERBOSE@
+export VISIO_CFLAGS=@VISIO_CFLAGS@
+export VISIO_LIBS=@VISIO_LIBS@
+export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
+export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
+export WINDRES=@WINDRES@
+export WITHOUT_AFMS=@WITHOUT_AFMS@
+export WITHOUT_PPDS=@WITHOUT_PPDS@
+export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@
+export WITH_BINFILTER=@WITH_BINFILTER@
+export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@
+export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@
+export WITH_EXTRA_FONT=@WITH_EXTRA_FONT@
+export WITH_EXTRA_GALLERY=@WITH_EXTRA_GALLERY@
+export WITH_EXTRA_SAMPLE=@WITH_EXTRA_SAMPLE@
+export WITH_EXTRA_TEMPLATE=@WITH_EXTRA_TEMPLATE@
+export WITH_FONTS=@WITH_FONTS@
+export WITH_GSSAPI=@WITH_GSSAPI@
+export WITH_HELPPACK_INTEGRATION=@WITH_HELPPACK_INTEGRATION@
+export WITH_KRB5=@WITH_KRB5@
+export WITH_LANG=@WITH_LANG@
+export WITH_LANG_LIST=@WITH_LANG_LIST@
+export WITH_LDAP=@WITH_LDAP@
+export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
+export WITH_MOZILLA=@WITH_MOZILLA@
+export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
+export WITH_OPENLDAP=@WITH_OPENLDAP@
+export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
+export WITH_STLPORT=@WITH_STLPORT@
+export WITH_THEMES=@WITH_THEMES@
+export WORDS_BIGENDIAN=@WORDS_BIGENDIAN@
+export WORKDIR=@WORKDIR@
+export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@
+export WORK_STAMP=@SOURCEVERSION@
+export WPD_CFLAGS=@WPD_CFLAGS@
+export WPD_LIBS=@WPD_LIBS@
+export WPG_CFLAGS=@WPG_CFLAGS@
+export WPG_LIBS=@WPG_LIBS@
+export WPS_CFLAGS=@WPS_CFLAGS@
+export WPS_LIBS=@WPS_LIBS@
+export XCLASSPATH=@XCLASSPATH@
+export XINERAMA_LINK=@XINERAMA_LINK@
+export XRANDR_CFLAGS=@XRANDR_CFLAGS@
+export XRANDR_DLOPEN=@XRANDR_DLOPEN@
+export XRANDR_LIBS=@XRANDR_LIBS@
+export XSLTPROC=@XSLTPROC@
diff --git a/configmgr/Makefile b/configmgr/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/configmgr/Makefile
+++ b/configmgr/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/configure.in b/configure.in
index acade6de478b..5c857fc5ad12 100644
--- a/configure.in
+++ b/configure.in
@@ -3127,7 +3127,8 @@ if test "$cross_compiling" = "yes"; then
     test -f ./config_host.mk 2>/dev/null || exit
     cp config_host.mk ../config_build.mk
     cp config.log ../config.Build.log
-    . ./config_host.mk
+    sed -e 's,=\(.*\),="\1",' < config_host.mk > config_host.sh
+    . ./config_host.sh
     for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
              SYSTEM_LIBXSLT; do
         VV='$'$V
@@ -3184,7 +3185,6 @@ AC_SUBST(OUTPATH_FOR_BUILD)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
 
 AC_SUBST(OUTDIR_FOR_BUILD)
-AC_SUBST(PATH_FOR_BUILD)
 AC_SUBST(WORKDIR_FOR_BUILD)
 
 UPD="`echo AC_PACKAGE_VERSION | sed "s/\.//"`0"
@@ -10803,57 +10803,56 @@ AC_SUBST(TEMP_DIRECTORY)
 AC_SUBST(TMP_DIRECTORY)
 
 # setup the PATH for the environment
-LO_PATH="$PATH"
-
-case "$host_os" in
+if test -n "$LO_PATH_FOR_BUILD" ; then
+    LO_PATH="$LO_PATH_FOR_BUILD"
+else
+    LO_PATH="$PATH"
 
-aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
-    if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
-        pathmunge "$JAVA_HOME/bin" "after"
-    fi
-    ;;
+    case "$host_os" in
 
-cygwin*)
-    if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
-        pathmunge "$DOTNET_FRAMEWORK_HOME" "before"
-        pathmunge "$ASM_HOME" "before"
-        pathmunge "$WINDOWS_SDK_HOME" "before"
-        pathmunge "$CSC_PATH" "before"
-        pathmunge "$MIDL_PATH" "before"
-        pathmunge "$MSPDB_PATH" "before"
-        if test "$CL_X64"="TRUE" ; then
-            pathmunge "$COMPATH/bin/amd64" "before"
-        else
-            pathmunge "$COMPATH/bin" "before"
+    aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
+        if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
+            pathmunge "$JAVA_HOME/bin" "after"
         fi
-        if test -d "$JAVA_HOME/jre/bin/client" ; then
-            pathmunge "$JAVA_HOME/jre/bin/client" "before"
-        fi
-        if test -d "$JAVA_HOME/jre/bin/hotspot" ; then
-            pathmunge "$JAVA_HOME/jre/bin/hotspot" "before"
-        fi
-        pathmunge "$JAVA_HOME/bin" "before"
+        ;;
 
-    fi
-    ;;
+    cygwin*)
+        if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
+            pathmunge "$DOTNET_FRAMEWORK_HOME" "before"
+            pathmunge "$ASM_HOME" "before"
+            pathmunge "$WINDOWS_SDK_HOME" "before"
+            pathmunge "$CSC_PATH" "before"
+            pathmunge "$MIDL_PATH" "before"
+            pathmunge "$MSPDB_PATH" "before"
+            if test "$CL_X64"="TRUE" ; then
+                pathmunge "$COMPATH/bin/amd64" "before"
+            else
+                pathmunge "$COMPATH/bin" "before"
+            fi
+            if test -d "$JAVA_HOME/jre/bin/client" ; then
+                pathmunge "$JAVA_HOME/jre/bin/client" "before"
+            fi
+            if test -d "$JAVA_HOME/jre/bin/hotspot" ; then
+                pathmunge "$JAVA_HOME/jre/bin/hotspot" "before"
+            fi
+            pathmunge "$JAVA_HOME/bin" "before"
+        fi
+        ;;
 
-solaris*)
-    pathmunge "/usr/css/bin" "before"
-    if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
-        pathmunge "$JAVA_HOME/bin" "after"
-    fi
-    ;;
-esac
+    solaris*)
+        pathmunge "/usr/css/bin" "before"
+        if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
+            pathmunge "$JAVA_HOME/bin" "after"
+        fi
+        ;;
+    esac
 
-pathmunge "$SRC_ROOT/solenv/$OUTPATH/bin" "before"
-pathmunge "$SRC_ROOT/solenv/bin" "before"
-pathmunge "." "before"
+    pathmunge "$SRC_ROOT/solenv/$OUTPATH/bin" "before"
+    pathmunge "$SRC_ROOT/solenv/bin" "before"
+    pathmunge "." "before"
+fi
 
 AC_SUBST(LO_PATH)
-if test -z "$LO_PATH_FOR_BUILD" ; then
-    LO_PATH_FOR_BUILD="$SOLARLIB"
-fi
-AC_SUBST(LO_PATH_FOR_BUILD)
 
 # make sure config.guess is +x; we execute config.guess, so it has to be so;
 chmod +x ./config.guess
@@ -10886,7 +10885,7 @@ else
 fi
 
 
-if test "STALE_MAKE"="TRUE" -a "$build_os"="cygwin" ; then
+if test "$STALE_MAKE" = "TRUE" -a "$build_os" = "cygwin" ; then
 cat << _EOS
 ****************************************************************************
 WARNING:
diff --git a/cppcanvas/Makefile b/cppcanvas/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/cppcanvas/Makefile
+++ b/cppcanvas/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/cppu/Makefile b/cppu/Makefile
index 2289c8303bf8..ccb1c85a04da 100644
--- a/cppu/Makefile
+++ b/cppu/Makefile
@@ -1,41 +1,7 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
-
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Makefile b/cppuhelper/Makefile
index 2289c8303bf8..ccb1c85a04da 100644
--- a/cppuhelper/Makefile
+++ b/cppuhelper/Makefile
@@ -1,41 +1,7 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
-
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/cross_toolset/Makefile b/cross_toolset/Makefile
new file mode 100644
index 000000000000..271c83a316a0
--- /dev/null
+++ b/cross_toolset/Makefile
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This build the modules needed on the build side for a cross-compilation
+#
+
+SHELL=/usr/bin/env bash
+include ../config_build.mk
+
+
+.PHONY : build
+
+build:
+	$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+
diff --git a/cui/Makefile b/cui/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/cui/Makefile
+++ b/cui/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Makefile b/dbaccess/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/dbaccess/Makefile
+++ b/dbaccess/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/desktop/Makefile b/desktop/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/drawinglayer/Makefile b/drawinglayer/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/drawinglayer/Makefile
+++ b/drawinglayer/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/dtrans/Makefile b/dtrans/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/dtrans/Makefile
+++ b/dtrans/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/editeng/Makefile b/editeng/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/editeng/Makefile
+++ b/editeng/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/eventattacher/Makefile b/eventattacher/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/eventattacher/Makefile
+++ b/eventattacher/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/extensions/Makefile b/extensions/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/fileaccess/Makefile b/fileaccess/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/fileaccess/Makefile
+++ b/fileaccess/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/filter/Makefile b/filter/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/forms/Makefile b/forms/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/forms/Makefile
+++ b/forms/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/formula/Makefile b/formula/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/formula/Makefile
+++ b/formula/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/Makefile b/fpicker/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/fpicker/Makefile
+++ b/fpicker/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Makefile b/framework/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/framework/Makefile
+++ b/framework/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/hwpfilter/Makefile b/hwpfilter/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/hwpfilter/Makefile
+++ b/hwpfilter/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Makefile b/i18npool/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/i18npool/Makefile
+++ b/i18npool/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/i18nutil/Makefile b/i18nutil/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/i18nutil/Makefile
+++ b/i18nutil/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/idl/Makefile b/idl/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/idl/Makefile
+++ b/idl/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/libcmis/Makefile b/libcmis/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/libcmis/Makefile
+++ b/libcmis/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/lingucomponent/Makefile b/lingucomponent/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/lingucomponent/Makefile
+++ b/lingucomponent/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/linguistic/Makefile b/linguistic/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/linguistic/Makefile
+++ b/linguistic/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/lotuswordpro/Makefile b/lotuswordpro/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/lotuswordpro/Makefile
+++ b/lotuswordpro/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/nlpsolver/Makefile b/nlpsolver/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/nlpsolver/Makefile
+++ b/nlpsolver/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/np_sdk/Makefile b/np_sdk/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/np_sdk/Makefile
+++ b/np_sdk/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/o3tl/Makefile b/o3tl/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/o3tl/Makefile
+++ b/o3tl/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/offapi/Makefile b/offapi/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/offapi/Makefile
+++ b/offapi/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/officecfg/Makefile b/officecfg/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/officecfg/Makefile
+++ b/officecfg/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/oovbaapi/Makefile
+++ b/oovbaapi/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/oox/Makefile b/oox/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/oox/Makefile
+++ b/oox/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/package/Makefile b/package/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/padmin/Makefile b/padmin/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/padmin/Makefile
+++ b/padmin/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/psprint_config/Makefile b/psprint_config/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/psprint_config/Makefile
+++ b/psprint_config/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/qadevOOo/Makefile b/qadevOOo/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/qadevOOo/Makefile
+++ b/qadevOOo/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/regexp/Makefile b/regexp/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/regexp/Makefile
+++ b/regexp/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Makefile b/reportdesign/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/reportdesign/Makefile
+++ b/reportdesign/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/rsc/Makefile b/rsc/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/rsc/Makefile
+++ b/rsc/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/sal/Makefile b/sal/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sal/Makefile
+++ b/sal/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/salhelper/Makefile b/salhelper/Makefile
index 2289c8303bf8..ccb1c85a04da 100644
--- a/salhelper/Makefile
+++ b/salhelper/Makefile
@@ -1,41 +1,7 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
-
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/sane/Makefile b/sane/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sane/Makefile
+++ b/sane/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/sax/Makefile b/sax/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sax/Makefile
+++ b/sax/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Makefile b/sc/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sc/Makefile
+++ b/sc/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/Makefile b/scaddins/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/scaddins/Makefile
+++ b/scaddins/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/sccomp/Makefile b/sccomp/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sccomp/Makefile
+++ b/sccomp/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/Makefile b/scripting/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/scripting/Makefile
+++ b/scripting/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/sd/Makefile b/sd/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sd/Makefile
+++ b/sd/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/Makefile b/sfx2/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sfx2/Makefile
+++ b/sfx2/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/slideshow/Makefile b/slideshow/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/slideshow/Makefile
+++ b/slideshow/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 240923d56624..9d280d0e6e1a 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1508,23 +1508,16 @@ sub cancel_build {
         print STDERR " it seems that the error is inside '$module', please re-run build\n";
         print STDERR " inside this module to isolate the error and/or test your fix:\n";
     }
+    print STDERR "\n";
+    print STDERR "build_error.log should contain the captured output of the failed module(s)\n";
+    print STDERR "\n";
     print STDERR "-----------------------------------------------------------------------\n";
+    print STDERR "To rebuild a specific module:\n";
     print STDERR "\n";
-    print STDERR "cd " . $ENV{'SRC_ROOT'} . "\n";
-    print STDERR "source ./build_env\n";
-    print STDERR "cd $module\n";
-    if ($source_config->is_gbuild($module) )
-    {
-        print STDERR "$ENV{GNUMAKE} clean # optional\n";
-        print STDERR "$ENV{GNUMAKE} -r\n"
-    }
-    else
-    {
-        print STDERR "rm -Rf " . $ENV{'SRC_ROOT'} . "/$module/" . $ENV{'INPATH'} . " # optional module 'clean'\n";
-        print STDERR "build\n";
-    }
+    print STDERR "make $module.clean #optional\n";
+    print STDERR "make $module\n";
     print STDERR "\n";
-    print STDERR "when the problem is isolated and fixed exit and re-run 'make' from the top-level\n";
+    print STDERR "when the problem is isolated and fixed re-run 'make'\n";
     zenity_message("LibreOffice Build Failed!");
     zenity_close();
 
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
new file mode 100644
index 000000000000..c8fe1649b8cd
--- /dev/null
+++ b/solenv/bin/callcatcher.Makefile
@@ -0,0 +1,31 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+.PHONY: all
+
+include config_host_callcatcher.mk
+
+export CC:=callcatcher $(CC)
+export CXX:=callcatcher $(CXX)
+ifeq ($(AR),)
+export AR:=callarchive ar
+else
+export AR:=callarchive $(AR)
+endif
+#old-school ones, can go post-gbuildification is complete
+export LINK:=$(CXX)
+ifeq ($(LIBMGR),)
+export LIBMGR:=callarchive ar
+else
+export LIBMGR:=callarchive $(LIBMGR)
+endif
+export dbglevel:=2
+
+
+all:
+	cd instsetoo_native && \
+	$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+	@callanalyse $(WORKDIR)/LinkTarget/*/* \
+	*/$(OUTPATH)/bin/* \
+	*/$(OUTPATH)/lib/* > unusedcode.all
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
deleted file mode 100644
index da5304999363..000000000000
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ /dev/null
@@ -1,130 +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) 2011 Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (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.
-
-.PHONY: id tags docs distro-pack-install install fetch clean-host clean-build bootstrap
-
-$(WORKDIR)/bootstrap:
-	@cd $(SRCDIR) && ./bootstrap
-	@mkdir -p $(dir $@) && touch $@
-
-bootstrap: $(WORKDIR)/bootstrap
-
-autogen.lastrun:
-
-ifneq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
-
-id:
-	@create-ids
-
-tags:
-	@create-tags
-
-docs:
-	@mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
-
-distro-pack-install: install
-	$(SRCDIR)/bin/distro-install-clean-up
-	$(SRCDIR)/bin/distro-install-desktop-integration
-	$(SRCDIR)/bin/distro-install-sdk
-	$(SRCDIR)/bin/distro-install-file-lists
-
-
-#these need to stay in the buildpl phase as buildpl depends on them
-$(SRCDIR)/src.downloaded:
-	@true
-
-fetch:
-	@true
-
-# fixme: can we prevent these exports in the first place?
-$(SRCDIR)/config_host.mk: autogen.lastrun configure.in ooo.lst.in config_host.mk.in
-	$(if $(filter reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/config.host.mk && exit 2)
-
-
-ifeq ($(strip $(gb_PARTIALBUILD)),)
-
-clean-host:
-	rm -rf $(SRCDIR)/*/$(INPATH)
-	rm -rf install
-
-clean-build:
-	if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
-	rm -f solenv/*/bin/dmake*
-	$(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD)),rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD))
-
-distclean: clean
-	if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
-	cd $(SRCDIR) && rm -rf config_host.mk config_build.mk Env.Host.sh Env.Build.sh  autogen.lastrun autom4te.cache \
-	bin/repo-list build_env config.log config.status \
-	desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
-	set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
-
-install: build
-	echo "Installing in $(INSTALLDIR)..." && \
-	ooinstall "$(INSTALLDIR)" && \
-	echo "" && \
-	echo "Installation finished, you can now execute:" && \
-	echo "$(INSTALLDIR)/program/soffice"
-
-endif
-
-else
-$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
-	$(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download ./ooo.lst && touch $@,touch $@)
-
-fetch: $(SRCDIR)/src.downloaded
-
-id:
-	@true
-
-tags:
-	@true
-
-docs:
-	@true
-
-distro-pack-install:
-	@true
-
-$(SRCDIR)/config_host.mk:
-	@true
-
-clean-host:
-	@true
-
-clean-build:
-	@true
-
-distclean:
-	@true
-
-install:
-	@true
-
-endif
-
-# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 5c6b3270dc23..6b3741b1ca67 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -113,29 +113,29 @@ dev-install: \
 			$(if $(filter check,$(MAKECMDGOALS)),build)
 	$(call gb_BuildplTarget_command,smoketestoo_native,)
 
-build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
-	$(call gb_BuildplTarget_command,instsetoo_native,--all)
+#build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
+#	$(call gb_BuildplTarget_command,instsetoo_native,--all)
 
-cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
-	source $(SRCDIR)/config_build.mk && $(call gb_BuildplTarget_command,$@,--all)
+#cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+#	source $(SRCDIR)/config_build.mk && $(call gb_BuildplTarget_command,$@,--all)
 
 # experimental callcatcher target
 # http://www.skynet.ie/~caolan/Packages/callcatcher.html
-findunusedcode:
-	@which callcatcher > /dev/null 2>&1 || \
-	    (echo "callcatcher not installed" && false)
-	@sed -e s,$(INPATH),callcatcher,g $(SRCDIR)/config_host.mk > $(SRCDIR)/config_host_callcatcher.mk
-	@mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
-	    ln -sf $(SRCDIR)/solenv/$(INPATH)/bin/dmake \
-		$(SRCDIR)/solenv/callcatcher/bin/dmake && \
-	    source $(SRCDIR)/config_host_callcatcher.mk && \
-	    source $(SRCDIR)/solenv/bin/callcatchEnv.Set.sh && \
-	    $(call gb_BuildplTarget_command,instsetoo_native,--all)
-	@source $(SRCDIR)/config_host_callcatcher.mk && \
-	    callanalyse \
-		$$WORKDIR/LinkTarget/*/* \
-		*/$$OUTPATH/bin/* \
-		*/$$OUTPATH/lib/* > unusedcode.all
+#findunusedcode:
+#	@which callcatcher > /dev/null 2>&1 || \
+#	    (echo "callcatcher not installed" && false)
+#	@sed -e s,$(INPATH),callcatcher,g $(SRCDIR)/config_host.mk > $(SRCDIR)/config_host_callcatcher.mk
+#	@mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
+#	    ln -sf $(SRCDIR)/solenv/$(INPATH)/bin/dmake \
+#		$(SRCDIR)/solenv/callcatcher/bin/dmake && \
+#	    source $(SRCDIR)/config_host_callcatcher.mk && \
+#	    source $(SRCDIR)/solenv/bin/callcatchEnv.Set.sh && \
+#	    $(call gb_BuildplTarget_command,instsetoo_native,--all)
+#	@source $(SRCDIR)/config_host_callcatcher.mk && \
+#	    callanalyse \
+#		$$WORKDIR/LinkTarget/*/* \
+#		*/$$OUTPATH/bin/* \
+#		*/$$OUTPATH/lib/* > unusedcode.all
 #because non-c++ symbols could be dlsymed lets make a list of class level
 #unused methods which don't require much effort to determine if they need
 #to be just removed, or put behind appropiate platform or debug level ifdefs
@@ -148,12 +148,12 @@ findunusedcode:
 #
 #filter out Atom*:: from libcmis, because its too painful to customize
 #it to only build the methods we directly call
-	@grep ::.*\( unusedcode.all \
-		| grep -v ^cppu:: \
-		| grep -v ^boost:: \
-		| grep -v ^CIcc \
-		| grep -v ^Atom \
-		> unusedcode.easy
+#	@grep ::.*\( unusedcode.all \
+#		| grep -v ^cppu:: \
+#		| grep -v ^boost:: \
+#		| grep -v ^CIcc \
+#		| grep -v ^Atom \
+#		> unusedcode.easy
 
 subsequentcheck: dev-install
 
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
new file mode 100644
index 000000000000..808917b937d1
--- /dev/null
+++ b/solenv/gbuild/partial_build.mk
@@ -0,0 +1,14 @@
+
+gb_PARTIALBUILD := T
+
+ifeq ($(SOLARENV),)
+ifeq ($(gb_Side),)
+gb_Side:=host
+endif
+include $(module_directory)/../config_$(gb_Side).mk
+endif
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(module_directory)/Module*.mk)))
diff --git a/solenv/gbuild/templates/Makefile b/solenv/gbuild/templates/Makefile
index f9ac01ef0747..841c9b4b7ad4 100644
--- a/solenv/gbuild/templates/Makefile
+++ b/solenv/gbuild/templates/Makefile
@@ -1,39 +1,8 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_PARTIALBUILD := T
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
+
diff --git a/sot/Makefile b/sot/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sot/Makefile
+++ b/sot/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/Makefile b/starmath/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/starmath/Makefile
+++ b/starmath/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Makefile b/svl/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Makefile b/svtools/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svx/Makefile b/svx/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/svx/Makefile
+++ b/svx/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/sw/Makefile b/sw/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/swext/Makefile b/swext/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/swext/Makefile
+++ b/swext/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/tail_build/Makefile b/tail_build/Makefile
index 98a90a1e115d..4ee91d83dfa2 100644
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@@ -28,13 +28,12 @@
 
 gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_host.mk
+endif
 
 gb_SourceEnvAndRecurse_STAGE=gbuild
 include $(SOLARENV)/gbuild/gbuild.mk
 
 $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))
 
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/test/Makefile b/test/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/toolkit/Makefile b/toolkit/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Makefile b/tools/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/twain/Makefile b/twain/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/twain/Makefile
+++ b/twain/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/ucb/Makefile b/ucb/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/ucb/Makefile
+++ b/ucb/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/ucbhelper/Makefile b/ucbhelper/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/ucbhelper/Makefile
+++ b/ucbhelper/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/udkapi/Makefile b/udkapi/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/udkapi/Makefile
+++ b/udkapi/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/unixODBC/Makefile b/unixODBC/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/unixODBC/Makefile
+++ b/unixODBC/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/unotools/Makefile b/unotools/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/unotools/Makefile
+++ b/unotools/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/unoxml/Makefile b/unoxml/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/unoxml/Makefile
+++ b/unoxml/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/ure/Makefile b/ure/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/ure/Makefile
+++ b/ure/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/uui/Makefile b/uui/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/uui/Makefile
+++ b/uui/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Makefile b/vbahelper/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/vbahelper/Makefile
+++ b/vbahelper/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Makefile b/vcl/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/vcl/Makefile
+++ b/vcl/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/wizards/Makefile b/wizards/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/wizards/Makefile
+++ b/wizards/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Makefile b/writerfilter/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/writerfilter/Makefile
+++ b/writerfilter/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/Makefile b/writerperfect/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/writerperfect/Makefile
+++ b/writerperfect/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/xmerge/Makefile b/xmerge/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/xmerge/Makefile
+++ b/xmerge/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/xml2cmp/Makefile b/xml2cmp/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/xml2cmp/Makefile
+++ b/xml2cmp/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/xmloff/Makefile b/xmloff/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/xmloff/Makefile
+++ b/xmloff/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/xmlreader/Makefile b/xmlreader/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/xmlreader/Makefile
+++ b/xmlreader/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Makefile b/xmlscript/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/xmlscript/Makefile
+++ b/xmlscript/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Makefile b/xmlsecurity/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/xmlsecurity/Makefile
+++ b/xmlsecurity/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4: