diff options
| author | Marc-André Lureau | 2019-09-19 18:24:43 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-08-21 23:06:17 +0200 |
| commit | 28742467c9c0bd49f594bfd46ecca5e6398ddb12 (patch) | |
| tree | 3262e9adc3195d9c37944edb51c097528555ff77 /meson.build | |
| parent | configure: silence 'shift' error message in version_ge() (diff) | |
| download | qemu-28742467c9c0bd49f594bfd46ecca5e6398ddb12.tar.gz qemu-28742467c9c0bd49f594bfd46ecca5e6398ddb12.tar.xz qemu-28742467c9c0bd49f594bfd46ecca5e6398ddb12.zip | |
meson: convert pc-bios/keymaps/Makefile
Note that sl and sv keymaps were not created by qemu-keymap.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 808f50b07e..dd8016c9da 100644 --- a/meson.build +++ b/meson.build @@ -1062,6 +1062,12 @@ if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif +if 'CONFIG_XKBCOMMON' in config_host + # used for the update-keymaps target, so include rules even if !have_tools + qemu_keymap = executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c') + genh, + dependencies: [qemuutil, xkbcommon], install: have_tools) +endif + if have_tools qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep], dependencies: [authz, block, crypto, io, qom, qemuutil], install: true) @@ -1078,11 +1084,6 @@ if have_tools subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') - if 'CONFIG_XKBCOMMON' in config_host - executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c'), - dependencies: [qemuutil, xkbcommon], install: true) - endif - executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c'), dependencies: qemuutil, install: true) |