[Qemu-devel] [PATCH 19/37] fold BRLAPI_LIBS on generic LIBS

[quintela]

From: Juan Quintela <address@hidden>


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

diff --git a/Makefile b/Makefile
index ff333a5..b62d8a0 100644
--- a/Makefile
+++ b/Makefile
@@ -96,10 +96,6 @@ obj-y += qdev.o qdev-properties.o ssi.o

 obj-$(CONFIG_BRLAPI) += baum.o

-ifdef CONFIG_BRLAPI
-LIBS+=-lbrlapi
-endif
-
 ifdef CONFIG_WIN32
 obj-y += tap-win32.o
 else
diff --git a/Makefile.target b/Makefile.target
index 420be27..9748736 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -638,7 +638,7 @@ vl.o: qemu-options.h

 monitor.o: qemu-monitor.h

-LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS)
+LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS)
 ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)

 endif # !CONFIG_USER_ONLY
diff --git a/configure b/configure
index 595eaaa..a26c5c3 100755
--- a/configure
+++ b/configure
@@ -1714,7 +1714,7 @@ fi
 if test "$brlapi" = "yes" ; then
   echo "CONFIG_BRLAPI=y" >> $config_host_mak
   echo "#define CONFIG_BRLAPI 1" >> $config_host_h
-  echo "BRLAPI_LIBS=-lbrlapi" >> $config_host_mak
+  LIBS="$LIBS -lbrlapi"
 fi
 if test "$bluez" = "yes" ; then
   echo "CONFIG_BLUEZ=y" >> $config_host_mak
-- 
1.6.2.5