From patchwork Mon Aug 3 12:46:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30550 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 67FBEB6F31 for ; Tue, 4 Aug 2009 00:28:58 +1000 (EST) Received: from localhost ([127.0.0.1]:48048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXyWz-0006Dr-Vu for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 10:28:53 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzY-0003cS-96 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzV-0003aP-Jy for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:15 -0400 Received: from [199.232.76.173] (port=51701 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzV-0003aC-6D for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:13 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40849) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzU-00076e-La for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:12 -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 n73CoCxL007074; Mon, 3 Aug 2009 08:50:12 -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 n73CoAcW026626; Mon, 3 Aug 2009 08:50:11 -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 n73Cn8Mp009715; Mon, 3 Aug 2009 08:50:08 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:38 +0200 Message-Id: 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 47/81] Fold FDT_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 | 2 -- configure | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Makefile.target b/Makefile.target index 4ea21c0..705b8df 100644 --- a/Makefile.target +++ b/Makefile.target @@ -291,7 +291,6 @@ QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif obj-ppc-$(CONFIG_FDT) += device_tree.o -LIBS+= $(FDT_LIBS) obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o @@ -317,7 +316,6 @@ obj-microblaze-y += xilinx_ethlite.o obj-microblaze-y += pflash_cfi02.o obj-microblaze-$(CONFIG_FDT) += device_tree.o -LIBS+= $(FDT_LIBS) # Boards obj-cris-y = cris_pic_cpu.o etraxfs.o axis_dev88.o diff --git a/configure b/configure index 9945bfe..4a19917 100755 --- a/configure +++ b/configure @@ -1227,6 +1227,7 @@ int main(void) { return 0; } EOF if compile_prog "" "$fdt_libs" ; then fdt=yes + libs_softmmu="$fdt_libs $libs_softmmu" fi fi @@ -1711,7 +1712,6 @@ if test "$preadv" = "yes" ; then fi if test "$fdt" = "yes" ; then echo "CONFIG_FDT=y" >> $config_host_mak - echo "FDT_LIBS=$fdt_libs" >> $config_host_mak fi # XXX: suppress that