* [Qemu-devel] [PATCH] build: remove unnecessary assignments from Makefile.target
@ 2019-02-15 10:49 Paolo Bonzini
2019-02-15 14:07 ` Liam Merwick
2019-02-18 9:55 ` Markus Armbruster
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2019-02-15 10:49 UTC (permalink / raw)
To: qemu-devel; +Cc: armbru, stefanha, eblake
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] build: remove unnecessary assignments from Makefile.target
2019-02-15 10:49 [Qemu-devel] [PATCH] build: remove unnecessary assignments from Makefile.target Paolo Bonzini
@ 2019-02-15 14:07 ` Liam Merwick
2019-02-18 9:55 ` Markus Armbruster
1 sibling, 0 replies; 3+ messages in thread
From: Liam Merwick @ 2019-02-15 14:07 UTC (permalink / raw)
To: qemu-devel
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 \
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] build: remove unnecessary assignments from Makefile.target
2019-02-15 10:49 [Qemu-devel] [PATCH] build: remove unnecessary assignments from Makefile.target Paolo Bonzini
2019-02-15 14:07 ` Liam Merwick
@ 2019-02-18 9:55 ` Markus Armbruster
1 sibling, 0 replies; 3+ messages in thread
From: Markus Armbruster @ 2019-02-18 9:55 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, stefanha
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-18 9:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-15 10:49 [Qemu-devel] [PATCH] build: remove unnecessary assignments from Makefile.target Paolo Bonzini
2019-02-15 14:07 ` Liam Merwick
2019-02-18 9:55 ` Markus Armbruster
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).