From 264606b3a98fdb7f30d1fbb49db2e5397a9c2011 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 3 Aug 2009 14:46:39 +0200 Subject: [PATCH] Fold BRLAPI_LIBS into libs_softmmu Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori Message-Id: --- Makefile | 3 --- Makefile.target | 2 +- configure | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 82ef203338..de7770f370 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 e8a944aa2c..bf08b098cd 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 3aa322eea7..0425b3d39e 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 -- 2.39.2