From f54d432e9aa2d161b08ba5a50e5f126195ef41c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 27 Aug 2019 18:02:40 +0400 Subject: build-sys: build ui-spice-app as a module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Thomas Huth Message-id: 20190827140241.20818-1-marcandre.lureau@redhat.com Signed-off-by: Peter Maydell --- tests/modules-test.c | 3 +++ ui/Makefile.objs | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/modules-test.c b/tests/modules-test.c index f9de3afdb7..a8118e9042 100644 --- a/tests/modules-test.c +++ b/tests/modules-test.c @@ -52,6 +52,9 @@ int main(int argc, char *argv[]) #endif #ifdef CONFIG_SDL "ui-", "sdl", +#endif +#if defined(CONFIG_SPICE) && defined(CONFIG_GIO) + "ui-", "spice-app", #endif }; int i; diff --git a/ui/Makefile.objs b/ui/Makefile.objs index cc2bf5b180..ba39080edb 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) -- cgit v1.2.3