diff options
93 files changed, 368 insertions, 367 deletions
diff --git a/GNUmakefile.mk b/GNUmakefile.mk index 1810a2ec8b66..e190825b05ae 100644 --- a/GNUmakefile.mk +++ b/GNUmakefile.mk @@ -27,11 +27,10 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) +include ./solenv/gbuild/source_and_rerun.mk endif -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) diff --git a/MathMLDTD/Makefile b/MathMLDTD/Makefile index 90947b2e5f48..78def2598caa 100644 --- a/MathMLDTD/Makefile +++ b/MathMLDTD/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/Mesa/Makefile b/Mesa/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/Mesa/Makefile +++ b/Mesa/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/animations/Makefile b/animations/Makefile index 6c4d53b5f316..5742d9f11d07 100644 --- a/animations/Makefile +++ b/animations/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/automation/Makefile b/automation/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/automation/Makefile +++ b/automation/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Makefile b/avmedia/Makefile index a1b344d72564..1d161b5f7d89 100644 --- a/avmedia/Makefile +++ b/avmedia/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/basctl/Makefile b/basctl/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/basctl/Makefile +++ b/basctl/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/basebmp/Makefile b/basebmp/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/basebmp/Makefile +++ b/basebmp/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/basegfx/Makefile b/basegfx/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/basegfx/Makefile +++ b/basegfx/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/basic/Makefile b/basic/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/basic/Makefile +++ b/basic/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/bean/Makefile b/bean/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/bean/Makefile +++ b/bean/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/binaryurp/Makefile b/binaryurp/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/binaryurp/Makefile +++ b/binaryurp/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/canvas/Makefile b/canvas/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/canvas/Makefile +++ b/canvas/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/chart2/Makefile b/chart2/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/chart2/Makefile +++ b/chart2/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/comphelper/Makefile b/comphelper/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/comphelper/Makefile +++ b/comphelper/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/configmgr/Makefile b/configmgr/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/configmgr/Makefile +++ b/configmgr/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/cppcanvas/Makefile b/cppcanvas/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/cppcanvas/Makefile +++ b/cppcanvas/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/cui/Makefile b/cui/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/cui/Makefile +++ b/cui/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/dbaccess/Makefile b/dbaccess/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/dbaccess/Makefile +++ b/dbaccess/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/desktop/Makefile b/desktop/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/drawinglayer/Makefile b/drawinglayer/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/drawinglayer/Makefile +++ b/drawinglayer/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/dtrans/Makefile b/dtrans/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/dtrans/Makefile +++ b/dtrans/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/editeng/Makefile b/editeng/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/editeng/Makefile +++ b/editeng/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/eventattacher/Makefile b/eventattacher/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/eventattacher/Makefile +++ b/eventattacher/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/extensions/Makefile b/extensions/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/fileaccess/Makefile b/fileaccess/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/fileaccess/Makefile +++ b/fileaccess/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/filter/Makefile b/filter/Makefile index 3ac357a971e4..8db1cd0dc55c 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -18,13 +18,13 @@ #*************************************************************** ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/forms/Makefile b/forms/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/forms/Makefile +++ b/forms/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/formula/Makefile b/formula/Makefile index 6c4d53b5f316..5742d9f11d07 100644 --- a/formula/Makefile +++ b/formula/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/framework/Makefile b/framework/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/framework/Makefile +++ b/framework/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/hwpfilter/Makefile b/hwpfilter/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/hwpfilter/Makefile +++ b/hwpfilter/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/i18npool/Makefile b/i18npool/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/i18npool/Makefile +++ b/i18npool/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/i18nutil/Makefile b/i18nutil/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/i18nutil/Makefile +++ b/i18nutil/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/idl/Makefile b/idl/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/idl/Makefile +++ b/idl/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/libcmis/Makefile b/libcmis/Makefile index f3cf94ea4f55..72632c764dfc 100644 --- a/libcmis/Makefile +++ b/libcmis/Makefile @@ -26,13 +26,13 @@ # instead of those above. ifeq ($(strip $(SRC_ROOT)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SRC_ROOT)/solenv/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/linguistic/Makefile b/linguistic/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/linguistic/Makefile +++ b/linguistic/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/lotuswordpro/Makefile b/lotuswordpro/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/lotuswordpro/Makefile +++ b/lotuswordpro/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/o3tl/Makefile b/o3tl/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/o3tl/Makefile +++ b/o3tl/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/offapi/Makefile b/offapi/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/offapi/Makefile +++ b/offapi/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/officecfg/Makefile b/officecfg/Makefile index 3ac357a971e4..8db1cd0dc55c 100644 --- a/officecfg/Makefile +++ b/officecfg/Makefile @@ -18,13 +18,13 @@ #*************************************************************** ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile index 6c4d53b5f316..5742d9f11d07 100644 --- a/oovbaapi/Makefile +++ b/oovbaapi/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/oox/Makefile b/oox/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/oox/Makefile +++ b/oox/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/package/Makefile b/package/Makefile index a1b344d72564..1d161b5f7d89 100644 --- a/package/Makefile +++ b/package/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/padmin/Makefile b/padmin/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/padmin/Makefile +++ b/padmin/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/psprint_config/Makefile b/psprint_config/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/psprint_config/Makefile +++ b/psprint_config/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/qadevOOo/Makefile b/qadevOOo/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/qadevOOo/Makefile +++ b/qadevOOo/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/regexp/Makefile b/regexp/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/regexp/Makefile +++ b/regexp/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/reportdesign/Makefile b/reportdesign/Makefile index 6c4d53b5f316..5742d9f11d07 100644 --- a/reportdesign/Makefile +++ b/reportdesign/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/rsc/Makefile b/rsc/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/rsc/Makefile +++ b/rsc/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sal/Makefile b/sal/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/sal/Makefile +++ b/sal/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sane/Makefile b/sane/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/sane/Makefile +++ b/sane/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sax/Makefile b/sax/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/sax/Makefile +++ b/sax/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sc/Makefile b/sc/Makefile index f2edbe47cc8d..da8cc4d64a7c 100644 --- a/sc/Makefile +++ b/sc/Makefile @@ -22,13 +22,13 @@ # instead of those above. ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/scaddins/Makefile b/scaddins/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/scaddins/Makefile +++ b/scaddins/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sccomp/Makefile b/sccomp/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/sccomp/Makefile +++ b/sccomp/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/scripting/Makefile b/scripting/Makefile index a1b344d72564..1d161b5f7d89 100644 --- a/scripting/Makefile +++ b/scripting/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sd/Makefile b/sd/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/sd/Makefile +++ b/sd/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sfx2/Makefile b/sfx2/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/sfx2/Makefile +++ b/sfx2/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/slideshow/Makefile b/slideshow/Makefile index 6c4d53b5f316..5742d9f11d07 100644 --- a/slideshow/Makefile +++ b/slideshow/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9c7d1f757820..4634333cd49f 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -26,10 +26,11 @@ # #************************************************************************* +GBUILDDIR:=$(SRC_ROOT)/solenv/gbuild + # vars needed from the env/calling makefile # DEBUG -# GBUILDDIR # INPATH # JAVA_HOME # JDKINCS diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk index 35a2197a2ba0..aeac005e4bd4 100644 --- a/solenv/gbuild/gbuild_simple.mk +++ b/solenv/gbuild/gbuild_simple.mk @@ -26,6 +26,8 @@ # #************************************************************************* +GBUILDDIR:=$(SRC_ROOT)/solenv/gbuild + # this is a subset of gbuild functionality, for use in custom makefiles COMMA :=, diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk new file mode 100644 index 000000000000..937751f1e6c5 --- /dev/null +++ b/solenv/gbuild/source_and_rerun.mk @@ -0,0 +1,6 @@ + +all: + @if test -f ./config.mk; then . ./config.mk; else if test -f ../config.mk ; then . ../config.mk; fi; fi && \ + if test -f ./Env.Host.sh; then . ./Env.Host.sh; else if test -f ../Env.Host.sh; then . ../Env.Host.sh; fi ; fi && \ + if test -z "$${SOLARENV}"; then echo "No environment set!" 2>&1; exit 1; fi && \ + $(MAKE) $(MAKECMDGOALS) diff --git a/solenv/gbuild/templates/Makefile b/solenv/gbuild/templates/Makefile index 90947b2e5f48..78def2598caa 100644 --- a/solenv/gbuild/templates/Makefile +++ b/solenv/gbuild/templates/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sot/Makefile b/sot/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/sot/Makefile +++ b/sot/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/starmath/Makefile b/starmath/Makefile index f2edbe47cc8d..da8cc4d64a7c 100644 --- a/starmath/Makefile +++ b/starmath/Makefile @@ -22,13 +22,13 @@ # instead of those above. ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/svl/Makefile b/svl/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/svl/Makefile +++ b/svl/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/svtools/Makefile b/svtools/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/svx/Makefile b/svx/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/svx/Makefile +++ b/svx/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/sw/Makefile b/sw/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/swext/Makefile b/swext/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/swext/Makefile +++ b/swext/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/tail_build/Makefile b/tail_build/Makefile index ffea455a06c1..92241b5c70f4 100644 --- a/tail_build/Makefile +++ b/tail_build/Makefile @@ -27,19 +27,12 @@ # if no environment is set, try to find one, source it and re-exec ifeq ($(strip $(SOLARENV)),) +include ./solenv/gbuild/source_and_rerun.mk +else -all: - if test -f ./Env.Host.sh; then . ./Env.Host.sh; fi && \ - if test -z "$${SOLARENV}"; then echo "No environment set!"; exit 1; fi && \ - $(MAKE) - -else # SOLARENV - -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(SRC_ROOT)/Module_tail_build.mk)) -endif # SOLARENV - +endif # vim: set noet sw=4 ts=4: diff --git a/testautomation/Makefile b/testautomation/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/testautomation/Makefile +++ b/testautomation/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/toolkit/Makefile b/toolkit/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/tools/Makefile b/tools/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/twain/Makefile b/twain/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/twain/Makefile +++ b/twain/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/ucb/Makefile b/ucb/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/ucb/Makefile +++ b/ucb/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/ucbhelper/Makefile b/ucbhelper/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/ucbhelper/Makefile +++ b/ucbhelper/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/udkapi/Makefile b/udkapi/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/udkapi/Makefile +++ b/udkapi/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/unixODBC/Makefile b/unixODBC/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/unixODBC/Makefile +++ b/unixODBC/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/unotools/Makefile b/unotools/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/unotools/Makefile +++ b/unotools/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/unoxml/Makefile b/unoxml/Makefile index 6c4d53b5f316..5742d9f11d07 100644 --- a/unoxml/Makefile +++ b/unoxml/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/uui/Makefile b/uui/Makefile index 6c4d53b5f316..5742d9f11d07 100644 --- a/uui/Makefile +++ b/uui/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/vbahelper/Makefile b/vbahelper/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/vbahelper/Makefile +++ b/vbahelper/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/vcl/Makefile b/vcl/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/vcl/Makefile +++ b/vcl/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/wizards/Makefile b/wizards/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/wizards/Makefile +++ b/wizards/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/writerfilter/Makefile b/writerfilter/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/writerfilter/Makefile +++ b/writerfilter/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/writerperfect/Makefile b/writerperfect/Makefile index 3abf1ae8b6bb..798b507deb12 100644 --- a/writerperfect/Makefile +++ b/writerperfect/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/xmerge/Makefile b/xmerge/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/xmerge/Makefile +++ b/xmerge/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/xml2cmp/Makefile b/xml2cmp/Makefile index 90947b2e5f48..78def2598caa 100644 --- a/xml2cmp/Makefile +++ b/xml2cmp/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/xmloff/Makefile b/xmloff/Makefile index 8d71119918b6..d3daec86907e 100644 --- a/xmloff/Makefile +++ b/xmloff/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/xmlreader/Makefile b/xmlreader/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/xmlreader/Makefile +++ b/xmlreader/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/xmlscript/Makefile b/xmlscript/Makefile index b912f2f0532b..778d12f600b7 100644 --- a/xmlscript/Makefile +++ b/xmlscript/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: diff --git a/xmlsecurity/Makefile b/xmlsecurity/Makefile index a1b344d72564..1d161b5f7d89 100644 --- a/xmlsecurity/Makefile +++ b/xmlsecurity/Makefile @@ -27,13 +27,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: |