diff options
| author | Fam Zheng <famz@redhat.com> | 2017-09-07 16:47:00 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-09-22 10:20:34 +0800 |
| commit | 8eca288989d5fa76373e1892fd08c58443742d5e (patch) | |
| tree | fdaffb0b40a0d0436066eeeec99c80cb8c33998e | |
| parent | cc7923fc0762c80f9cc140a20014b3cc8f3dd0aa (diff) | |
| download | qemu-8eca288989d5fa76373e1892fd08c58443742d5e.tar.gz | |
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>
| -rw-r--r-- | chardev/Makefile.objs | 1 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 2 insertions, 1 deletions
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 @@ -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 |