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   | 2 +-
 Makefile.target | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index c3a2354..e5cc928 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -22,7 +22,7 @@ slirp-obj-$(CONFIG_SLIRP) = slirp/
 #######################################################################
 # 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 a56a72f..06b44c0 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -174,10 +174,6 @@ endif # CONFIG_SOFTMMU
 dummy := $(call unnest-vars,,obj-y)
 all-obj-y := $(obj-y)
 
-block-obj-y :=
-common-obj-y :=
-chardev-obj-y :=
-slirp-obj-y :=
 include $(SRC_PATH)/Makefile.objs
 dummy := $(call unnest-vars,.., \
                block-obj-y \
-- 
1.8.3.1

On 15/02/2019 10:49, Paolo Bonzini wrote:
> 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>


Reviewed-by: Liam Merwick <liam.merwick@oracle.com>


> ---
>   Makefile.objs   | 2 +-
>   Makefile.target | 4 ----
>   2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/Makefile.objs b/Makefile.objs
> index c3a2354..e5cc928 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -22,7 +22,7 @@ slirp-obj-$(CONFIG_SLIRP) = slirp/
>   #######################################################################
>   # 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 a56a72f..06b44c0 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -174,10 +174,6 @@ endif # CONFIG_SOFTMMU
>   dummy := $(call unnest-vars,,obj-y)
>   all-obj-y := $(obj-y)
>   
> -block-obj-y :=
> -common-obj-y :=
> -chardev-obj-y :=
> -slirp-obj-y :=
>   include $(SRC_PATH)/Makefile.objs
>   dummy := $(call unnest-vars,.., \
>                  block-obj-y \
> 

Paolo Bonzini <pbonzini@redhat.com> writes:

> 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>

Reviewed-by: Markus Armbruster <armbru@redhat.com>