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

[Lubos Lunak]

 solenv/gbuild/gbuild.mk |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 2ee0eeef5803659e096fc788c01cff0ea54ec6e8
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Mon Mar 26 17:36:14 2012 +0200

    Revert "make gbuild follow --disable-dependency-tracking too"
    
    3-5 branch is not ready for this, there are a number of build failures.
    Okayed by Petr Mladek, but this is rather obvious.
    
    This reverts commit af67f5f6438bde777c0cbb4d90c7f6bdcd831bf3.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 574e851..e85ed83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,16 +116,12 @@ 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)),)

_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits