diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-14 14:17:36 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-14 14:19:17 +0100 |
| commit | d8729cfc6413c15af7c9e9eaecbffcc23d37ab7b (patch) | |
| tree | f732137de702cba4f91ee6b255ee065275692931 /solenv | |
| parent | aa6a3683070ac4d6f3cb4daea3cb08534fde2537 (diff) | |
bootstrap can be kept in both phases as it has a proper touchfile
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_AuxTargets.mk | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index b98ef3df1348..119536c56997 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -27,6 +27,14 @@ .PHONY: id tags docs distro-pack-install install fetch clean-host clean-build bootstrap +$(WORKDIR)/bootstrap: + @cd $(SRCDIR) && ./bootstrap + @mkdir -p $(dir $@) && touch $@ + +bootstrap: $(WORKDIR)/bootstrap + +autogen.lastrun: + ifneq ($(gb_SourceEnvAndRecurse_STAGE),buildpl) id: @@ -56,14 +64,6 @@ fetch: $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in $(if $(filter reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2) -autogen.lastrun: - - -$(WORKDIR)/bootstrap: - @cd $(SRCDIR) && ./bootstrap - @mkdir -p $(dir $@) && touch $@ - -bootstrap: $(WORKDIR)/bootstrap ifeq ($(strip $(gb_PARTIALBUILD)),) @@ -113,15 +113,6 @@ distro-pack-install: $(SRCDIR)/Env.Host.sh: @true -autogen.lastrun: - @true - -$(WORKDIR)/bootstrap: - @true - -bootstrap: - @true - clean-host: @true |