Commit 8eca2889 authored Sep 07, 2017 by Fam Zheng

buildsys: Move brlapi libs to per object



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>

parent cc7923fc

chardev/Makefile.objs

+1 −0

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

		common-obj-$(CONFIG_SPICE) += spice.o

configure

+1 −1

Original line number	Diff line number	Diff line
		@@ -3086,7 +3086,6 @@ int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
		EOF
		if compile_prog "" "$brlapi_libs" ; then
		brlapi=yes
		libs_softmmu="$brlapi_libs $libs_softmmu"
		else
		if test "$brlapi" = "yes" ; then
		feature_not_found "brlapi" "Install brlapi devel"
		@@ -5645,6 +5644,7 @@ 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