[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/10] build: simplify and fix fix-obj-vars
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 09/10] build: simplify and fix fix-obj-vars |
Date: |
Fri, 9 May 2014 23:03:43 +0200 |
fix-obj-vars has the undesired side effect of breaking -cflags
-objs and -libs variables in the toplevel Makefile.objs. The
variables in the toplevel Makefile.objs do not need any fix,
so fix-obj-vars need not do anything.
Since we are touching it, remove the now unnecessary $(if)
in the callers.
Signed-off-by: Paolo Bonzini <address@hidden>
---
rules.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/rules.mak b/rules.mak
index 73efafe..b12d312 100644
--- a/rules.mak
+++ b/rules.mak
@@ -175,16 +175,16 @@ $(eval save-$2-$1 :=)
endef
define fix-obj-vars
-$(foreach v,$($1), \
+$(if $2, $(foreach v,$($1), \
$(if $($v-cflags), \
- $(eval $2$v-cflags := $($v-cflags)) \
+ $(eval $2/$v-cflags := $($v-cflags)) \
$(eval $v-cflags := )) \
$(if $($v-libs), \
- $(eval $2$v-libs := $($v-libs)) \
+ $(eval $2/$v-libs := $($v-libs)) \
$(eval $v-libs := )) \
$(if $($v-objs), \
- $(eval $2$v-objs := $(addprefix $2,$($v-objs))) \
- $(eval $v-objs := )))
+ $(eval $2/$v-objs := $(addprefix $2/,$($v-objs))) \
+ $(eval $v-objs := ))))
endef
define unnest-dir
@@ -192,7 +192,7 @@ $(foreach var,$(nested-vars),$(call push-var,$(var),$1/))
$(eval obj-parent-$1 := $(obj))
$(eval obj := $(if $(obj),$(obj)/$1,$1))
$(eval include $(SRC_PATH)/$1/Makefile.objs)
-$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(if $(obj),$(obj)/)))
+$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(obj)))
$(eval obj := $(obj-parent-$1))
$(eval obj-parent-$1 := )
$(foreach var,$(nested-vars),$(call pop-var,$(var),$1/))
@@ -228,7 +228,7 @@ endef
define unnest-vars
$(eval obj := $1)
$(eval nested-vars := $2)
-$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(if $(obj),$(obj)/)))
+$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(obj)))
$(eval old-nested-dirs := )
$(call unnest-vars-1)
$(if $1,$(foreach v,$(nested-vars),$(eval \
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 02/10] build: simplify Makefile.target a bit, use just one rule for softmmu, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 01/10] build: Fix per-object variables for Makefile.target, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 04/10] Makefile: strip tools and modules too, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 05/10] Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL), Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 06/10] Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG), Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 07/10] build: add support for per-object -cflags and -libs to all rules, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 03/10] build: simplify Makefile.target around unnest-vars invocations, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 08/10] build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 09/10] build: simplify and fix fix-obj-vars,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09, Peter Maydell, 2014/05/13