aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-07-27 16:12:46 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-27 14:09:17 -0500
commitef7635eccc2f1e86e81d111481ef29134f9a8c55 (patch)
tree39460853940f690b9ec0122f6518fb6020757f5f
parent60ddf53399686061b34c11bcfe650905f6e6f192 (diff)
remove CONFIG_ from BLUEZ_{LIBS,FLAGS}
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile2
-rw-r--r--Makefile.target2
-rwxr-xr-xconfigure4
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a50e868b45..7dc83fdc48 100644
--- a/Makefile
+++ b/Makefile
@@ -203,7 +203,7 @@ vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h
curses.o: curses.c keymaps.h curses_keys.h
-bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS)
+bt-host.o: CFLAGS += $(BLUEZ_CFLAGS)
libqemu_common.a: $(obj-y)
diff --git a/Makefile.target b/Makefile.target
index 43ad50fa13..f512fd1f16 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -466,7 +466,7 @@ LIBS += $(VNC_SASL_LIBS)
endif
ifdef CONFIG_BLUEZ
-LIBS += $(CONFIG_BLUEZ_LIBS)
+LIBS += $(BLUEZ_LIBS)
endif
# xen backend driver support
diff --git a/configure b/configure
index 2528b2c446..227a8c790e 100755
--- a/configure
+++ b/configure
@@ -1737,8 +1737,8 @@ if test "$brlapi" = "yes" ; then
fi
if test "$bluez" = "yes" ; then
echo "CONFIG_BLUEZ=y" >> $config_host_mak
- echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
- echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $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
fi
if test "$xen" = "yes" ; then