diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-08-27 18:02:40 +0400 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2019-09-02 10:52:22 +0100 |
| commit | 5d3cbddb58823ba0a44fc2b5a90abfec6b56abff (patch) | |
| tree | adb2ae2e037f7c2ac8e7d67f17d04727e40d8c5e | |
| parent | 0b8b65ed70e2ed711945d523a557cf999eb18f74 (diff) | |
| download | qemu-5d3cbddb58823ba0a44fc2b5a90abfec6b56abff.zip qemu-5d3cbddb58823ba0a44fc2b5a90abfec6b56abff.tar.gz qemu-5d3cbddb58823ba0a44fc2b5a90abfec6b56abff.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: Alex Bennée <alex.bennee@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 f9de3af..a8118e9 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 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) |