[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - solenv/gbuild

[Petr Mladek]

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

New commits:
commit 7fe74faa3ca3bf4edd9e317af1be07f77bb19403
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
 
commit 00bc8fc77ac26ddcbcdba9ed02ce711a0dd322cc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Dec 14 12:13:23 2011 +0100

    adding noop rules for auxtargets in buildpl, moved deps of buildpl into that phase

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index 13dd2e0..b98ef3d 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -44,10 +44,13 @@ distro-pack-install: install
 	$(SRCDIR)/bin/distro-install-sdk
 	$(SRCDIR)/bin/distro-install-file-lists
 
-$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
-	$(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download ./ooo.lst && touch $@,touch $@)
 
-fetch: $(SRCDIR)/src.downloaded
+#these need to stay in the buildpl phase as buildpl depends on them
+$(SRCDIR)/src.downloaded:
+	@true
+
+fetch:
+	@true
 
 # fixme: can we prevent these exports in the first place?
 $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
@@ -55,6 +58,7 @@ $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
 
 autogen.lastrun:
 
+
 $(WORKDIR)/bootstrap:
 	@cd $(SRCDIR) && ./bootstrap
 	@mkdir -p $(dir $@) && touch $@
@@ -88,6 +92,48 @@ install: build
 
 endif
 
+else
+$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
+	$(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download ./ooo.lst && touch $@,touch $@)
+
+fetch: $(SRCDIR)/src.downloaded
+
+id:
+	@true
+
+tags:
+	@true
+
+docs:
+	@true
+
+distro-pack-install:
+	@true
+
+$(SRCDIR)/Env.Host.sh:
+	@true
+
+autogen.lastrun:
+	@true
+
+$(WORKDIR)/bootstrap:
+	@true
+
+bootstrap:
+	@true
+
+clean-host:
+	@true
+
+clean-build:
+	@true
+
+distclean:
+	@true
+
+install:
+	@true
+
 endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
commit a7b6b855a2d5390a80ad52a027d2382051bc168c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Dec 14 12:02:25 2011 +0100

    skip AuxTargets in buildpl phase

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index da31aa6..13dd2e0 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -27,6 +27,8 @@
 
 .PHONY: id tags docs distro-pack-install install fetch clean-host clean-build bootstrap
 
+ifneq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
+
 id:
 	@create-ids
 
@@ -86,5 +88,6 @@ install: build
 
 endif
 
+endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
commit 96c6bf45549e5742858d8ed12ce97ed6251805aa
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Dec 11 19:39:58 2011 -0500

    alow make to run autogen.sh if autogen.lastrun doesn't exist

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index 7622047..da31aa6 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -51,6 +51,8 @@ fetch: $(SRCDIR)/src.downloaded
 $(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 $@