[Libreoffice-commits] .: solenv/gbuild

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Wed Dec 14 05:20:29 PST 2011


 solenv/gbuild/extensions/post_AuxTargets.mk |   25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

New commits:
commit d8729cfc6413c15af7c9e9eaecbffcc23d37ab7b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Dec 14 14:17:36 2011 +0100

    bootstrap can be kept in both phases as it has a proper touchfile

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index b98ef3d..119536c 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, at 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
 


More information about the Libreoffice-commits mailing list