[Qemu-devel] [PATCH 27/37] fold FDT_LIBS on generic LIBS

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.target |    6 ------
 configure       |    2 +-
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 36222f2..c80abf3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -497,9 +497,6 @@ CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif

 obj-ppc-$(CONFIG_FDT) += device_tree.o
-ifdef FDT_LIBS
-LIBS+= $(FDT_LIBS)
-endif

 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
@@ -525,9 +522,6 @@ obj-microblaze-y += xilinx_ethlite.o
 obj-microblaze-y += pflash_cfi02.o

 obj-microblaze-$(CONFIG_FDT) += device_tree.o
-ifdef FDT_LIBS
-LIBS+= $(FDT_LIBS)
-endif

 # Boards
 obj-cris-y = cris_pic_cpu.o etraxfs.o axis_dev88.o
diff --git a/configure b/configure
index 7e2cca1..bc208b2 100755
--- a/configure
+++ b/configure
@@ -1745,7 +1745,7 @@ fi
 if test "$fdt" = "yes" ; then
   echo "CONFIG_FDT=y" >> $config_host_mak
   echo "#define CONFIG_FDT 1" >> $config_host_h
-  echo "FDT_LIBS=-lfdt" >> $config_host_mak
+  LIBS="$LIBS -lfdt"
 fi

 # XXX: suppress that
-- 
1.6.2.5