aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-02-15 10:15:22 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-11 16:33:49 +0100
commitf72036fad423a5c8135d3ea3c8ad6c4cc3191df4 (patch)
treee6eb53e7c4cb48e10fe99c0b397fa182b7067535
parent310b3fe9e50a59f7911f8930bc523a7a0b84bb89 (diff)
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>
-rw-r--r--Makefile.objs2
-rw-r--r--Makefile.target3
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.objs b/Makefile.objs
index acc53aa0f0..31a84b7d41 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 a458506139..441ace6369 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 \