From e4782985f9ef9e9cf05dfc4a2f031a8a43507cae Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Mon, 3 Aug 2009 14:46:38 +0200
Subject: [PATCH] Fold FDT_LIBS into libs_softmmu
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
---
Makefile.target | 2 --
configure | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 7679e600fb..e8a944aa2c 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 339894e9be..3aa322eea7 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
--
2.30.2