From nobody Mon Feb 9 19:07:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576157309; cv=none; d=zohomail.com; s=zohoarc; b=cuAP67ZcAdLip7sLf9E8CuxPUUqUtzIBuIBubMmQV8kwvfm0623Zvrk0b2KoCIbuxGGGTMiyWZHgNxtjXkzV+MIPiuyu3SB1mpJs2yWwNFC105W32g4PTz0MhSj2RN8PENfgbJBC+PK03NIGcUu0k9xC23LqMirUpXBT1QhATHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576157309; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ei8jF5qbLXtxjPutgGE6w3tCMlOPMMGLFJnXJVitOgM=; b=NB6uCWfy10ccnIJSGK3BE2xY3tMFzn7I+eXUCV060MkcPBgsoULtkVksNjkAKkQMphKUpTRuVd40ImAU9qx9TrBhsU5j18uuDAsA0SpmljQ2NqNNS8udtDyJxk+K3cWbTbkZV0B+HUnPEni5HqJk1uNNlIJVwwnXf0TpuuP+8iI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576157309918154.53592659785534; Thu, 12 Dec 2019 05:28:29 -0800 (PST) Received: from localhost ([::1]:59298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOW4-0005N7-C4 for importer@patchew.org; Thu, 12 Dec 2019 08:28:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35125) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyT-0003hR-Tk for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyS-0006xk-Hp for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:45 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38416) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyS-0006wK-Aj for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:44 -0500 Received: by mail-wr1-x434.google.com with SMTP id y17so2620744wrh.5 for ; Thu, 12 Dec 2019 04:53:44 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=ei8jF5qbLXtxjPutgGE6w3tCMlOPMMGLFJnXJVitOgM=; b=Q3J/P87RQrRQT0gwuP73e3d6gPpUVFWFPTVD7xYBqKslxJdKtovNRu/jMBDfG5WSF7 dlC+97cGJ3LiKpp41/XYqAXTpVLtOLpx3TcWEalezy5escQKBqTwzNfAYvez3QZmdA15 ut7LYqjX+ZCRMOIC1DUOcD7Drd4uWT4chqg7gaP/Bs1vKFqUV77emvZ7MMJzsl+uKpnt 7qt8UfFfx9KpEUFlPeWRL/Ok/kNhP/jQjZFZEFqPYsgk6D2IYnRG0sse8psi1CzFFCxe /qmeY+v/WRzb6oBxBzo4sXna3vQjKQcqVkJS9zUFYop2WLP3kWz1HD+rpp8TeH4HzRVN zHOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=ei8jF5qbLXtxjPutgGE6w3tCMlOPMMGLFJnXJVitOgM=; b=IfRPZYGI99ZgB3kNy1d+iuLOqdfy45C0iflTB7IHSRS92COWYwNjmoPY66N3rKZxbG lHoWEMvEgB/burqzl8kzq/Ya3d+QH2HoLeDA1zk9e6zHaQzIXMs/XUpH0wj1avddLE9C nFe4AvZuciK5TuoFjnVdeyi0dhQX/xMkPC0Na4mFIokekRRaeFjKCQzJAWrl8DVOexsq inQvNY1CoGnGMQSmW/+bDocZniw81rfi7Pcs+3uBMuLOvEJ/WCu40pwVAYHefLdy99bl BIvNXz3sqwVX6IaQKm00xMHMpiX9EZLgbEJt1Jm9UNvyAVQeYuEunVifYjDQZQU4eW78 DYVQ== X-Gm-Message-State: APjAAAXkXBdVfGxElAcEzS9xOiy27mFo8R1ulrvJGXyr92Fb2iAdy9mX JFSuzFj7Jesz3VNNuQbTuYESjVcN X-Google-Smtp-Source: APXvYqwFvqYOVlix7yxNuYba5MNm/+VTeLW1tOPDbJgqJl0JlkZ4VDBYgddM+cE2JSTv3PPeyoMXUw== X-Received: by 2002:a5d:6211:: with SMTP id y17mr6156062wru.344.1576155223173; Thu, 12 Dec 2019 04:53:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 045/132] configure, Makefile; remove TOOLS and HELPERS-y variable Date: Thu, 12 Dec 2019 13:51:29 +0100 Message-Id: <1576155176-2464-46-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Everything involving tools is now done by meson. Signed-off-by: Paolo Bonzini --- Makefile | 12 ++---------- configure | 2 -- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 0cbdc34..c4cfca9 100644 --- a/Makefile +++ b/Makefile @@ -113,8 +113,6 @@ $(call set-vpath, $(SRC_PATH)) =20 LIBS+=3D-lz $(LIBS_TOOLS) =20 -HELPERS-y =3D - ifdef BUILD_DOCS DOCS=3Dqemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 DOCS+=3Ddocs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/= interop/qemu-qmp-ref.7 @@ -143,7 +141,7 @@ dummy :=3D $(call unnest-vars,, \ =20 include $(SRC_PATH)/tests/Makefile.include =20 -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-= all modules +all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules =20 TARGET_DIRS_RULES :=3D $(foreach t, all clean install, $(addsuffix /$(t), = $(TARGET_DIRS))) SUBDIR_RULES=3D$(patsubst %,subdir-%, $(TARGET_DIRS)) @@ -246,7 +244,7 @@ clean: recurse-clean ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ -exec rm {} + rm -f $(edk2-decompressed) - rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */= *~ + rm -f TAGS cscope.* *.pod *~ */*~ rm -f fsdev/*.pod scsi/*.pod rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h @@ -407,12 +405,6 @@ ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256= x256 512x512 install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-local= statedir \ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install -ifneq ($(TOOLS),) - $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) -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 \ diff --git a/configure b/configure index 4757e45..658b062 100755 --- a/configure +++ b/configure @@ -6042,7 +6042,6 @@ if [ "$eventfd" =3D "yes" ]; then ivshmem=3Dyes fi =20 -tools=3D"" if test "$softmmu" =3D yes ; then if test "$linux" =3D yes; then if test "$virtfs" !=3D no && test "$cap_ng" =3D yes && test "$attr" = =3D yes ; then @@ -7271,7 +7270,6 @@ else fi QEMU_INCLUDES=3D"-iquote ${source_path}/tcg $QEMU_INCLUDES" =20 -echo "TOOLS=3D$tools" >> $config_host_mak echo "ROMS=3D$roms" >> $config_host_mak echo "MAKE=3D$make" >> $config_host_mak echo "INSTALL=3D$install" >> $config_host_mak --=20 1.8.3.1