Re: [Qemu-devel] [PATCH 1/2] build: simplify and fix fix-obj-vars

[Paolo Bonzini <pbonzini@redhat.com>]

Il 08/05/2014 15:40, Fam Zheng ha scritto:
>> >  define fix-obj-vars
>> > -$(foreach v,$($1), \
>> > +$(if $2,
>> > +  $(foreach v,$($1), \
> Not very consistent in indentation. BTW what's the right space/tab style to
> use in Makefiles for multi-line macros like this?

No idea... I'll just join the two lines.

>> >  	$(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 +193,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 +229,7 @@ endef
>> >  define unnest-vars
>> >  $(eval obj := $1)
>> >  $(eval nested-vars := $2)
>> > -$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(if $(obj),$(obj)/)))
> I'm not sure about this removed line since it's not in master, maybe you missed
> a patch to squash?

It's the original fix-obj-vars fix.

Paolo

>> > +$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(obj)))