diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-03 14:46:37 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-10 13:05:41 -0500 |
| commit | e482d56ad9321b7d5d57fdc7b31ae7fd7b12cf87 (patch) | |
| tree | de58a77d2be0c0b60427344df7a0fb29982d9263 | |
| parent | 3efd632b8218831999e3542c15bf9d59085a9355 (diff) | |
Fold BLUEZ_LIBS into libs_softmmu
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
| -rw-r--r-- | Makefile.target | 4 | ||||
| -rwxr-xr-x | configure | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.target b/Makefile.target index 1369d45ca7..7679e600fb 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 @@ -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 |