From mboxrd@z Thu Jan  1 00:00:00 1970
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 <quintela@redhat.com>) id 1MXwzU-00076e-La
	for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:12 -0400
From: Juan Quintela <quintela@redhat.com>
Date: Mon,  3 Aug 2009 14:46:38 +0200
Message-Id: <c93a8d5877c18b7c146a19e2d6f62fdc715eb05d.1249301360.git.quintela@redhat.com>
In-Reply-To: <cover.1249301360.git.quintela@redhat.com>
References: <cover.1249301360.git.quintela@redhat.com>
In-Reply-To: <cover.1249301360.git.quintela@redhat.com>
References: <cover.1249301360.git.quintela@redhat.com>
Subject: [Qemu-devel] [PATCH 47/81] Fold FDT_LIBS into libs_softmmu
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 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
-- 
1.6.2.5