From: Juan Quintela <quintela@redhat.com>
Date: Mon, 3 Aug 2009 12:46:39 +0000 (+0200)
Subject: Fold BRLAPI_LIBS into libs_softmmu
X-Git-Tag: v0.12.0-rc0~1643
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=264606b3a98fdb7f30d1fbb49db2e5397a9c2011;p=thirdparty%2Fqemu.git

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 82ef2033382..de7770f3704 100644
--- 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 e8a944aa2ca..bf08b098cd7 100644
--- 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 3aa322eea74..0425b3d39e8 100755
--- 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