From patchwork Mon Aug 3 12:47:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30579 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id CB8BCB6F1F for ; Tue, 4 Aug 2009 01:48:08 +1000 (EST) Received: from localhost ([127.0.0.1]:49392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXzld-0006Z7-QI for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 11:48:05 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXx0B-00042Q-3A for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXx06-0003ze-M1 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:54 -0400 Received: from [199.232.76.173] (port=51745 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXx06-0003zX-DZ for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:50 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40926) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXx05-0007Fq-Im for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:49 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73ComSV007504; Mon, 3 Aug 2009 08:50:48 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73ColML027081; Mon, 3 Aug 2009 08:50:48 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8NK009715; Mon, 3 Aug 2009 08:50:46 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:47:07 +0200 Message-Id: <27169c18420c8fa993a8f5c94acab0dd29098df9.1249301360.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 76/81] VDE libs are used both by tools and softmmu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- Makefile | 2 -- Makefile.target | 2 +- configure | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d466c38..7fe36c4 100644 --- a/Makefile +++ b/Makefile @@ -124,8 +124,6 @@ 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 obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y)) -LIBS+=$(VDE_LIBS) - # xen backend driver support obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o diff --git a/Makefile.target b/Makefile.target index 2e49e73..01275f8 100644 --- a/Makefile.target +++ b/Makefile.target @@ -300,7 +300,7 @@ vl.o: qemu-options.h monitor.o: qemu-monitor.h -LIBS += $(COCOA_LIBS) $(VDE_LIBS) $(CURL_LIBS) +LIBS += $(COCOA_LIBS) $(CURL_LIBS) ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) endif # CONFIG_SOFTMMU diff --git a/configure b/configure index 1a91c86..1da827b 100755 --- a/configure +++ b/configure @@ -962,6 +962,8 @@ int main(void) EOF if compile_prog "" "$vde_libs" ; then vde=yes + libs_softmmu="$vde_libs $libs_softmmu" + libs_tools="$vde_libs $libs_tools" fi fi @@ -1613,7 +1615,6 @@ if test "$slirp" = "yes" ; then fi if test "$vde" = "yes" ; then echo "CONFIG_VDE=y" >> $config_host_mak - echo "VDE_LIBS=$vde_libs" >> $config_host_mak fi for card in $audio_card_list; do def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`