diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-02 14:47:00 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-12-07 17:20:01 +0100 |
| commit | 80bd3e05b8da9800e9bf9bce3fe78a4af0576fc9 (patch) | |
| tree | d8d476e6156fbb9674ede083f96b6b9bf0cfeff0 /Makefile | |
| parent | 5b11cd8ca85bb97063f584d6bf7c960a2999db1d (diff) | |
kill gb_MINISOLARENV in favor of stages
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 8 insertions, 13 deletions
@@ -26,23 +26,18 @@ # #************************************************************************* -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 +SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))) + +ifeq ($(strip $(gb_SourceEnvAndRecurse_STAGE)),) +include $(SRCDIR)/solenv/gbuild/source_and_rerun.mk endif + +ifeq ($(gb_SourceEnvAndRecurse_STAGE),reconfigure) +SOLARENV:=$(SRCDIR)/solenv endif -ifneq ($(gb_SOURCEANDRERUN),) -include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk -else +ifneq ($(filter reconfigure gbuild buildpl,$(gb_SourceEnvAndRecurse_STAGE)),) include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) endif - # vim: set noet sw=4 ts=4: |