diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-08-27 18:02:40 +0400 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-27 17:15:04 +0100 |
| commit | f54d432e9aa2d161b08ba5a50e5f126195ef41c1 (patch) | |
| tree | e20ea95d62fe223b05a7b51caead738390b312d5 | |
| parent | 23919ddfd56135cad3cb468a8f54d5a595f024f4 (diff) | |
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>
| -rw-r--r-- | tests/modules-test.c | 3 | ||||
| -rw-r--r-- | ui/Makefile.objs | 4 |
2 files changed, 6 insertions, 1 deletions
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 @@ -53,6 +53,9 @@ int main(int argc, char *argv[]) #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) |