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

[Libreoffice Gerrit user]

 solenv/gbuild/LinkTarget.mk |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit f49be70f1859a2734e9516a5036adb2426939e68
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Aug 21 22:37:03 2012 +0200

    fdo#53888: fix YaccTarget/LexTarget dependencies:
    
    These cannot be order only because if the source file is changed the
    generated cxx file has to be recompiled as well.
    
    Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379
    (cherry picked from commit cd0046bca0691fdca45a030903b7cde3bfee544c)
    Reviewed-on: https://gerrit.libreoffice.org/450
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e4185a0..d9632e1 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -206,8 +206,10 @@ $(call gb_YaccTarget_get_target,%) : $(call gb_YaccTarget_get_source,$(SRCDIR),%
 	$(call gb_YaccTarget__command,$<,$*,$@,$(call gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
 
 define gb_YaccTarget_YaccTarget
-$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call gb_YaccTarget_get_target,$(1))
-$(call gb_YaccTarget_get_header_target,$(1)) :| $(call gb_YaccTarget_get_target,$(1))
+$(call gb_YaccTarget_get_grammar_target,$(1)) : $(call gb_YaccTarget_get_target,$(1))
+	touch $$@
+$(call gb_YaccTarget_get_header_target,$(1)) : $(call gb_YaccTarget_get_target,$(1))
+	touch $$@
 
 endef
 
@@ -229,7 +231,8 @@ $(call gb_LexTarget_get_target,%) : $(call gb_LexTarget_get_source,$(SRCDIR),%)
 
 # gb_LexTarget_LexTarget(scanner-file)
 define gb_LexTarget_LexTarget
-$(call gb_LexTarget_get_scanner_target,$(1)) :| $(call gb_LexTarget_get_target,$(1))
+$(call gb_LexTarget_get_scanner_target,$(1)) : $(call gb_LexTarget_get_target,$(1))
+	touch $$@
 
 endef