[Libreoffice-commits] .: Makefile solenv/gbuild

[Norbert Thiebaud]

 Makefile                                        |    7 +++++--
 solenv/gbuild/extensions/post_BuildplTargets.mk |   12 ++++--------
 solenv/gbuild/partial_build.mk                  |    8 ++++++++
 3 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 8b212711cf09492e07d05b62360d7960d3b0178c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 5 22:00:39 2012 -0600

    darn! finally bootstrap target (seems to) works on windows... and other

diff --git a/Makefile b/Makefile
index a701b50..8d0f18c 100644
--- a/Makefile
+++ b/Makefile
@@ -352,8 +352,11 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto
 #
 # Bootstap
 #
+$(WORKDIR)/bootstrap:
+	@cd $(SRCDIR) && ./bootstrap
+	@mkdir -p $(dir $@) && touch $@
 
-bootstrap: $(SRCDIR)/workdir/$(INPATH)/bootstrap
+bootstrap: $(WORKDIR)/bootstrap
 
 #
 # Fetch
@@ -362,7 +365,7 @@ fetch: src.downloaded
 
 src.downloaded : autogen ooo.lst download
 ifeq ($(DO_FETCH_TARBALLS),YES)
-	./download $(SRCDIR)/ooo.lst && touch $@
+	@./download $(SRCDIR)/ooo.lst && touch $@
 else
 	@echo "Automatic fetching of external tarballs is disabled."
 endif
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 8bd3151..2c632d6 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,10 +27,6 @@
 
 .PHONY: cross-build-toolset dev-install build findunusedcode
 
-$(SRCDIR)/workdir/$(INPATH)/bootstrap:
-	@cd $(SRCDIR) && ./bootstrap
-	@mkdir -p $(dir $@) && touch $@
-
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
 
 .DEFAULT_GOAL=all
@@ -110,7 +106,7 @@ endef
 
 # the build order dependencies are rather ugly...
 dev-install: \
-			$(SRCDIR)/workdir/$(INPATH)/bootstrap \
+			bootstrap \
 			$(SRCDIR)/src.downloaded \
 			$(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \
 		|   $(filter build,$(MAKECMDGOALS)) \
@@ -177,11 +173,11 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
 
-dev-install: $(SRCDIR)/workdir/$(INPATH)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
+dev-install: bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
 
-build: $(SRCDIR)/workdir/$(INPATH)bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
+build: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 
-cross_toolset: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: bootstrap $(SRCDIR)/src.downloaded
 
 findunusedcode:
 
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 808917b..2059514 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -1,4 +1,6 @@
 
+.PHONY : bootstrap
+
 gb_PARTIALBUILD := T
 
 ifeq ($(SOLARENV),)
@@ -8,6 +10,12 @@ endif
 include $(module_directory)/../config_$(gb_Side).mk
 endif
 
+$(WORKDIR)/bootstrap:
+	@cd $(SRCDIR) && ./bootstrap
+	@mkdir -p $(dir $@) && touch $@
+
+bootstrap: $(WORKDIR)/bootstrap
+
 gb_SourceEnvAndRecurse_STAGE=gbuild
 include $(SOLARENV)/gbuild/gbuild.mk