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:
This commit is contained in:
Juan Quintela 2009-08-03 14:46:39 +02:00 committed by Anthony Liguori
parent e4782985f9
commit 264606b3a9
3 changed files with 2 additions and 5 deletions

View File

@ -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

View File

@ -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

2
configure vendored
View File

@ -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