aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2019-08-27 18:02:40 +0400
committerPeter Maydell <peter.maydell@linaro.org>2019-08-27 17:15:04 +0100
commitf54d432e9aa2d161b08ba5a50e5f126195ef41c1 (patch)
treee20ea95d62fe223b05a7b51caead738390b312d5 /ui
parent23919ddfd56135cad3cb468a8f54d5a595f024f4 (diff)
downloadqemu-f54d432e9aa2d161b08ba5a50e5f126195ef41c1.zip
qemu-f54d432e9aa2d161b08ba5a50e5f126195ef41c1.tar.gz
qemu-f54d432e9aa2d161b08ba5a50e5f126195ef41c1.tar.bz2
build-sys: build ui-spice-app as a module
This reverts commit 45db1ac157 ("modules-test: ui-spice-app is not built as module") and fixes commit d8aec9d9f1 ("display: add -display spice-app launching a Spice client"). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-id: 20190827140241.20818-1-marcandre.lureau@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
-rw-r--r--ui/Makefile.objs4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index cc2bf5b..ba39080 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -49,7 +49,9 @@ curses.mo-objs := curses.o
curses.mo-cflags := $(CURSES_CFLAGS) $(ICONV_CFLAGS)
curses.mo-libs := $(CURSES_LIBS) $(ICONV_LIBS)
-common-obj-$(call land,$(CONFIG_SPICE),$(CONFIG_GIO)) += spice-app.mo
+ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy)
+common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo
+endif
spice-app.mo-objs := spice-app.o
spice-app.mo-cflags := $(GIO_CFLAGS)
spice-app.mo-libs := $(GIO_LIBS)