Patchwork [trivial] Makefile.objs: do not link block/ twice

login
register
mail settings
Submitter Michael Tokarev
Date June 18, 2013, 8:24 p.m.
Message ID <1371587053-16439-1-git-send-email-mjt@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/252431/
State New
Headers show

Comments

Michael Tokarev - June 18, 2013, 8:24 p.m.
$(block-obj-y) already includes block/, so there's
no need to add it explicitly to $(common-obj-y).

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 Makefile.objs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Stefan Hajnoczi - June 19, 2013, 8:59 a.m.
On Wed, Jun 19, 2013 at 12:24:13AM +0400, Michael Tokarev wrote:
> $(block-obj-y) already includes block/, so there's
> no need to add it explicitly to $(common-obj-y).
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  Makefile.objs |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 5b288ba..24c74a8 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -41,7 +41,7 @@  libcacard-y += libcacard/vcardt.o
 # single QEMU executable should support all CPUs and machines.
 
 ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
+common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o
 common-obj-y += net/
 common-obj-y += readline.o
 common-obj-y += qdev-monitor.o device-hotplug.o