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

[Lubos Lunak]

 solenv/gbuild/gbuild.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 3b1adf08e38c26c2d0d22b831f9582bc60049681
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Mar 26 20:38:41 2012 +0200

    Revert "Revert "make gbuild follow --disable-dependency-tracking too""
    
    Revert again, the option itself is correct. Resulting problems need to
    be fixed and the option should not be used now where it breaks.
    
    This reverts commit 2ee0eeef5803659e096fc788c01cff0ea54ec6e8.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..574e851 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,12 +116,16 @@ ifneq ($(gb_DEBUGLEVEL),0)
 gb_SYMBOL := $(true)
 endif
 
+ifneq ($(nodep),)
+gb_FULLDEPS := $(false)
+else
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)
 endif
+endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)