Fold BRLAPI_LIBS into libs_softmmu

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:

diff --git a/Makefile b/Makefile
index 82ef20333824dee177ff2a8935ed2c0127159971..de7770f37046479bf9ade8944fd4391ddddff7ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -92,9 +92,6 @@ obj-y += msmouse.o ps2.o
 obj-y += qdev.o qdev-properties.o ssi.o
 
 obj-$(CONFIG_BRLAPI) += baum.o
-
-LIBS+=$(BRLAPI_LIBS)
-
 obj-$(CONFIG_WIN32) += tap-win32.o
 obj-$(CONFIG_POSIX) += migration-exec.o
 

diff --git a/Makefile.target b/Makefile.target
index e8a944aa2caf2f02d489bd467d2bf8f5cd60a0e9..bf08b098cd795505fdfca33c181d5f33660dd050 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -400,7 +400,7 @@ vl.o: qemu-options.h
 
 monitor.o: qemu-monitor.h
 
-LIBS += $(COCOA_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS)
+LIBS += $(COCOA_LIBS) $(VDE_LIBS) $(CURL_LIBS)
 ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
 
 endif # !CONFIG_USER_ONLY

diff --git a/configure b/configure
index 3aa322eea74072ec944c419af06854f604cffb91..0425b3d39e8a6372401cf62279da75ad4718d42c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1059,6 +1059,7 @@ int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
 EOF
   if compile_prog "" "$brlapi_libs" ; then
     brlapi=yes
+    libs_softmmu="$brlapi_libs $libs_softmmu"
   fi
 fi
 
@@ -1686,7 +1687,6 @@ if test "$curl" = "yes" ; then
 fi
 if test "$brlapi" = "yes" ; then
   echo "CONFIG_BRLAPI=y" >> $config_host_mak
-  echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
 fi
 if test "$bluez" = "yes" ; then
   echo "CONFIG_BLUEZ=y" >> $config_host_mak