tweak gbuild standart Makefile to allow partial build in unsourced env

This allow to run make in a module wihtout the need to source
Env.Host.sh.

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)))
 

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

officecfg/Makefile

@@ -18,13 +18,13 @@
 #***************************************************************