From patchwork Tue Jun 18 20:24:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 252431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 36E732C02F3 for ; Wed, 19 Jun 2013 06:26:10 +1000 (EST) Received: from localhost ([::1]:34459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Up2Tg-0005vR-6k for incoming@patchwork.ozlabs.org; Tue, 18 Jun 2013 16:26:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Up2Ru-00047S-37 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 16:24:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Up2Rt-0001ak-0I for qemu-devel@nongnu.org; Tue, 18 Jun 2013 16:24:18 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:50664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Up2Rs-0001ac-Nm; Tue, 18 Jun 2013 16:24:16 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 67B8541A6B; Wed, 19 Jun 2013 00:24:15 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id B91D051B; Wed, 19 Jun 2013 00:24:14 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 19 Jun 2013 00:24:13 +0400 Message-Id: <1371587053-16439-1-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev Subject: [Qemu-devel] [PATCH trivial] Makefile.objs: do not link block/ twice X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org $(block-obj-y) already includes block/, so there's no need to add it explicitly to $(common-obj-y). Signed-off-by: Michael Tokarev Reviewed-by: Stefan Hajnoczi --- Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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