summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-10-21 17:58:15 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-10-21 21:28:50 +0200
commit762a33f6c80ca762c67d5f59950a98a0a7108b8d (patch)
tree6b1b46fe62413fc2a5ecefe31b916d6ca8a1dc2c /solenv
parent1bee4434affbf6d53379079b7b3b4c618b8a8aaa (diff)
Fix for YaccObject, also: YaccObject should not generate stuff directly in toplevel workdir
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/LinkTarget.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index bcc701a2190a..fb12c062cf58 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -229,13 +229,13 @@ $(call gb_YaccObject_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_YaccObject_get_header_target,$*) $(call gb_YaccObject__get_generated_source,$*))
-gb_YaccObject__get_generated_source = $(WORKDIR)/$(1).cxx
+gb_YaccObject__get_generated_source = $(WORKDIR)/YaccObject/$(1).cxx
define gb_YaccObject_YaccObject
$(call gb_YaccObject_get_target,$(1)) : $(call gb_YaccObject__get_generated_source,$(1)) $(call gb_YaccObject_get_header_target,$(1))
$(call gb_YaccObject_get_header_target,$(1)) :| $(call gb_YaccObject__get_generated_source,$(1))
$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(SRCDIR),$(1))
- $(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SRCDIR),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
+ $$(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SRCDIR),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
endef
gb_YACC := bison