[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 036/142] meson: configure 50-qemu-gpu.json
From: |
Paolo Bonzini |
Subject: |
[PATCH 036/142] meson: configure 50-qemu-gpu.json |
Date: |
Tue, 28 Jan 2020 18:51:56 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 13 +------------
contrib/vhost-user-gpu/meson.build | 5 +++++
rules.mak | 7 -------
3 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
index 040bcad43a..3629563bc6 100644
--- a/Makefile
+++ b/Makefile
@@ -128,13 +128,8 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-vhost-user-json-y =
HELPERS-y =
-ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
-vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
-endif
-
# Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from
@@ -240,7 +235,7 @@ dummy := $(call unnest-vars,, \
include $(SRC_PATH)/tests/Makefile.include
-all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all
modules $(vhost-user-json-y)
+all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all
modules
config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak
@@ -522,12 +517,6 @@ endif
ifneq ($(HELPERS-y),)
$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
endif
-ifneq ($(vhost-user-json-y),)
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/vhost-user/"
- for x in $(vhost-user-json-y); do \
- $(INSTALL_DATA) $$x "$(DESTDIR)$(qemu_datadir)/vhost-user/"; \
- done
-endif
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
endif
diff --git a/contrib/vhost-user-gpu/meson.build
b/contrib/vhost-user-gpu/meson.build
index 8778aa79de..7303b6dbaf 100644
--- a/contrib/vhost-user-gpu/meson.build
+++ b/contrib/vhost-user-gpu/meson.build
@@ -2,4 +2,9 @@ if 'CONFIG_VIRGL' in config_host and 'CONFIG_GBM' in config_host
executable('vhost-user-gpu', files('main.c', 'virgl.c', 'vugbm.c'),
link_with: libvhost_user,
dependencies: [qemuutil, pixman, gbm, virgl])
+
+ configure_file(input: '50-qemu-gpu.json.in',
+ output: '50-qemu-gpu.json',
+ configuration: config_host,
+ install_dir: config_host['qemu_datadir'] / 'vhost-user')
endif
diff --git a/rules.mak b/rules.mak
index fa9960cdbd..52891849c8 100644
--- a/rules.mak
+++ b/rules.mak
@@ -393,10 +393,3 @@ TEXI2MAN = $(call quiet-command, \
$(call TEXI2MAN)
%.8:
$(call TEXI2MAN)
-
-GEN_SUBST = $(call quiet-command, \
- sed -e "s!@libexecdir@!$(libexecdir)!g" < $< > $@, \
- "GEN","$@")
-
-%.json: %.json.in
- $(call GEN_SUBST)
--
2.21.0
- [PATCH 026/142] meson: add msi generation, (continued)
- [PATCH 026/142] meson: add msi generation, Paolo Bonzini, 2020/01/28
- [PATCH 027/142] meson: convert dummy Windows qga/qemu-ga target, Paolo Bonzini, 2020/01/28
- [PATCH 028/142] meson: add qemu-bridge-helper, Paolo Bonzini, 2020/01/28
- [PATCH 029/142] meson: add qemu-keymap, Paolo Bonzini, 2020/01/28
- [PATCH 030/142] meson: add qemu-edid, Paolo Bonzini, 2020/01/28
- [PATCH 031/142] meson: add virtfs-proxy-helper, Paolo Bonzini, 2020/01/28
- [PATCH 032/142] meson: keymap-gen, Paolo Bonzini, 2020/01/28
- [PATCH 033/142] meson: generate qemu-version.h, Paolo Bonzini, 2020/01/28
- [PATCH 034/142] meson: generate shader headers, Paolo Bonzini, 2020/01/28
- [PATCH 035/142] meson: generate hxtool files, Paolo Bonzini, 2020/01/28
- [PATCH 036/142] meson: configure 50-qemu-gpu.json,
Paolo Bonzini <=
- [PATCH 038/142] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2020/01/28
- [PATCH 040/142] meson: convert authz directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 039/142] meson: convert qom directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 041/142] meson: convert crypto directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 037/142] meson: uncompress edk2 bios, Paolo Bonzini, 2020/01/28
- [PATCH 042/142] meson: convert io directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 043/142] meson: convert target/s390x/gen-features.h, Paolo Bonzini, 2020/01/28
- [PATCH 045/142] meson: add macos dependencies, Paolo Bonzini, 2020/01/28
- [PATCH 044/142] meson: infrastructure for building emulators, Paolo Bonzini, 2020/01/28
- [PATCH 046/142] meson: add modules infrastructure, Paolo Bonzini, 2020/01/28