From 8eca288989d5fa76373e1892fd08c58443742d5e Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Thu, 7 Sep 2017 16:47:00 +0800 Subject: [PATCH] buildsys: Move brlapi libs to per object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Message-Id: <20170907084700.952-1-famz@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau Signed-off-by: Fam Zheng --- chardev/Makefile.objs | 1 + configure | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index 52a8127606..d68e1347f9 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -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 diff --git a/configure b/configure index d8455d42e1..9ffebeef2b 100755 --- a/configure +++ b/configure @@ -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