[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_BuildplTargets.mk |    6 ------
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   16 ++++++++++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit ab988b37908a0b8ee62869bd637bf176b03ac3ac
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Nov 30 16:45:31 2011 +0100

    fix conditions on when to read gbuild definitions

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index cd3101d..702d84f 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,12 +27,6 @@
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 
-gb_Module_add_target=
-gb_Module_add_moduledir=
-gb_Module_add_check_target=
-gb_Module_add_subsequentcheck_target=
-gb_FULLDEPS=
-
 clean: clean-host clean-build
 
 subsequentcheck: smoketestoo_native
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 842f05e..f5e17b8 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -27,14 +27,26 @@
 
 
 # speed up if no target need to parse all modules
+gb_SpeedUpTargets_WRAPPEDBUILD:=
 ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun Env.Host.sh,$(MAKECMDGOALS)),)
+ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/Env.Host.sh,$(MAKECMDGOALS)),)
+gb_SpeedUpTargets_WRAPPEDBUILD:=T
+endif
+endif
+
+ifeq ($(strip $(gb_PARTIALBUILD)),)
+ifeq ($(filter-out clean subsequentcheck unitcheck build dev-install smoketestoo_native instsetoo_native cross_toolset findunusedcode,$(MAKECMDGOALS)),)
+gb_SpeedUpTargets_WRAPPEDBUILD:=T
+endif
+endif
+
+ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
+$(info wrapped build - skip reading gbuild definitions)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
 gb_FULLDEPS=
 endif
-endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab: