From nobody Mon Feb 9 01:01:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622646497; cv=none; d=zohomail.com; s=zohoarc; b=Q3TBYhSEg6j/E9hgvayn6/02+nCIFvGeNiz58xBlwKHA4bPGL4Cue+BwMfuwBYnCD6NVTXdxSEDxoCC4CXgqtHrbdUdCsbg2/LF1sKAyJ5vkykgva5cHruATWBMXAUwrC5L0rnivK2QpoOVdoUn+OAxf4Z0A2qxavbMm+i2B+Sg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622646497; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=I6p+KBcPxhcxhCk4URhd00+j5agpaxomT4LMWyre5+k=; b=l8dyYRnCap9fUfZ8UCT9PpJLWzgIYJ6jAygTjH1r+HaSr6JZfNr4syBoepaV3hV/NGd/5LPZYec6TaPt4yUlrJtLkC1GqkMT4qjkD6bOcGFZ9/Mqqo508K1nYr6XahmJfhVxwtTLqnCHCx+M+3GO6HKDnAq9JhtmBA3K6sVw+5Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622646497384552.2362069980314; Wed, 2 Jun 2021 08:08:17 -0700 (PDT) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-439-fwcqZFJnOlWRBW-XHPpDwA-1; Wed, 02 Jun 2021 11:08:12 -0400 Received: by mail-ed1-f70.google.com with SMTP id c13-20020a50f60d0000b02903900105f127so1556086edn.22 for ; Wed, 02 Jun 2021 08:08:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id v21sm108857edt.48.2021.06.02.08.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 08:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622646496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I6p+KBcPxhcxhCk4URhd00+j5agpaxomT4LMWyre5+k=; b=YF/2KW1AojpVLyDa420k/Sg8s2nc1aE4jl413ITSpCUzKi2/U9S725pvGFmnytCh9bKhOh zJmtaAeJhhiXNbxPhJQn+KAUBxIOmBk1rv7T4miSXpMFIPDyM6OGhT9QKZ5WQrlf7sHe3u lMMVnS/QSp+Glaa5fGhoO/HfVKb9V0M= X-MC-Unique: fwcqZFJnOlWRBW-XHPpDwA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=I6p+KBcPxhcxhCk4URhd00+j5agpaxomT4LMWyre5+k=; b=nIQTj2mJ+yJHr/gPkHR/JWVvAc9bci+tGPe6v6ae+aDJvJBzKvSUXyDuDlhyEjIy3+ OFLZ6fqcavAY+BwFk+CX7sbW3mPaIWHXhX2UKCrqIvy5Be/TYIy46tKKL0bE6gzE0xii 20EIhjboxzZCQ0cWkG9IED06xgqMAwVlN9+LvUZb+UbjxaTlSNl7rSK3XRJVMyC86v7C G7JjbeTuPeAeMGP8U9gfdAHdtNeaiaep0B6jqHBwgXqI1dJP2PAFTsEyT7MtWnMjjmex LDD9o82IxLP7ab7HgcJ7lL93tOGDeTRz5A8zMCpVrkq9FBY34lrWztwUoQrmf7qGjZQg Meag== X-Gm-Message-State: AOAM532sOjbhC0hjDUBJYzedQuLKg5PXYJizmua/INHLy7luOOT3vQba QSlR1Vxvlj8TB/yVHwOY9mrvuIE5RzenLjYO2+TnycL7b5MH9QfFE1jN5SsV4vQ95hF4785lYoL NxzfYmbki8kp1lA== X-Received: by 2002:aa7:c983:: with SMTP id c3mr17145805edt.58.1622646490897; Wed, 02 Jun 2021 08:08:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywxDd0dgkgmafNVDTq+ze9DzFR2ULQoF2YeUlKQVLWcvYQAyMiZBlt2x27GrRNEplxneCouw== X-Received: by 2002:aa7:c983:: with SMTP id c3mr17145775edt.58.1622646490679; Wed, 02 Jun 2021 08:08:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] buildsys: Restore listing binaries/tools/helpers in 'make help' target Date: Wed, 2 Jun 2021 17:08:09 +0200 Message-Id: <20210602150809.2471467-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) When switching to Meson (commit 7fd51e68c34, 2020-08-21) we lost many targets listed in 'make help': - target specific binaries commit 5e6d1573b49 ("remove Makefile.target") - tools and helpers commit c3a0ee847a5 ("configure, Makefile; remove TOOLS and HELPERS-y vari= able") Since 'ninja' is not officially supported, but 'make' still is, restore a similar list of make targets (extracted from ninja). The targets are not described as before, but it is still more useful to users rather than nothing listed at all. Now we get: $ make help GIT ui/keycodemapdb tests/fp/berkeley-testfloat-3 tests/fp/berkeley= -softfloat-3 dtc capstone slirp Architecture specific targets: qemu-system-aarch64 qemu-system-alpha qemu-system-arm qemu-system-avr ... qemu-x86_64 qemu-xtensaeb qemu-xtensa Generic targets: all - Build all dir/file.o - Build specified target only install - Install QEMU ctags/gtags/TAGS - Generate tags file for editors cscope - Generate cscope index sparse - Run sparse on the QEMU source Tools and helper targets: contrib/elf2dmp/elf2dmp contrib/ivshmem-client/ivshmem-client contrib/ivshmem-server/ivshmem-server contrib/vhost-user-blk/vhost-user-blk contrib/vhost-user-gpu/vhost-user-gpu contrib/vhost-user-input/vhost-user-input contrib/vhost-user-scsi/vhost-user-scsi fsdev/virtfs-proxy-helper qemu-bridge-helper qemu-edid qemu-img qemu-io qemu-keymap qemu-nbd qemu-pr-helper qga/qemu-ga storage-daemon/qemu-storage-daemon tools/virtiofsd/virtiofsd Cleaning targets: clean - Remove most generated files but keep t= he config distclean - Remove all generated files dist - Build a distributable tarball ... Fixes: https://gitlab.com/qemu-project/qemu/-/issues/227 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile index 30f19d33bb3..f2c5ce2e5fe 100644 --- a/Makefile +++ b/Makefile @@ -286,6 +286,9 @@ print-help =3D @$(call print-help-run,$1,$2) =20 .PHONY: help help: + @echo 'Architecture specific targets:' + @ninja -t targets all | sed -ne 's/\(.*\): cpp_LINKER.*/ \1/p' + @echo '' @echo 'Generic targets:' $(call print-help,all,Build all) $(call print-help,dir/file.o,Build specified target only) @@ -294,6 +297,10 @@ help: $(call print-help,cscope,Generate cscope index) $(call print-help,sparse,Run sparse on the QEMU source) @echo '' + @echo 'Tools and helper targets:' + @ninja -t targets all | sed -ne 's/\(.*\): c_LINKER.*/ \1/p' \ + | sort | egrep -v '^ (subprojects|tests|target)' + @echo '' ifeq ($(CONFIG_PLUGIN),y) @echo 'Plugin targets:' $(call print-help,plugins,Build the example TCG plugins) --=20 2.26.3