From patchwork Wed Jun 6 06:36:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 163293 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5CD29B6FA4 for ; Wed, 6 Jun 2012 17:59:39 +1000 (EST) Received: from localhost ([::1]:32883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScB9V-0006vO-5z for incoming@patchwork.ozlabs.org; Wed, 06 Jun 2012 03:59:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rm-0003z1-Fu for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9rg-0002Eb-7G for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:14 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rf-000290-V1 for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:08 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so9244268pbb.4 for ; Tue, 05 Jun 2012 23:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=1cAsld4+VQaK072X6v1gCsmkM6158b7G/8HVrosDvKM=; b=ymoowwtjgaSuRRJ3qvg7f/YAAVE88gUELQ4zrjQ3PACeRpVSnJaNpTk5Dv/JZGkr9Z lsPxid+uBUOUeUrAjdyqkeLIdWIoDf718P7DyQWkuinCtGKQeh8zO3iZawklqnyPMSNc d4pK42r1XwDOFbwydpjRgufBxStxaTl3s2VEDlC9Ou9ixSxBJU/LwNSsKte8biDO4p09 IYjpREPTTu/eA+mSZNKEZ71hEMzqu1fr7NZ2dRxhNYzmWz3Xjn9k+Y1R4hYCc+bbry3d /pxiMLMDTIitb+bDfJtSMc0JIkhngYAIYnd8ymV/7wdWd+WeNp6XAroiVeJ4fKQQX8Gj OL0Q== Received: by 10.68.219.166 with SMTP id pp6mr54164804pbc.35.1338964626899; Tue, 05 Jun 2012 23:37:06 -0700 (PDT) Received: from yakj.usersys.redhat.com.usersys.redhat.com (p40081-ipngn402hodogaya.kanagawa.ocn.ne.jp. [180.23.161.81]) by mx.google.com with ESMTPS id py5sm1479093pbb.1.2012.06.05.23.37.04 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 23:37:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 6 Jun 2012 08:36:18 +0200 Message-Id: <1338964592-22223-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> References: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v2 11/25] build: move net/ objects to nested Makefile.objs 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 Signed-off-by: Paolo Bonzini --- Makefile.objs | 17 +---------------- net/Makefile.objs | 12 ++++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 net/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 3285949..f40be38 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -47,21 +47,6 @@ block-obj-$(CONFIG_POSIX) += posix-aio-compat.o block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o block-obj-y += block/ -net-obj-y = net.o -net-nested-y = queue.o checksum.o util.o -net-nested-y += socket.o -net-nested-y += dump.o -net-nested-$(CONFIG_POSIX) += tap.o -net-nested-$(CONFIG_LINUX) += tap-linux.o -net-nested-$(CONFIG_WIN32) += tap-win32.o -net-nested-$(CONFIG_BSD) += tap-bsd.o -net-nested-$(CONFIG_SOLARIS) += tap-solaris.o -net-nested-$(CONFIG_AIX) += tap-aix.o -net-nested-$(CONFIG_HAIKU) += tap-haiku.o -net-nested-$(CONFIG_SLIRP) += slirp.o -net-nested-$(CONFIG_VDE) += vde.o -net-obj-y += $(addprefix net/, $(net-nested-y)) - ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. # only pull in the actual virtio-9p device if we also enabled virtio. @@ -78,7 +63,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) # single QEMU executable should support all CPUs and machines. common-obj-y = $(block-obj-y) blockdev.o -common-obj-y += $(net-obj-y) +common-obj-y += net.o net/ common-obj-y += qom/ common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX)) common-obj-y += readline.o console.o cursor.o diff --git a/net/Makefile.objs b/net/Makefile.objs new file mode 100644 index 0000000..72f50bc --- /dev/null +++ b/net/Makefile.objs @@ -0,0 +1,12 @@ +common-obj-y = queue.o checksum.o util.o +common-obj-y += socket.o +common-obj-y += dump.o +common-obj-$(CONFIG_POSIX) += tap.o +common-obj-$(CONFIG_LINUX) += tap-linux.o +common-obj-$(CONFIG_WIN32) += tap-win32.o +common-obj-$(CONFIG_BSD) += tap-bsd.o +common-obj-$(CONFIG_SOLARIS) += tap-solaris.o +common-obj-$(CONFIG_AIX) += tap-aix.o +common-obj-$(CONFIG_HAIKU) += tap-haiku.o +common-obj-$(CONFIG_SLIRP) += slirp.o +common-obj-$(CONFIG_VDE) += vde.o