diff options
96 files changed, 131 insertions, 103 deletions
diff --git a/GNUmakefile.mk b/GNUmakefile.mk index 6d613a6b4971..d40695c441a5 100644 --- 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: diff --git a/MathMLDTD/Makefile b/MathMLDTD/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/Mesa/Makefile b/Mesa/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/animations/Makefile b/animations/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/automation/Makefile b/automation/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/avmedia/Makefile b/avmedia/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/basctl/Makefile b/basctl/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/basebmp/Makefile b/basebmp/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/basegfx/Makefile b/basegfx/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/basic/Makefile b/basic/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/bean/Makefile b/bean/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/binaryurp/Makefile b/binaryurp/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/canvas/Makefile b/canvas/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/chart2/Makefile b/chart2/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/comphelper/Makefile b/comphelper/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/configmgr/Makefile b/configmgr/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/cppcanvas/Makefile b/cppcanvas/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/cui/Makefile b/cui/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/dbaccess/Makefile b/dbaccess/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/desktop/Makefile b/desktop/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/drawinglayer/Makefile b/drawinglayer/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/dtrans/Makefile b/dtrans/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/editeng/Makefile b/editeng/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/eventattacher/Makefile b/eventattacher/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/extensions/Makefile b/extensions/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/fileaccess/Makefile b/fileaccess/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/filter/Makefile b/filter/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/forms/Makefile b/forms/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/formula/Makefile b/formula/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/framework/Makefile b/framework/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/hwpfilter/Makefile b/hwpfilter/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/i18npool/Makefile b/i18npool/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/i18nutil/Makefile b/i18nutil/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/idl/Makefile b/idl/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/libcmis/Makefile b/libcmis/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/linguistic/Makefile b/linguistic/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/lotuswordpro/Makefile b/lotuswordpro/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/nlpsolver/Makefile b/nlpsolver/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/o3tl/Makefile b/o3tl/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/offapi/Makefile b/offapi/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/officecfg/Makefile b/officecfg/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/oox/Makefile b/oox/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/package/Makefile b/package/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/padmin/Makefile b/padmin/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/psprint_config/Makefile b/psprint_config/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/qadevOOo/Makefile b/qadevOOo/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/regexp/Makefile b/regexp/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/reportdesign/Makefile b/reportdesign/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/rsc/Makefile b/rsc/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/sal/Makefile b/sal/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/sane/Makefile b/sane/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/sax/Makefile b/sax/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/sc/Makefile b/sc/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/scaddins/Makefile b/scaddins/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/sccomp/Makefile b/sccomp/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/scripting/Makefile b/scripting/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/sd/Makefile b/sd/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/set_soenv.in b/set_soenv.in index b39953101ef9..40706845f152 100755 --- 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/ ) { diff --git a/sfx2/Makefile b/sfx2/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/slideshow/Makefile b/slideshow/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk index 9802a6130849..6a0933b33c2e 100644 --- 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) diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index c137fb013684..22aa4ed00c0c 100644 --- 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 $@ diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk index 7e1a640a7c76..842f05e61004 100644 --- 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= diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index c3d1308f439d..57387f1777ca 100644 --- 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. diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk index 418acc593c17..1fe62c89eaa2 100644 --- 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 diff --git a/sot/Makefile b/sot/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/starmath/Makefile b/starmath/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/svl/Makefile b/svl/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/svtools/Makefile b/svtools/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/svx/Makefile b/svx/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/sw/Makefile b/sw/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/swext/Makefile b/swext/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/tail_build/Makefile b/tail_build/Makefile index 59fd1c760383..e13530e0247f 100644 --- 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)) diff --git a/testautomation/Makefile b/testautomation/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/toolkit/Makefile b/toolkit/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/tools/Makefile b/tools/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/twain/Makefile b/twain/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/ucb/Makefile b/ucb/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/ucbhelper/Makefile b/ucbhelper/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/udkapi/Makefile b/udkapi/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/unixODBC/Makefile b/unixODBC/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/unotools/Makefile b/unotools/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/unoxml/Makefile b/unoxml/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/uui/Makefile b/uui/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/vbahelper/Makefile b/vbahelper/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/vcl/Makefile b/vcl/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/wizards/Makefile b/wizards/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/writerfilter/Makefile b/writerfilter/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/writerperfect/Makefile b/writerperfect/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/xmerge/Makefile b/xmerge/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/xml2cmp/Makefile b/xml2cmp/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/xmloff/Makefile b/xmloff/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/xmlreader/Makefile b/xmlreader/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/xmlscript/Makefile b/xmlscript/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) diff --git a/xmlsecurity/Makefile b/xmlsecurity/Makefile index f9ac01ef0747..7b3dec8b4c28 100644 --- 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))) |