From patchwork Mon Aug 3 12:46:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30549 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 884FBB7063 for ; Tue, 4 Aug 2009 00:27:22 +1000 (EST) Received: from localhost ([127.0.0.1]:47356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXyVS-0005k2-33 for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 10:27:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzX-0003bo-G3 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzT-0003Ys-Vc for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:15 -0400 Received: from [199.232.76.173] (port=51699 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzT-0003Yb-Fv for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:11 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40844) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzS-00076H-Tg for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:11 -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 n73CoAFV007035; Mon, 3 Aug 2009 08:50:10 -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 n73Co8eK026609; Mon, 3 Aug 2009 08:50:09 -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 n73Cn8Mo009715; Mon, 3 Aug 2009 08:50:07 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:37 +0200 Message-Id: <913d8de66e54ea506684813b59305a802dfcb3d3.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 46/81] Fold BLUEZ_LIBS into libs_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.target | 4 ---- configure | 3 +-- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index f8d3d9e..4ea21c0 100644 --- a/Makefile.target +++ b/Makefile.target @@ -241,10 +241,6 @@ adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0 QEMU_CFLAGS += $(VNC_TLS_CFLAGS) QEMU_CFLAGS += $(VNC_SASL_CFLAGS) -ifdef CONFIG_BLUEZ -LIBS += $(BLUEZ_LIBS) -endif - # xen backend driver support obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o diff --git a/configure b/configure index 13ae0e2..9945bfe 100755 --- a/configure +++ b/configure @@ -1111,7 +1111,7 @@ EOF bluez_cflags=`pkg-config --cflags bluez 2> /dev/null` bluez_libs=`pkg-config --libs bluez 2> /dev/null` if compile_prog "$bluez_cflags" "$bluez_libs" ; then - : + libs_softmmu="$bluez_libs $libs_softmmu" else bluez="no" fi @@ -1690,7 +1690,6 @@ fi if test "$bluez" = "yes" ; then echo "CONFIG_BLUEZ=y" >> $config_host_mak echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak - echo "BLUEZ_LIBS=$bluez_libs" >> $config_host_mak fi if test "$xen" = "yes" ; then echo "CONFIG_XEN=y" >> $config_host_mak