From: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
Makefile | 5 -----
configure | 4 +---
meson.build | 10 ++++++++++
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 3addf50636..b0a261bdc7 100644
--- a/Makefile
+++ b/Makefile
@@ -429,8 +429,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y)
$(crypto-obj-y) $(io
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y)
$(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y)
$(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y)
$(storage-daemon-obj-y) $(COMMON_LDADDS)
-qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS)
-
qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS)
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o
fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS)
@@ -443,9 +441,6 @@ endif
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< >
$@,"GEN","$@")
-qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS)
-qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS)
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/configure b/configure
index 86a30d0e6d..62f1bcf9ba 100755
--- a/configure
+++ b/configure
@@ -6748,9 +6748,6 @@ if test "$softmmu" = yes ; then
fi
mpath=no
fi
- if test "$xkbcommon" = "yes"; then
- tools="qemu-keymap\$(EXESUF) $tools"
- fi
fi
# Probe for guest agent support/options
@@ -7067,6 +7064,7 @@ if test "$vnc_png" = "yes" ; then
echo "CONFIG_VNC_PNG=y" >> $config_host_mak
fi
if test "$xkbcommon" = "yes" ; then
+ echo "CONFIG_XKBCOMMON=y" >> $config_host_mak
echo "XKBCOMMON_CFLAGS=$xkbcommon_cflags" >> $config_host_mak
echo "XKBCOMMON_LIBS=$xkbcommon_libs" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 3568b4816e..9ec7dd9ddc 100644
--- a/meson.build
+++ b/meson.build
@@ -111,6 +111,11 @@ libcap_ng = not_found
if 'CONFIG_LIBCAP_NG' in config_host
libcap_ng = declare_dependency(link_args:
config_host['LIBCAP_NG_LIBS'].split())
endif
+xkbcommon = not_found
+if 'CONFIG_XKBCOMMON' in config_host
+ xkbcommon = declare_dependency(compile_args:
config_host['XKBCOMMON_CFLAGS'].split(),
+ link_args:
config_host['XKBCOMMON_LIBS'].split())
+endif
rt = cc.find_library('rt', required: false)
libiscsi = not_found
if 'CONFIG_LIBISCSI' in config_host
@@ -305,6 +310,11 @@ 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
+
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
--
2.26.2
