[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] build-sys: build ui-spice-app as a module
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 1/2] build-sys: build ui-spice-app as a module |
Date: |
Tue, 27 Aug 2019 18:02:40 +0400 |
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 <address@hidden>
---
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)
--
2.23.0
- [Qemu-devel] [PATCH 1/2] build-sys: build ui-spice-app as a module,
Marc-André Lureau <=