From nobody Thu Nov 13 21:52:18 2025 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=1583369430; cv=none; d=zohomail.com; s=zohoarc; b=mE+O1rXKGKCmAuJ6EZQFK4YJtUY7OzWSxxZmJfLlQAnsUXWkD9uXrFuskzVUndMb3EaA1tUtDBQW2QSAKgUt3vYl7vHQabbq0TmGIYCaR95kC9DTXls+rnbb712OwPpVaPXtaYiw//P7i3cL4Cm9gUYdNlWhma700mK3BcuP+/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583369430; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=r1/u9iZXVbyJdSt5JGwMZWiEEl8OjY1RWbys83kQVoQ=; b=X+5Dp9y77fnkkO49aqtFo1rvQgwHaWNOTKDcShs3zaYv7hQEP8sWnODL+mVcwUdJXcpxga/+Q4q77KYoHYCMGdCmeVdq7C+deZXHc7VRJhsXr35AyhwS6H4bKnaMmTecfIjg4fVxQbzfHswIvL4GLvze3YCLapjSVWXWMSuJjkM= 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 15833694301821009.8716519931219; Wed, 4 Mar 2020 16:50:30 -0800 (PST) Received: from localhost ([::1]:41870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9eia-0007mw-7O for importer@patchew.org; Wed, 04 Mar 2020 19:50:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36817) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9ehI-00065v-H1 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 19:49:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9ehG-0002zS-3f for qemu-devel@nongnu.org; Wed, 04 Mar 2020 19:49:07 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:34418 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9ehF-0002yp-W6 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 19:49:06 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-380-eJS6WSTuPhiW44jHd7NLzg-1; Wed, 04 Mar 2020 19:49:04 -0500 Received: by mail-wr1-f69.google.com with SMTP id x14so1019488wrv.23 for ; Wed, 04 Mar 2020 16:49:03 -0800 (PST) Received: from localhost.localdomain (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id r19sm6422422wmh.26.2020.03.04.16.49.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 16:49:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583369345; 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: in-reply-to:in-reply-to:references:references; bh=r1/u9iZXVbyJdSt5JGwMZWiEEl8OjY1RWbys83kQVoQ=; b=EiurY1+04uDnrFT4Fve9hOY2SDNLeeuijthXhsHTdgyWluUBXPBJZHEw8x1mGB3p5WGOd9 6VLQejXBBOIY8VbmkkZYeSw1BnEmdMnTMByoUgdRYzSsSIMj+Gu8B7l8wmzCHtg5uIh2MR c5l5oyZSEWGfORJ1N0MTK2ZdyL4H/ts= X-MC-Unique: eJS6WSTuPhiW44jHd7NLzg-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:in-reply-to :references:mime-version:content-transfer-encoding; bh=9cJi/qVXGYuD7j1Z1sfWwdwoowKBROLKn5uwHYNB34c=; b=a/dkj6YxcEYcE7i4WQvPgUxZMjTzyDkHB0XumhEt7iBz6qSAYKo2oH2COBNwlj937S UtV7K0hT9ZOYxlmEDfZnheNdu86pm8uUm/1HDGZslu5H6Ax25sFIvCiKBpEbS2mV04na MPpV5mULplmbZwEc43YSn+/r9D4fPjhUToL0RmxMdNUkXx3LZW4v/36MzNex12e0JEj9 kvdlyBmp6x+PUvcIKieshTpd56UMLm8x8yLOnx6xqKF7MNdztEJf6NpNsHUr2uOJzvP1 g8fjMI6of2NZTTVIUW0Ev0rq0XfjRgf3OjOBJnqizispZ1xmrWRpF0CBGEKPY8Fvi67V uLSw== X-Gm-Message-State: ANhLgQ0tH+r3yvwCYK8w6L3dcnTHxgmdibaoNm2qN3fL93Y9CcGL37uc 9MulDFRPGz29JxYyXuP6Pqn82aWXtPWSjBsoC5bj0tc5SlqJLaxaSiz7vuhqzaaumcRMskM/Cf9 Q7SlrQTs7ltGfMLQ= X-Received: by 2002:a1c:4e03:: with SMTP id g3mr5989084wmh.22.1583369342637; Wed, 04 Mar 2020 16:49:02 -0800 (PST) X-Google-Smtp-Source: ADFU+vtfaLza6tjpbZQ2CFPR9ze5EPsiwwV2hfbKUtQ0xS1aQmtJlTyRBWY/yTNEZCNjp+E65QoD4w== X-Received: by 2002:a1c:4e03:: with SMTP id g3mr5989054wmh.22.1583369342319; Wed, 04 Mar 2020 16:49:02 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] Makefile: Align 'help' target output Date: Thu, 5 Mar 2020 01:48:54 +0100 Message-Id: <20200305004855.9665-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200305004855.9665-1-philmd@redhat.com> References: <20200305004855.9665-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" The 'help' target is displayed unaligned. Add a print-help function and use it. Now if someone want to change the indentation, there is a single place to modify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index aa9cc0b584..a9ede4f428 100644 --- a/Makefile +++ b/Makefile @@ -1220,50 +1220,52 @@ endif include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/vm/Makefile.include =20 +print-help-run =3D printf " %-30s - %s\\n" "$1" "$2" +print-help =3D $(quiet-@)$(call print-help-run,$1,$2) + .PHONY: help help: @echo 'Generic targets:' - @echo ' all - Build all' + $(call print-help,all,Build all) ifdef CONFIG_MODULES - @echo ' modules - Build all modules' + $(call print-help,modules,Build all modules) endif - @echo ' dir/file.o - Build specified target only' - @echo ' install - Install QEMU, documentation and tools' - @echo ' ctags/TAGS - Generate tags file for editors' - @echo ' cscope - Generate cscope index' + $(call print-help,dir/file.o,Build specified target only) + $(call print-help,install,Install QEMU, documentation and tools) + $(call print-help,ctags/TAGS,Generate tags file for editors) + $(call print-help,cscope,Generate cscope index) @echo '' @$(if $(TARGET_DIRS), \ echo 'Architecture specific targets:'; \ $(foreach t, $(TARGET_DIRS), \ - printf " %-30s - Build for %s\\n" $(t)/all $(t);) \ + $(call print-help-run,$(t)/all,Build for $(t));) \ echo '') @echo 'Cleaning targets:' - @echo ' clean - Remove most generated files but keep the conf= ig' + $(call print-help,clean,Remove most generated files but keep the config) ifdef CONFIG_GCOV - @echo ' clean-coverage - Remove coverage files' + $(call print-help,clean-coverage,Remove coverage files) endif - @echo ' distclean - Remove all generated files' - @echo ' dist - Build a distributable tarball' + $(call print-help,distclean,Remove all generated files) + $(call print-help,dist,Build a distributable tarball) @echo '' @echo 'Test targets:' - @echo ' check - Run all tests (check-help for details)' - @echo ' docker - Help about targets running tests inside conta= iners' - @echo ' vm-help - Help about targets running tests inside VM' + $(call print-help,check,Run all tests (check-help for details)) + $(call print-help,docker,Help about targets running tests inside containe= rs) + $(call print-help,vm-help,Help about targets running tests inside VM) @echo '' @echo 'Documentation targets:' - @echo ' html info pdf txt' - @echo ' - Build documentation in specified format' + $(call print-help,html info pdf txt,Build documentation in specified form= at) ifdef CONFIG_GCOV - @echo ' coverage-report - Create code coverage report' + $(call print-help,coverage-report,Create code coverage report) endif @echo '' ifdef CONFIG_WIN32 @echo 'Windows targets:' - @echo ' installer - Build NSIS-based installer for QEMU' + $(call print-help,installer,Build NSIS-based installer for QEMU) ifdef QEMU_GA_MSI_ENABLED - @echo ' msi - Build MSI-based installer for qemu-ga' + $(call print-help,msi,Build MSI-based installer for qemu-ga) endif @echo '' endif - @echo ' $(MAKE) [targets] (quiet build, default)' - @echo ' $(MAKE) V=3D1 [targets] (verbose build)' + $(call print-help,$(MAKE) [targets],(quiet build, default)) + $(call print-help,$(MAKE) V=3D1 [targets],(verbose build)) --=20 2.21.1 From nobody Thu Nov 13 21:52:18 2025 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=1583369488; cv=none; d=zohomail.com; s=zohoarc; b=ReGmMoHLZuGD5LLsGqoAghYiMbotNKkWy1TeCn25rUN+3krEZ+oO5kQ/8ogOfbl8jBekky2IKmN6/op/4oLYi++vnXMj+bZmTvdXQhC32EJ/jCZARO1Z7FHltqusCDwqPN6SjEztGfJjZpaAGfXrkM4gsRfBJe7Ficq9CseEPp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583369488; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PjETIBQNzsyZ+xRKKECdXFIBvuCR8b8nsZGdNL5G0cQ=; b=JMRscCOrbEeG7HIdyHGxixcqLPUuuCoyvsThp6kYVq0zNOVXq5hRQ48kctYMKAxps5q6cu5kTi7Fm4SnZucXWBLeABGj5bApDE+3+Nek5VC4sYh1Ref3C+AINuMEGlPtcAwQwgf1Xh9FSSypjijIAOk5SE7J2WR0ab0AV9WVfyc= 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 1583369488566120.15414534736806; Wed, 4 Mar 2020 16:51:28 -0800 (PST) Received: from localhost ([::1]:41890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9ejX-0000dY-KW for importer@patchew.org; Wed, 04 Mar 2020 19:51:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36860) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9ehM-0006DL-Sg for qemu-devel@nongnu.org; Wed, 04 Mar 2020 19:49:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9ehK-000353-VR for qemu-devel@nongnu.org; Wed, 04 Mar 2020 19:49:12 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:58324 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9ehK-000344-Sa for qemu-devel@nongnu.org; Wed, 04 Mar 2020 19:49:10 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-223-PPdQ8kBlM6SCWGzZ-SyncQ-1; Wed, 04 Mar 2020 19:49:09 -0500 Received: by mail-wm1-f71.google.com with SMTP id j130so1433890wmj.9 for ; Wed, 04 Mar 2020 16:49:08 -0800 (PST) Received: from localhost.localdomain (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id w9sm3321715wrn.35.2020.03.04.16.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 16:49:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583369350; 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: in-reply-to:in-reply-to:references:references; bh=PjETIBQNzsyZ+xRKKECdXFIBvuCR8b8nsZGdNL5G0cQ=; b=SGcIXsWFx38Rw9p3RdgS5rlMvU7HNrupyB2bOdVuXpsygYPuLUyCrVl6/1C0h27SunKwpO WhO5n4JfR/iBnUPrG4MabQrB/8QWe/sq2XL4/Fx5j0SWE6t44WuXVjfwauJjDRMtBD6RBQ 8uiImk2mgo4UU5fk8zMIEJoCtsKx04s= X-MC-Unique: PPdQ8kBlM6SCWGzZ-SyncQ-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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ix/W8AfQRhp1de4p5m7tRDcjdb+HvfRtvsCyJ6jZ204=; b=NBNeX20ko0rPG9lNApAuS4vTVdM3heGeHdIpV7z5fHTlpk7HBqi7S2okheV7f6Ir5Y 9BBmO4FBvqXrbRWxCfAebyLgi2gRYcMEHW5a7jRsmlySRC7oG1j0awo6djz8TY5FCeqv RUw6FnDTBcnVOtQk+qD7MjxTc0h0zt52ZVEboyVUGFMPiywcrl2U7mAvuQ69AN50IXFk YaQmP6xllG2m7BP4/tfta6rThqxi/wl+1vKMxyF5SFp1qxmC3yYL0oUdOPNDoLmzlmWh Qgdlx/IETh6eHEZVf+lWGxUnnTVKdq3PUJZ/66ohsx/IKDEiJS4PJz7AhVkujqfSm+XB +2OQ== X-Gm-Message-State: ANhLgQ0dX1Wi9gdGtZCdDKCf0MNRm9TWBLGH/sVn1ulxM3aFqUQdosmH brteD4dYN70N58n7DVcFSAf3B2WwSANZ6uW40d20tw8STDXMKijp+Yt5p3KELt6ssoTwj4oIQ2i hRKfvLGZ9CxlxGXA= X-Received: by 2002:adf:aa9e:: with SMTP id h30mr6965776wrc.288.1583369347614; Wed, 04 Mar 2020 16:49:07 -0800 (PST) X-Google-Smtp-Source: ADFU+vuXDgM4HSebXJGn832stjAWZU4tJW+9+FOFNtO829vUKDOFLVxkA8AQPdRL8cceKajnF7zyZg== X-Received: by 2002:adf:aa9e:: with SMTP id h30mr6965754wrc.288.1583369347474; Wed, 04 Mar 2020 16:49:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] Makefile: Let the 'help' target list the tools targets Date: Thu, 5 Mar 2020 01:48:55 +0100 Message-Id: <20200305004855.9665-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200305004855.9665-1-philmd@redhat.com> References: <20200305004855.9665-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" List the name of the tool targets when calling 'make help': $ make help [...] Tools targets: qemu-ga - Build qemu-ga tool qemu-keymap - Build qemu-keymap tool elf2dmp - Build elf2dmp tool ivshmem-client - Build ivshmem-client tool ivshmem-server - Build ivshmem-server tool qemu-nbd - Build qemu-nbd tool qemu-img - Build qemu-img tool qemu-io - Build qemu-io tool qemu-edid - Build qemu-edid tool fsdev/virtfs-proxy-helper - Build virtfs-proxy-helper tool scsi/qemu-pr-helper - Build qemu-pr-helper tool Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index a9ede4f428..4a1d3e2a79 100644 --- a/Makefile +++ b/Makefile @@ -1240,6 +1240,11 @@ endif $(foreach t, $(TARGET_DIRS), \ $(call print-help-run,$(t)/all,Build for $(t));) \ echo '') + @$(if $(TOOLS), \ + echo 'Tools targets:'; \ + $(foreach t, $(TOOLS), \ + $(call print-help-run,$(t),Build $(shell basename $(t)) tool);) \ + echo '') @echo 'Cleaning targets:' $(call print-help,clean,Remove most generated files but keep the config) ifdef CONFIG_GCOV --=20 2.21.1