mirror of https://gitee.com/openkylin/qemu.git
contrib/vhost-user-input: convert to meson
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
a9c9727c02
commit
32fcc6244c
11
Makefile
11
Makefile
|
@ -311,7 +311,6 @@ dummy := $(call unnest-vars,, \
|
|||
elf2dmp-obj-y \
|
||||
ivshmem-client-obj-y \
|
||||
ivshmem-server-obj-y \
|
||||
vhost-user-input-obj-y \
|
||||
vhost-user-gpu-obj-y \
|
||||
qga-vss-dll-obj-y \
|
||||
block-obj-y \
|
||||
|
@ -535,16 +534,6 @@ endif
|
|||
vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
|
||||
$(call LINK, $^)
|
||||
|
||||
ifdef CONFIG_VHOST_USER_INPUT
|
||||
ifdef CONFIG_LINUX
|
||||
vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
|
||||
$(call LINK, $^)
|
||||
|
||||
# build by default, do not install
|
||||
all: vhost-user-input$(EXESUF)
|
||||
endif
|
||||
endif
|
||||
|
||||
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))), \
|
||||
|
|
|
@ -106,7 +106,6 @@ qga-vss-dll-obj-y = qga/
|
|||
elf2dmp-obj-y = contrib/elf2dmp/
|
||||
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
|
||||
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
|
||||
vhost-user-input-obj-y = contrib/vhost-user-input/
|
||||
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
|
||||
|
||||
######################################################################
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
vhost-user-input-obj-y = main.o
|
|
@ -0,0 +1,5 @@
|
|||
executable('vhost-user-input', files('main.c'),
|
||||
link_with: libvhost_user,
|
||||
dependencies: qemuutil,
|
||||
build_by_default: targetos == 'linux',
|
||||
install: false)
|
|
@ -265,6 +265,7 @@ if have_tools
|
|||
if 'CONFIG_VHOST_USER' in config_host
|
||||
subdir('contrib/libvhost-user')
|
||||
subdir('contrib/vhost-user-blk')
|
||||
subdir('contrib/vhost-user-input')
|
||||
subdir('contrib/vhost-user-scsi')
|
||||
endif
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue