Commit f54d432e authored Aug 27, 2019 by Marc-André Lureau Committed by Peter Maydell Aug 27, 2019

build-sys: build ui-spice-app as a module



This reverts commit 45db1ac1 ("modules-test: ui-spice-app is not
built as module") and fixes commit d8aec9d9 ("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>

parent 23919ddf

tests/modules-test.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;

ui/Makefile.objs

+3 −1

Original line number	Diff line number	Diff line
		@@ -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)