diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-01 17:43:25 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-07 15:53:01 +0100 |
| commit | 1c792d9c39328f210a6f859612ca0aa6d81a19eb (patch) | |
| tree | a95f95ad1f8f469181b3fa0ee4eec2f2835fe199 /solenv/gbuild | |
| parent | c53f373b4bfcaa3f4ad9a9b40cceb66274848201 (diff) | |
use some macro magic here
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/source_and_rerun.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk index 061c017af572..46e6d43fe040 100644 --- a/solenv/gbuild/source_and_rerun.mk +++ b/solenv/gbuild/source_and_rerun.mk @@ -1,6 +1,10 @@ gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) +define gb_SourceEnvAndRecurse_recurse +$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2) +endef + ifneq ($(strip $(gb_PARTIALBUILD)),) SRCDIR:=$(realpath $(gb_MAKEFILEDIR)/..) @@ -10,8 +14,8 @@ gb_SourceEnvAndRecurse_buildpl=true else SRCDIR:=$(realpath $(gb_MAKEFILEDIR)) -gb_SourceEnvAndRecurse_reconfigure=$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(SRCDIR)/Env.Host.sh gb_SourceEnvAndRecurse_STAGE=reconfigure -gb_SourceEnvAndRecurse_buildpl=$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(MAKECMDGOALS) gb_SourceEnvAndRecurse_STAGE=buildpl +gb_SourceEnvAndRecurse_reconfigure=$(call gb_SourceEnvAndRecurse_recurse,$(SRCDIR)/Env.Host.sh,reconfigure) +gb_SourceEnvAndRecurse_buildpl=$(call gb_SourceEnvAndRecurse_recurse,$(MAKECMDGOALS),buildpl) endif @@ -21,7 +25,7 @@ source-env-and-recurse: 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 && \ $(gb_SourceEnvAndRecurse_buildpl) && \ - $(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j$${GMAKE_PARALLELISM} $(MAKECMDGOALS) gb_SourceEnvAndRecurse_STAGE=gbuild + $(call gb_SourceEnvAndRecurse_recurse,$(MAKECMDGOALS),gbuild) \ ifneq ($(strip $(MAKECMDGOALS)),) |