diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-04-29 17:49:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-08 15:09:04 +0200 |
| commit | d608cc5c53f5cd5631b92b17aa1344210717f5b4 (patch) | |
| tree | 67626038e7adf636fec5758858644db73bcbec22 /Makefile.target | |
| parent | 5c40c7395db04d4d7f491f116a165db7b8e08bab (diff) | |
| download | qemu-d608cc5c53f5cd5631b92b17aa1344210717f5b4.tar.gz qemu-d608cc5c53f5cd5631b92b17aa1344210717f5b4.tar.bz2 qemu-d608cc5c53f5cd5631b92b17aa1344210717f5b4.zip | |
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 <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 11 |
1 files changed, 2 insertions, 9 deletions
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 |