gwj / at91sam9263 · Commits

Commit ef7635eccc2f1e86e81d111481ef29134f9a8c55

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 60ddf533

remove CONFIG_ from BLUEZ_{LIBS,FLAGS} 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
Makefile
  View file @ef7635e
@@ -203,7 +203,7 @@ vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h @@ -203,7 +203,7 @@ vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h
203 203
204 curses.o: curses.c keymaps.h curses_keys.h 204 curses.o: curses.c keymaps.h curses_keys.h
205 205
206 -bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) 206 +bt-host.o: CFLAGS += $(BLUEZ_CFLAGS)
207 207
208 libqemu_common.a: $(obj-y) 208 libqemu_common.a: $(obj-y)
209 209
Makefile.target
  View file @ef7635e
@@ -466,7 +466,7 @@ LIBS += $(VNC_SASL_LIBS) @@ -466,7 +466,7 @@ LIBS += $(VNC_SASL_LIBS)
466 endif 466 endif
467 467
468 ifdef CONFIG_BLUEZ 468 ifdef CONFIG_BLUEZ
469 -LIBS += $(CONFIG_BLUEZ_LIBS) 469 +LIBS += $(BLUEZ_LIBS)
470 endif 470 endif
471 471
472 # xen backend driver support 472 # xen backend driver support
configure
  View file @ef7635e
@@ -1737,8 +1737,8 @@ if test &quot;$brlapi&quot; = &quot;yes&quot; ; then @@ -1737,8 +1737,8 @@ if test &quot;$brlapi&quot; = &quot;yes&quot; ; then
1737 fi 1737 fi
1738 if test "$bluez" = "yes" ; then 1738 if test "$bluez" = "yes" ; then
1739 echo "CONFIG_BLUEZ=y" >> $config_host_mak 1739 echo "CONFIG_BLUEZ=y" >> $config_host_mak
1740 - echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak  
1741 - echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_host_mak 1740 + echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
  1741 + echo "BLUEZ_LIBS=$bluez_libs" >> $config_host_mak
1742 echo "#define CONFIG_BLUEZ 1" >> $config_host_h 1742 echo "#define CONFIG_BLUEZ 1" >> $config_host_h
1743 fi 1743 fi
1744 if test "$xen" = "yes" ; then 1744 if test "$xen" = "yes" ; then