diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-10-14 14:11:18 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-10-15 11:14:40 +0200 |
| commit | d72c34cccc5955eeeb393b174fd6a0794b6d823f (patch) | |
| tree | 79de530d7ea841c435cf518b257f55c15d09986c | |
| parent | 93ab5844b2cd5367966d7b5bae154e0d3303b504 (diff) | |
meson: add spice_headers dependency.
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
| -rw-r--r-- | audio/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | monitor/meson.build | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/audio/meson.build b/audio/meson.build index 18a831129e..7d53b0f920 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 1a4a482492..2c6169fab0 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 eb2a534fdc..6d00985ace 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]) |