[Qemu-devel] [PATCH 22/37] fold BLUEZ_LIBS on generic LIBS

[quintela]

From: Juan Quintela <address@hidden>


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

diff --git a/Makefile.target b/Makefile.target
index 7163d24..86afea3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -449,10 +449,6 @@ CPPFLAGS += $(VNC_SASL_CFLAGS)
 LIBS += $(VNC_SASL_LIBS)
 endif

-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 c3e8a3b..344ebb1 100755
--- a/configure
+++ b/configure
@@ -1718,9 +1718,9 @@ if test "$brlapi" = "yes" ; then
 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
   echo "#define CONFIG_BLUEZ 1" >> $config_host_h
+  echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
+  LIBS="$LIBS $bluez_libs"
 fi
 if test "$xen" = "yes" ; then
   LIBS="$LIBS -lxenstore -lxenctrl -lxenguest"
-- 
1.6.2.5