mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildsys: Move brlapi libs to per object

Browse Source 
baum.o already receives the sdl cflags in its per object variable, do
the same for brlapi libs to avoid cluttering libs_softmmu.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170907084700.952-1-famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Fam Zheng 2017-09-07 16:47:00 +08:00
parent cc7923fc07
commit 8eca288989
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chardev/Makefile.objs
View File

@ -20,5 +20,6 @@ chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o
common-obj-y += msmouse.o wctablet.o testdev.o common-obj-y += msmouse.o wctablet.o testdev.o
common-obj-$(CONFIG_BRLAPI) += baum.o common-obj-$(CONFIG_BRLAPI) += baum.o
baum.o-cflags := $(SDL_CFLAGS) baum.o-cflags := $(SDL_CFLAGS)
baum.o-libs := $(BRLAPI_LIBS)
common-obj-$(CONFIG_SPICE) += spice.o common-obj-$(CONFIG_SPICE) += spice.o

2
configure vendored
View File

@ -3086,7 +3086,6 @@ int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
EOF EOF
if compile_prog "" "$brlapi_libs" ; then if compile_prog "" "$brlapi_libs" ; then
brlapi=yes brlapi=yes
libs_softmmu="$brlapi_libs $libs_softmmu"
else else
if test "$brlapi" = "yes" ; then if test "$brlapi" = "yes" ; then
feature_not_found "brlapi" "Install brlapi devel" feature_not_found "brlapi" "Install brlapi devel"
@ -5645,6 +5644,7 @@ if test "$curl" = "yes" ; then
fi fi
if test "$brlapi" = "yes" ; then if test "$brlapi" = "yes" ; then
echo "CONFIG_BRLAPI=y" >> $config_host_mak echo "CONFIG_BRLAPI=y" >> $config_host_mak
echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
fi fi
if test "$bluez" = "yes" ; then if test "$bluez" = "yes" ; then
echo "CONFIG_BLUEZ=y" >> $config_host_mak echo "CONFIG_BLUEZ=y" >> $config_host_mak