move reconfigure into gbuild

2011-11-29 17:07:57 +01:00 · 2011-11-29 17:07:57 +01:00 · d73e574d8a
commit d73e574d8a
parent 6a6152a9a3
96 changed files with 131 additions and 103 deletions
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@ -26,13 +26,23 @@
 #
 #*************************************************************************

+gb_SOURCEANDRERUN:=
+SRCDIR:=$(realpath $(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
 ifeq ($(strip $(SOLARENV)),)
+ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
+gb_SOURCEANDRERUN:=T
+gb_MINISOLARENV:=
+else
+SOLARENV:=$(SRCDIR)/solenv
+gb_MINISOLARENV:=T
+endif
+endif
+
+ifneq ($(gb_SOURCEANDRERUN),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk
 else
 include $(SOLARENV)/gbuild/gbuild.mk
 $(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
 endif

-
-
 # vim: set noet sw=4 ts=4:
--- a/MathMLDTD/Makefile
+++ b/MathMLDTD/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/Mesa/Makefile
+++ b/Mesa/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/animations/Makefile
+++ b/animations/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/automation/Makefile
+++ b/automation/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/avmedia/Makefile
+++ b/avmedia/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/basctl/Makefile
+++ b/basctl/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/basebmp/Makefile
+++ b/basebmp/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/basegfx/Makefile
+++ b/basegfx/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/basic/Makefile
+++ b/basic/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/bean/Makefile
+++ b/bean/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/binaryurp/Makefile
+++ b/binaryurp/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/canvas/Makefile
+++ b/canvas/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/chart2/Makefile
+++ b/chart2/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/comphelper/Makefile
+++ b/comphelper/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/configmgr/Makefile
+++ b/configmgr/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/cppcanvas/Makefile
+++ b/cppcanvas/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/cui/Makefile
+++ b/cui/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/dbaccess/Makefile
+++ b/dbaccess/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/desktop/Makefile
+++ b/desktop/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/drawinglayer/Makefile
+++ b/drawinglayer/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/dtrans/Makefile
+++ b/dtrans/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/editeng/Makefile
+++ b/editeng/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/eventattacher/Makefile
+++ b/eventattacher/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/extensions/Makefile
+++ b/extensions/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/fileaccess/Makefile
+++ b/fileaccess/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/filter/Makefile
+++ b/filter/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/forms/Makefile
+++ b/forms/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/formula/Makefile
+++ b/formula/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/framework/Makefile
+++ b/framework/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/hwpfilter/Makefile
+++ b/hwpfilter/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/i18npool/Makefile
+++ b/i18npool/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/i18nutil/Makefile
+++ b/i18nutil/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/idl/Makefile
+++ b/idl/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/libcmis/Makefile
+++ b/libcmis/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/linguistic/Makefile
+++ b/linguistic/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/lotuswordpro/Makefile
+++ b/lotuswordpro/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/nlpsolver/Makefile
+++ b/nlpsolver/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/o3tl/Makefile
+++ b/o3tl/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/offapi/Makefile
+++ b/offapi/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/officecfg/Makefile
+++ b/officecfg/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/oovbaapi/Makefile
+++ b/oovbaapi/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/oox/Makefile
+++ b/oox/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/package/Makefile
+++ b/package/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/padmin/Makefile
+++ b/padmin/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/psprint_config/Makefile
+++ b/psprint_config/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/qadevOOo/Makefile
+++ b/qadevOOo/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/regexp/Makefile
+++ b/regexp/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/reportdesign/Makefile
+++ b/reportdesign/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/rsc/Makefile
+++ b/rsc/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/sal/Makefile
+++ b/sal/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/sane/Makefile
+++ b/sane/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/sax/Makefile
+++ b/sax/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/sc/Makefile
+++ b/sc/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/scaddins/Makefile
+++ b/scaddins/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/sccomp/Makefile
+++ b/sccomp/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/scripting/Makefile
+++ b/scripting/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/sd/Makefile
+++ b/sd/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/set_soenv.in
+++ b/set_soenv.in
@ -2042,7 +2042,7 @@ if ($platform !~ m/cygwin/) {
   }
 }
 ToFile( "SOLARSRC",           $SOLARSRC,           "e" );
-ToFile( "gb_REPOS",           $gb_REPOS,           "e" );
+ToFile( "SRCDIR",           $SOLARSRC,           "e" );

 if ( $platform =~ m/cygwin/ )
 {
--- a/sfx2/Makefile
+++ b/sfx2/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/slideshow/Makefile
+++ b/slideshow/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@ -31,12 +31,10 @@ SOLARINC += $(JDKINCS)

 OUTDIR := $(SOLARVERSION)/$(INPATH)
 OUTDIR_FOR_BUILD := $(SOLARVERSION)/$(INPATH_FOR_BUILD)
-ifeq ($(strip $(WORKDIR)),)
-$(error WORKDIR variable is empty, no environment set, aborting)
+ifeq ($(strip $(SOLARENV)),)
+$(error SOLARENV variable is empty, no environment set, aborting)
 endif

-SRCDIR := $(SOLARSRC)
-
 # HACK
 # unixify windoze paths
 ifeq ($(OS_FOR_BUILD),WNT)
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@ -48,6 +48,10 @@ $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download

 fetch: $(SRCDIR)/src.downloaded

+# fixme: can we prevent these exports in the first place?
+$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
+	$(if $(gb_MINISOLARENV),unset GBUILDDIR gb_Helper_execute gb_XSLTPROC gb_Helper_set_ld_path gb_AWK DBGSV_ERROR_OUT && $(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
+
 $(WORKDIR)/bootstrap:
 	@cd $(SRCDIR) && ./bootstrap
 	@mkdir -p $(dir $@) && touch $@
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@ -28,7 +28,7 @@

 # speed up if no target need to parse all modules
 ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun,$(MAKECMDGOALS)),)
+ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun Env.Host.sh,$(MAKECMDGOALS)),)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@ -26,7 +26,7 @@
 #
 #*************************************************************************

-GBUILDDIR:=$(SRC_ROOT)/solenv/gbuild
+GBUILDDIR:=$(SRCDIR)/solenv/gbuild

 # vars needed from the env/calling makefile

@ -151,7 +151,9 @@ $(eval $(call gb_Helper_collect_libtargets))
 gb_Library_DLLPOSTFIX := lo

 # Include platform/cpu/compiler specific config/definitions
+ifneq ($(strip $(OS)),)
 include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
+endif

 ifeq ($(CROSS_COMPILING),YES)
 # We can safely Assume all cross-compilation is from Unix systems.
--- a/solenv/gbuild/source_and_rerun.mk
+++ b/solenv/gbuild/source_and_rerun.mk
@ -1,13 +1,28 @@

 gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))

+$(info gb_PARTIALBUILD $(gb_PARTIALBUILD))
+ifneq ($(strip $(gb_PARTIALBUILD)),)
+
+SRCDIR:=$(realpath $(gb_MAKEFILEDIR)/..)
+gb_SourceEnvAndRecurse_reconfigure=true
+
+else
+
+SRCDIR:=$(realpath $(gb_MAKEFILEDIR))
+gb_SourceEnvAndRecurse_reconfigure=$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(SRCDIR)/Env.Host.sh
+
+endif
+
 source-env-and-recurse:
-	@if test -f $(gb_MAKEFILEDIR)/config.mk; then . $(gb_MAKEFILEDIR)/config.mk; else if test -f $(gb_MAKEFILEDIR)/../config.mk ; then . $(gb_MAKEFILEDIR)/../config.mk; fi; fi && \
-	if test -f $(gb_MAKEFILEDIR)/Env.Host.sh; then . $(gb_MAKEFILEDIR)/Env.Host.sh; else if test -f $(gb_MAKEFILEDIR)/../Env.Host.sh; then . $(gb_MAKEFILEDIR)/../Env.Host.sh; fi ; fi && \
-	if test -z "$${SOLARENV}"; then echo "No environment set!" 2>&1; exit 1; fi && \
+	$(gb_SourceEnvAndRecurse_reconfigure) && \
+	if test -f $(SRCDIR)/config.mk ; then . $(SRCDIR)/config.mk; fi && \
+	if test -f $(SRCDIR)/Env.Host.sh; then . $(SRCDIR)/Env.Host.sh; fi && \
+	if test -z "$${SOLARENV}"; then echo "no configuration found and could not create one" && exit 1; fi && \
 	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(MAKECMDGOALS)

 ifneq ($(strip $(MAKECMDGOALS)),)
+ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
 $(eval $(MAKECMDGOALS) : source-env-and-recurse)
 endif
-
+endif
--- a/sot/Makefile
+++ b/sot/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/starmath/Makefile
+++ b/starmath/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/svl/Makefile
+++ b/svl/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/svtools/Makefile
+++ b/svtools/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/svx/Makefile
+++ b/svx/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/sw/Makefile
+++ b/sw/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/swext/Makefile
+++ b/swext/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@ -26,12 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD=T
-
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))
--- a/testautomation/Makefile
+++ b/testautomation/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/tools/Makefile
+++ b/tools/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/twain/Makefile
+++ b/twain/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/ucb/Makefile
+++ b/ucb/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/ucbhelper/Makefile
+++ b/ucbhelper/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/udkapi/Makefile
+++ b/udkapi/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/unixODBC/Makefile
+++ b/unixODBC/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/unotools/Makefile
+++ b/unotools/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/unoxml/Makefile
+++ b/unoxml/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/uui/Makefile
+++ b/uui/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/vbahelper/Makefile
+++ b/vbahelper/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/vcl/Makefile
+++ b/vcl/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/wizards/Makefile
+++ b/wizards/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/writerfilter/Makefile
+++ b/writerfilter/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/writerperfect/Makefile
+++ b/writerperfect/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/xmerge/Makefile
+++ b/xmerge/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/xml2cmp/Makefile
+++ b/xml2cmp/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/xmloff/Makefile
+++ b/xmloff/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/xmlreader/Makefile
+++ b/xmlreader/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/xmlscript/Makefile
+++ b/xmlscript/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
--- a/xmlsecurity/Makefile
+++ b/xmlsecurity/Makefile
@ -26,11 +26,11 @@
 #
 #*************************************************************************

+gb_PARTIALBUILD := T
 ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else

-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk

 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))