From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 15 Feb 2019 09:15:22 +0000 (+0100)
Subject: build: remove unnecessary assignments from Makefile.target
X-Git-Tag: v4.0.0-rc0~36^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f72036fad423a5c8135d3ea3c8ad6c4cc3191df4;p=thirdparty%2Fqemu.git

build: remove unnecessary assignments from Makefile.target

It is only necessary to clear block-obj-y because Makefile.objs
uses "+=" instead of "="; fix that and remove the assignment.
The other variables need not be cleared at all.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/Makefile.objs b/Makefile.objs
index acc53aa0f00..31a84b7d418 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -13,7 +13,7 @@ authz-obj-y = authz/
 #######################################################################
 # block-obj-y is code used by both qemu system emulation and qemu-img
 
-block-obj-y += nbd/
+block-obj-y = nbd/
 block-obj-y += block.o blockjob.o job.o
 block-obj-y += block/ scsi/
 block-obj-y += qemu-io-cmds.o
diff --git a/Makefile.target b/Makefile.target
index a4585061399..441ace6369c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -175,9 +175,6 @@ endif # CONFIG_SOFTMMU
 dummy := $(call unnest-vars,,obj-y)
 all-obj-y := $(obj-y)
 
-block-obj-y :=
-common-obj-y :=
-chardev-obj-y :=
 include $(SRC_PATH)/Makefile.objs
 dummy := $(call unnest-vars,.., \
                authz-obj-y \