[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 016/132] contrib/vhost-user-input: convert to meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 016/132] contrib/vhost-user-input: convert to meson |
Date: |
Thu, 12 Dec 2019 13:51:00 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 11 -----------
Makefile.objs | 1 -
contrib/vhost-user-input/Makefile.objs | 1 -
contrib/vhost-user-input/meson.build | 3 +++
meson.build | 1 +
5 files changed, 4 insertions(+), 13 deletions(-)
delete mode 100644 contrib/vhost-user-input/Makefile.objs
create mode 100644 contrib/vhost-user-input/meson.build
diff --git a/Makefile b/Makefile
index 5845a50..9528391 100644
--- a/Makefile
+++ b/Makefile
@@ -266,7 +266,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 \
@@ -466,16 +465,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))), \
diff --git a/Makefile.objs b/Makefile.objs
index f2e8864..c7f7637 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -109,7 +109,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/
######################################################################
diff --git a/contrib/vhost-user-input/Makefile.objs
b/contrib/vhost-user-input/Makefile.objs
deleted file mode 100644
index b1fad90..0000000
--- a/contrib/vhost-user-input/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-vhost-user-input-obj-y = main.o
diff --git a/contrib/vhost-user-input/meson.build
b/contrib/vhost-user-input/meson.build
new file mode 100644
index 0000000..6f79679
--- /dev/null
+++ b/contrib/vhost-user-input/meson.build
@@ -0,0 +1,3 @@
+executable('vhost-user-input', files('main.c'),
+ link_with: libvhost_user,
+ dependencies: qemuutil)
diff --git a/meson.build b/meson.build
index 119fcd4..e38c8a9 100644
--- a/meson.build
+++ b/meson.build
@@ -199,6 +199,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
--
1.8.3.1
- [PATCH 006/132] build-sys: add meson submodule, (continued)
- [PATCH 006/132] build-sys: add meson submodule, Paolo Bonzini, 2019/12/12
- [PATCH 007/132] meson: enable pie, Paolo Bonzini, 2019/12/12
- [PATCH 008/132] meson: use coverage option, Paolo Bonzini, 2019/12/12
- [PATCH 010/132] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2019/12/12
- [PATCH 004/132] configure: integrate Meson in the build system, Paolo Bonzini, 2019/12/12
- [PATCH 011/132] meson: add version.o, Paolo Bonzini, 2019/12/12
- [PATCH 013/132] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 012/132] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 014/132] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 015/132] contrib/rdmacm-mux: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 016/132] contrib/vhost-user-input: convert to meson,
Paolo Bonzini <=
- [PATCH 017/132] contrib/vhost-user-gpu: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 018/132] contrib/ivshmem: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 019/132] contrib/elf2dmp: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 021/132] meson: convert vss-win32, Paolo Bonzini, 2019/12/12
- [PATCH 020/132] meson: convert qemu-ga, Paolo Bonzini, 2019/12/12
- [PATCH 022/132] meson: add msi generation, Paolo Bonzini, 2019/12/12
- [PATCH 023/132] meson: add qemu-bridge-helper, Paolo Bonzini, 2019/12/12
- [PATCH 024/132] meson: add qemu-keymap, Paolo Bonzini, 2019/12/12
- [PATCH 025/132] meson: add qemu-edid, Paolo Bonzini, 2019/12/12
- [PATCH 009/132] libqemuutil: convert to meson, Paolo Bonzini, 2019/12/12