From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue, 27 Aug 2019 08:08:24 +0000 (+0400)
Subject: build-sys: build vhost-user-gpu only if CONFIG_TOOLS
X-Git-Tag: v5.0.0-rc0~175^2~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57589bc497d518fc509cd8adb9407ea7984ec540;p=thirdparty%2Fqemu.git

build-sys: build vhost-user-gpu only if CONFIG_TOOLS

vhost-user-gpu is always built and installed, but it is not part of the emulator
proper.  Cut it if --disable-tools is specified.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/Makefile b/Makefile
index a2acef3c112..bfd8ba3a968 100644
--- a/Makefile
+++ b/Makefile
@@ -321,14 +321,10 @@ HELPERS-y =
 
 HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
 
-ifdef CONFIG_LINUX
-ifdef CONFIG_VIRGL
-ifdef CONFIG_GBM
+ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
 HELPERS-y += vhost-user-gpu$(EXESUF)
 vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
 endif
-endif
-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