From patchwork Thu Dec 12 12:51:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208466 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q3J/P87R"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZNL0pH0z9s4Y for ; Fri, 13 Dec 2019 00:27:30 +1100 (AEDT) Received: from localhost ([::1]:59288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOV5-0003hy-Gv for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:27:27 -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) 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) 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) 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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)) LIBS+=-lz $(LIBS_TOOLS) -HELPERS-y = - ifdef BUILD_DOCS DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 @@ -143,7 +141,7 @@ dummy := $(call unnest-vars,, \ include $(SRC_PATH)/tests/Makefile.include -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules +all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t), $(TARGET_DIRS))) SUBDIR_RULES=$(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=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \ $(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" = "yes" ]; then ivshmem=yes fi -tools="" if test "$softmmu" = yes ; then if test "$linux" = yes; then if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then @@ -7271,7 +7270,6 @@ else fi QEMU_INCLUDES="-iquote ${source_path}/tcg $QEMU_INCLUDES" -echo "TOOLS=$tools" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak echo "INSTALL=$install" >> $config_host_mak