[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_AuxTargets.mk |   52 ++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

New commits:
commit fe6499cee5e84183844df41380519ed7eeb0c4dc
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: