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

Michael Stahl mstahl at redhat.com
Fri Sep 13 04:40:29 PDT 2013


 solenv/gbuild/LinkTarget.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3988a308ef9212a3fe21ddb4699121a04715d15c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 13 13:35:48 2013 +0200

    gbuild: fix rule for gb_ObjCxxObject_get_dep_target
    
    The typo causes spurious re-builds and error messages about the
    dep-target.
    
    Change-Id: Ia8bc236759c7ef13f81fe91c88f467d6e507bf29

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index bb1569a..8ea9ae4 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -119,6 +119,8 @@ $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
 	$(call gb_CObject__command,$@,$*,$<,$(call gb_CObject_get_dep_target,$*))
 endif
 
+# Note: if the *Object_dep_target does not exist it will be created by
+# concat-deps as PHONY
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_CObject_get_dep_target,%) :
 	$(if $(wildcard $@),touch $@)
@@ -291,7 +293,7 @@ $(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDI
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_ObjCxxObject_get_dep_target,%) :
-	$(if $(wildcard $@),touch $)
+	$(if $(wildcard $@),touch $@)
 
 endif
 endif


More information about the Libreoffice-commits mailing list