[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/8] meson: add spice_headers dependency.
From: |
Gerd Hoffmann |
Subject: |
[PULL 6/8] meson: add spice_headers dependency. |
Date: |
Thu, 15 Oct 2020 14:53:20 +0200 |
Used for files which (with CONFIG_SPICE=y) depend on spice header files
to pick up some enum, but which do not depend on on the actual spice
shared library.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20201014121120.13482-6-kraxel@redhat.com
---
audio/meson.build | 2 +-
meson.build | 2 ++
monitor/meson.build | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/audio/meson.build b/audio/meson.build
index 18a831129ed0..7d53b0f920ff 100644
--- a/audio/meson.build
+++ b/audio/meson.build
@@ -1,5 +1,5 @@
+softmmu_ss.add([spice_headers, files('audio.c')])
softmmu_ss.add(files(
- 'audio.c',
'audio_legacy.c',
'mixeng.c',
'noaudio.c',
diff --git a/meson.build b/meson.build
index 1a4a48249243..2c6169fab072 100644
--- a/meson.build
+++ b/meson.build
@@ -321,9 +321,11 @@ if 'CONFIG_LIBJACK' in config_host
jack = declare_dependency(link_args: config_host['JACK_LIBS'].split())
endif
spice = not_found
+spice_headers = not_found
if 'CONFIG_SPICE' in config_host
spice = declare_dependency(compile_args: config_host['SPICE_CFLAGS'].split(),
link_args: config_host['SPICE_LIBS'].split())
+ spice_headers = declare_dependency(compile_args:
config_host['SPICE_CFLAGS'].split())
endif
rt = cc.find_library('rt', required: false)
libdl = not_found
diff --git a/monitor/meson.build b/monitor/meson.build
index eb2a534fdc88..6d00985ace7a 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -3,7 +3,7 @@ qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c'))
softmmu_ss.add(files(
'hmp-cmds.c',
'hmp.c',
- 'qmp-cmds.c',
))
+softmmu_ss.add([spice_headers, files('qmp-cmds.c')])
specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('misc.c'), spice])
--
2.27.0
- [PULL 0/8] Modules 20201015 patches, Gerd Hoffmann, 2020/10/15
- [PULL 2/8] modules: update qom object module comment, Gerd Hoffmann, 2020/10/15
- [PULL 8/8] chardev/spice: build spice chardevs as module, Gerd Hoffmann, 2020/10/15
- [PULL 3/8] ui/spice-app: don't use qemu_chr_open_spice_port directly, Gerd Hoffmann, 2020/10/15
- [PULL 1/8] module: silence errors for module_load_qom_all()., Gerd Hoffmann, 2020/10/15
- [PULL 5/8] chardev/spice: simplify chardev setup, Gerd Hoffmann, 2020/10/15
- [PULL 6/8] meson: add spice_headers dependency.,
Gerd Hoffmann <=
- [PULL 4/8] chardev/spice: make qemu_chr_open_spice_port static, Gerd Hoffmann, 2020/10/15
- [PULL 7/8] meson: add spice dependency to core spice source files., Gerd Hoffmann, 2020/10/15
- Re: [PULL 0/8] Modules 20201015 patches, Peter Maydell, 2020/10/16