[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/12] build-sys: build ui-spice-app as a module
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 10/12] build-sys: build ui-spice-app as a module |
Date: |
Mon, 2 Sep 2019 11:21:20 +0100 |
From: Marc-André Lureau <address@hidden>
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>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/modules-test.c b/tests/modules-test.c
index f9de3afdb77..a8118e90427 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 cc2bf5b180f..ba39080edb2 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.20.1
- [Qemu-devel] [PULL 00/12] fixes for gdbstub, gitdm and testing, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 01/12] gdbstub: Fix handling of '!' packet with new infra, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 03/12] contrib/gitdm: filetype interface is not in order, fix, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 02/12] gdbstub: Fix handler for 'F' packet, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 06/12] mailmap: Update philmd email address, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 04/12] contrib/gitdm: Add address@hidden to group-map-redhat, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 05/12] mailmap: Reorder by sections, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 09/12] contrib/gitdm: Add RT-RK to the domain-map, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 07/12] mailmap: Add many entries to improve 'git shortlog' statistics, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 10/12] build-sys: build ui-spice-app as a module,
Alex Bennée <=
- [Qemu-devel] [PULL 11/12] tests: fix modules-test with no default machine, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 08/12] .mailmap/aliases: add some further commentary, Alex Bennée, 2019/09/02
- [Qemu-devel] [PULL 12/12] tests/docker: upgrade docker.py to python3, Alex Bennée, 2019/09/02
- Re: [Qemu-devel] [PULL 00/12] fixes for gdbstub, gitdm and testing, Peter Maydell, 2019/09/04