From: Paolo Bonzini Date: Tue, 29 Apr 2014 15:49:25 +0000 (+0200) Subject: build: simplify Makefile.target around unnest-vars invocations X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d608cc5c53f5cd5631b92b17aa1344210717f5b4;p=qemu.git build: simplify Makefile.target around unnest-vars invocations No need to save/restore obj-y, we can just build all-obj-y incrementally. Reviewed-by: Fam Zheng Signed-off-by: Paolo Bonzini --- diff --git a/Makefile.target b/Makefile.target index 2726b745b5..261de9eeb4 100644 --- a/Makefile.target +++ b/Makefile.target @@ -143,10 +143,7 @@ endif # CONFIG_SOFTMMU %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS) dummy := $(call unnest-vars,,obj-y) - -# we are making another call to unnest-vars with different vars, protect obj-y, -# it can be overriden in subdir Makefile.objs -obj-y-save := $(obj-y) +all-obj-y := $(obj-y) block-obj-y := common-obj-y := @@ -156,11 +153,7 @@ dummy := $(call unnest-vars,.., \ block-obj-m \ common-obj-y \ common-obj-m) - -# Now restore obj-y -obj-y := $(obj-y-save) - -all-obj-y = $(obj-y) $(common-obj-y) +all-obj-y += $(common-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) ifndef CONFIG_HAIKU