aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2014-10-28 16:47:54 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2014-10-31 11:26:25 +0100
commit2d38853239ac17984e81fee169d80384784c6401 (patch)
treeafd359001eb880d6b5c83d3d9ed0201965ca72e9
parent4239e2dc018c0defdbad35d387051ca2b208889d (diff)
rules.mak: Allow .mo-objs and .mo-cflags in -y variables
Expand %.mo-objs in -y nested objects, so that we can write combined object -cflags rules like what will be done in the coming patch. Signed-off-by: Fam Zheng <famz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--rules.mak5
1 files changed, 5 insertions, 0 deletions
diff --git a/rules.mak b/rules.mak
index cf76b88d26..f500fefdd1 100644
--- a/rules.mak
+++ b/rules.mak
@@ -362,4 +362,9 @@ define unnest-vars
# Include all the .d files
$(eval -include $(addsuffix *.d, $(sort $(dir $($v)))))
$(eval $v := $(filter-out %/,$($v))))
+
+ # For all %.mo objects that are directly added into -y, expand them to %.mo-objs
+ $(foreach v,$2,
+ $(eval $v := $(foreach o,$($v),$(if $($o-objs),$($o-objs),$o))))
+
endef