OSDN Git Service

build: remove unnecessary assignments from Makefile.target
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 15 Feb 2019 09:15:22 +0000 (10:15 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 11 Mar 2019 15:33:49 +0000 (16:33 +0100)
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>
Makefile.objs
Makefile.target

index acc53aa..31a84b7 100644 (file)
@@ -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
index a458506..441ace6 100644 (file)
@@ -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 \