From e482d56ad9321b7d5d57fdc7b31ae7fd7b12cf87 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 3 Aug 2009 14:46:37 +0200 Subject: [PATCH] Fold BLUEZ_LIBS into libs_softmmu Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori Message-Id: --- Makefile.target | 4 ---- configure | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index 1369d45..7679e60 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 bdab583..339894e 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 -- 2.7.4