[Qemu-devel] [PATCH 46/81] Fold BLUEZ_LIBS into libs_softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 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
-- 
1.6.2.5