[Libreoffice-commits] core.git: helpcontent2 solenv/gbuild translations

[Bjoern Michaelsen]

 helpcontent2                |    2 +-
 solenv/gbuild/LinkTarget.mk |    4 ++++
 translations                |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 46fa7ac866ee392ed72cfc670f062a8c318d2d92
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Feb 18 16:19:25 2014 +0100

    experimentally enable using depcache for full build speedup
    
    Change-Id: I6c186ba7ca27166a272327bcfe6a94c391c3514f

diff --git a/helpcontent2 b/helpcontent2
index f9e2d68..1fbc939 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f9e2d688f6755c85b099cb659dd865dae775b607
+Subproject commit 1fbc93982ca787e8be5b38b6a6729850009c7866
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 4e34a15..b7cd9c8 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -597,7 +597,11 @@ $(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS :=
 $(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT :=
 
 ifeq ($(gb_FULLDEPS),$(true))
+ifeq (depcache:,$(filter depcache,$(.FEATURES)):$(gb_PARTIAL_BUILD))
+-includedepcache $(call gb_LinkTarget_get_dep_target,$(1))
+else
 -include $(call gb_LinkTarget_get_dep_target,$(1))
+endif
 $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS :=
diff --git a/translations b/translations
index f3f0426..c8c4037 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f3f04265562dcd40990cccdd83170c8afffef4ab
+Subproject commit c8c40371caa4507a490f8c5ab0961a35848d01c5