From patchwork Wed Jun 6 06:36:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 163281 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 62CD2B6F9A for ; Wed, 6 Jun 2012 17:36:54 +1000 (EST) Received: from localhost ([::1]:40322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScAnT-0002xv-Vl for incoming@patchwork.ozlabs.org; Wed, 06 Jun 2012 03:36:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rx-0003z5-BN for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9rr-0002GL-3D for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:24 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:45050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rq-00028S-Qm for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:19 -0400 Received: by mail-pz0-f45.google.com with SMTP id v2so9050407dad.4 for ; Tue, 05 Jun 2012 23:37:17 -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=q5oo5RMFTcyNf9uFyzQxzhwAQRNXebZ2D8PSN/uZFRc=; b=SYsENq5CBGB2onzsqfulxdBW5wSOh+TDq+WxaiqStSpu5Z08GLbVmLf9KdVg0E4S4w 9LdV/WZrEchSvW9N2VM25asx4BNJfEoDeeq4l06uZh0pDzSQMd0lWSgdqbWPHdfj/XSz 6HBy6f3exn7GUq5UXnhxmuudh/ZeTgMcbJ5mC6ewHoQ3PDjRhjAGNRJa6+mHphGX34Z0 o3GpFp13XIHFFM5Eg3/Pg2g48zNHsGe16rI+hg5VQ/y8hfch+8zl1g9wpkagCMIVMCI+ OT2mHkvnM0SrMgm+XmRG7RdsDzkXmluDUv8dCdVT5mdCJMuRiDrUO4XmVZhm9J7VyG1k CNCA== Received: by 10.68.223.167 with SMTP id qv7mr54944563pbc.127.1338964637798; Tue, 05 Jun 2012 23:37:17 -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.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 23:37:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 6 Jun 2012 08:36:22 +0200 Message-Id: <1338964592-22223-16-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.210.45 Cc: anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v2 15/25] build: move slirp/ 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 | 5 +---- slirp/Makefile.objs | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 slirp/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 7ee2bb6..668c148 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -120,10 +120,7 @@ common-obj-$(CONFIG_POSIX) += compatfd.o common-obj-y += notify.o event_notifier.o common-obj-y += qemu-timer.o qemu-timer-common.o -slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o -slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o -slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o arp_table.o -common-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y)) +common-obj-$(CONFIG_SLIRP) += slirp/ # xen backend driver support common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o diff --git a/slirp/Makefile.objs b/slirp/Makefile.objs new file mode 100644 index 0000000..bb43d3c --- /dev/null +++ b/slirp/Makefile.objs @@ -0,0 +1,3 @@ +common-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o +common-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o +common-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o arp_table.o