From patchwork Tue Jun 29 11:12:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12349689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B504C11F69 for ; Tue, 29 Jun 2021 11:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E631461DC7 for ; Tue, 29 Jun 2021 11:13:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233444AbhF2LPv (ORCPT ); Tue, 29 Jun 2021 07:15:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233156AbhF2LPu (ORCPT ); Tue, 29 Jun 2021 07:15:50 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA203C061766 for ; Tue, 29 Jun 2021 04:13:21 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id j1so25295520wrn.9 for ; Tue, 29 Jun 2021 04:13:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WtYYs0RwYic7jbOL/GtwKgPTP3BJixB6SOTsC7cax3Q=; b=jWqhfDvoibiX2evRBfG1HDGZo/CMabrwZKjMiuAlJYeaDEdx8H6dJj86FLxim52dpC nnARtqI6veVZytzI8oBFo1qS3phhOFgiXyJ7xxSw2w8qtrUd5zUXFduXiZeNcr4UjS3c ySh0idzZrTaOoHEXH4t5J07h5xG5PpKfLKGykoDZHt4WPTZaSmQcPHgiIz0rxFkhtPGh iK/jhfWhu6HnNuGyrUKv1xgQS4wicAuymuZl3TgkcGneBpVIeuB4vBbDMhmGZI++iWnq zZ1BGt/nQQHh6/2znYs/Cfqg1pLvYwax6VOUn7u690GRcXNs1mEVtxtbnOA3p5vMykvt IHRg== 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=WtYYs0RwYic7jbOL/GtwKgPTP3BJixB6SOTsC7cax3Q=; b=FaLdksDNNAmXhlhuyRv6X4743ENoxxxQoVSzJGMXe5BJqpYURLEhDaUlQwDwDAQupD o/Mir/25tbWj0KQYqoXvmtuniQagDxSMnDK1z583RTWyga/YmLidrsQosdDNduFlXYru 2jEZSQCHazdWm0LqUOVr4JdYZ46+4VKpL24H++jROH+kLB3Whc813peakoe83XGPEj74 XhXHKjy6QeBCZwUCCD7eArRWkqztTVwJ6KhUCo8N3q6ds+gX6jxGbZxt9qa8Ud5x5UL0 xPotVuS1mGsdsskwzxtfYp18ts4bLMQDjzCGbGzSqte1BB7bJqvsXTWHPRI4/YJGVmzm yOpA== X-Gm-Message-State: AOAM532upmN/o5DmX5Co3Dc3oIuOAXbCpi7C4pQekR4F8YKrUogC4bxD 7QKe4DWhny2lpbat9PnqmAWU1q6X4ndp6A== X-Google-Smtp-Source: ABdhPJxOCh44lcibX2jfOOP6r/NjOjxDpKWzDjSldT0UD8+54uJR+y7iN+LyYHCIdQQrMbpgrzYCDA== X-Received: by 2002:a5d:4b90:: with SMTP id b16mr29849610wrt.123.1624965200293; Tue, 29 Jun 2021 04:13:20 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id r1sm2499370wmn.10.2021.06.29.04.13.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 04:13:19 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Denton Liu , Felipe Contreras , Kristof Provost , Taylor Blau , Jeff King , =?utf-8?b?w4Z2?= =?utf-8?b?YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 1/5] Makefile: move ".PHONY: cscope" near its target Date: Tue, 29 Jun 2021 13:12:55 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.613.g20d5ce26552 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Move the ".PHONY: cscope" rule to live alongside the "cscope" target itself, not to be all the way near the bottom where we define the "FORCE" rule. That line was last modified in 2f76919517e (MinGW: avoid collisions between "tags" and "TAGS", 2010-09-28). Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c3565fc0f8..4dd9711a65 100644 --- a/Makefile +++ b/Makefile @@ -2737,6 +2737,7 @@ tags: FORCE $(FIND_SOURCE_FILES) | xargs ctags -a -o tags+ && \ mv tags+ tags +.PHONY: cscope cscope: $(RM) cscope* $(FIND_SOURCE_FILES) | xargs cscope -b @@ -3245,7 +3246,7 @@ endif .PHONY: all install profile-clean cocciclean clean strip .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell -.PHONY: FORCE cscope +.PHONY: FORCE ### Check documentation # From patchwork Tue Jun 29 11:12:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12349691 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F07FCC11F67 for ; Tue, 29 Jun 2021 11:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5CC261DD2 for ; Tue, 29 Jun 2021 11:13:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233449AbhF2LPw (ORCPT ); Tue, 29 Jun 2021 07:15:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233378AbhF2LPu (ORCPT ); Tue, 29 Jun 2021 07:15:50 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2CBCC061760 for ; Tue, 29 Jun 2021 04:13:22 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id a5-20020a7bc1c50000b02901e3bbe0939bso2174673wmj.0 for ; Tue, 29 Jun 2021 04:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2Fx27B90rLRJsIQFZEKdkqcKsgWl4kWveENFMBG1apg=; b=R3vZVyQLICHB2+YUEiizG0+z5vVRoVrlU3HnSdaelFZrNXpFxXuQnE04hQjlXm6VEQ oqHQHtRpZ+aq/XqYvbaeMYfuwCrWlgq57716DoDo71uHm7AdFVzzn6669BYW7ZSiF445 xck4KPXJc1u7RkPsUDBml9stcdMXzIh9ExGUam2CTHQ5LvDYyYxOEOenusqzI4nowzXR d0fgOmt/6UxEXfdDnUUn6l9fTwkyKGflFr9LUsFOnApXEuusl5Zlm960YoDz1kJNrQRc cikybHnLNTxSp5EIgEhFHXEns7ZxJ/DW8WGfCGtqUVwS+57s5YGx2LMsdnuJd8c2mVgM AC0A== 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=2Fx27B90rLRJsIQFZEKdkqcKsgWl4kWveENFMBG1apg=; b=oNnihYHAGav6ylaXclulfD2EjIK6gGdw5JV4zJhxsz1NgkRgu7c3M596fA+RSeFqoO F/uvXoFV4LhGTkHNCsupW6947wedDRvlpbej944ZEH5h6GypsgWLsOwp/xYct/e7+wyu bk30XmdMoF4SgYVN8YeLO4AEExoi9GpZ3Wc0Hyu2gmgLayD5cni8BebiGyI2VNFLwxvb +rDn8xCtvcOJQqg9Eg4ImMr/YovkGj+Gl2yGh6K4RexF2NpkrzFSo+2PGcEXVFME4e8v DstL7IAcMOFCfW934EbUXoI6N58M09zGUM7R3a06fys+0tIZdxTUsrF2FqMqK9rPbIrl rbtQ== X-Gm-Message-State: AOAM532M6sp28TyiGP/fT2ryw881GxuEdtwMjQvwouYgxXkw8lcGf+VU sLeqIFs4HE59N2quIXFstQcZTutj9RoXng== X-Google-Smtp-Source: ABdhPJzEOMTOPyrVvdUAkTR01p7HVf1yygqBt+AH7DDXJqbxcvZQ4HeVWY+SGwNkATXd6C3oLbaPKw== X-Received: by 2002:a7b:c117:: with SMTP id w23mr31865637wmi.102.1624965201085; Tue, 29 Jun 2021 04:13:21 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id r1sm2499370wmn.10.2021.06.29.04.13.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 04:13:20 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Denton Liu , Felipe Contreras , Kristof Provost , Taylor Blau , Jeff King , =?utf-8?b?w4Z2?= =?utf-8?b?YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 2/5] Makefile: add QUIET_GEN to "cscope" target Date: Tue, 29 Jun 2021 13:12:56 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.613.g20d5ce26552 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Don't show the very verbose $(FIND_SOURCE_FILES) command on every "make cscope" invocation. See my recent 3c80fcb591 (Makefile: add QUIET_GEN to "tags" and "TAGS" targets, 2021-03-28) for the same fix for the other adjacent targets. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4dd9711a65..faa8900097 100644 --- a/Makefile +++ b/Makefile @@ -2739,7 +2739,7 @@ tags: FORCE .PHONY: cscope cscope: - $(RM) cscope* + $(QUIET_GEN)$(RM) cscope* && \ $(FIND_SOURCE_FILES) | xargs cscope -b ### Detect prefix changes From patchwork Tue Jun 29 11:12:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12349693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7417C11F68 for ; Tue, 29 Jun 2021 11:13:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C5F161DC7 for ; Tue, 29 Jun 2021 11:13:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233467AbhF2LPx (ORCPT ); Tue, 29 Jun 2021 07:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233446AbhF2LPw (ORCPT ); Tue, 29 Jun 2021 07:15:52 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD37CC061766 for ; Tue, 29 Jun 2021 04:13:23 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id u11so25282836wrw.11 for ; Tue, 29 Jun 2021 04:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f+pIA2t+AcuzQpGiwWUT7GAGhrk4eePpyfiPaHS9bJw=; b=BL7T0aSzDRTX1pcuR0/dfK/xvEfygM811KdKA3R2HfNcsRxhxlOBvfXIh0E/XwGcwJ 3BrTZtYYHzbtRikaLZh8z4FYbt/PyPsWkAMfo8X21KplNRyPTlDq4Eav+GYwwhk5Tpyd u7pfgTJYdTLkvOlQ6pzcTxNDoiO//IJzLuc2wHYM8PRQIgKMakN3W6o13qhcCakdmKIL r9POS+5zU587DV0oGf6+D7WNbUzTqb/rWrpUMr2c83FrbvbrTphRXDlluqCw3hU4vRjM b5KeGcGBbc2xyMs174V6AJQR4zjpHML1V7qwa63NoR1L0JJAMDaZdd2rUApDJ5c7+upt NOlQ== 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=f+pIA2t+AcuzQpGiwWUT7GAGhrk4eePpyfiPaHS9bJw=; b=WHKXAEOElAy6ldUQ3O9dPI+cfMw1KHoH+ImSAexyDNM2+yelJzh9tQvbSj0UfVecys 7+wKMGY4aWd65+RNaVNgQuvxFa+VrBN+ENYw3mqCxWDtXu+9pzfOLXQpa5JBkPM8i6qU uUFPdKl+r/QlPpAmUza0cjoRkhQB7URQhJ0vY/1U5MEfRQwOTz8Ip/Lg7YkQpq+lVBi9 Zcl2w/ryyz1XtmHks7FvRss6/iFSMNArJUrIxbe2tf31ZcIllf/y8KCLsfJJJc/wRUTN Ze+S4RW0YT6i8c4fBgsvVVb3Nkb1DFFL8NSiZT4jpVk+gUuKv/neCJkjMp+DXIVeLIOA IJtA== X-Gm-Message-State: AOAM530KBPIFPMIO1PRcafqB0qmAT+GcPS9NM3cIAw716oTYuEuL4WH+ rn3rk+O9brbhNvD62bo0sE7Q/kqLuk3RhQ== X-Google-Smtp-Source: ABdhPJx1uWEJNtyvFt1J4L1FGRCSA0nSQ0xKkRmKlzNJJfnPhwYSizlbAFrDp+kUMC5gV9uQBgG3Uw== X-Received: by 2002:a05:6000:1361:: with SMTP id q1mr10032686wrz.179.1624965202151; Tue, 29 Jun 2021 04:13:22 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id r1sm2499370wmn.10.2021.06.29.04.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 04:13:21 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Denton Liu , Felipe Contreras , Kristof Provost , Taylor Blau , Jeff King , =?utf-8?b?w4Z2?= =?utf-8?b?YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 3/5] Makefile: fix "cscope" target to refer to cscope.out Date: Tue, 29 Jun 2021 13:12:57 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.613.g20d5ce26552 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The cscope target added in a2a9150bf06 (makefile: Add a cscope target, 2007-10-06) has for some reason been referring to cscope* instead of cscope.out. Let's generate the cscope.out file directly so we don't need to speculate. The "-fcscope.out" (note, no whitespace) argument is enabled by default on my system's cscope 15.9, but let's provide it explicitly for good measure. Signed-off-by: Ævar Arnfjörð Bjarmason --- .gitignore | 2 +- Makefile | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 311841f9be..d74029c1ca 100644 --- a/.gitignore +++ b/.gitignore @@ -217,7 +217,7 @@ /.vscode/ /tags /TAGS -/cscope* +/cscope.out /compile_commands.json *.hcc *.obj diff --git a/Makefile b/Makefile index faa8900097..2e3b257164 100644 --- a/Makefile +++ b/Makefile @@ -2737,10 +2737,12 @@ tags: FORCE $(FIND_SOURCE_FILES) | xargs ctags -a -o tags+ && \ mv tags+ tags +cscope.out: + $(QUIET_GEN)$(RM) cscope.out && \ + $(FIND_SOURCE_FILES) | xargs cscope -f$@ -b + .PHONY: cscope -cscope: - $(QUIET_GEN)$(RM) cscope* && \ - $(FIND_SOURCE_FILES) | xargs cscope -b +cscope: cscope.out ### Detect prefix changes TRACK_PREFIX = $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):\ @@ -3211,7 +3213,7 @@ clean: profile-clean coverage-clean cocciclean $(RM) $(HCC) $(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json $(RM) -r po/build/ - $(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope* + $(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope.out $(RM) -r .dist-tmp-dir .doc-tmp-dir $(RM) $(GIT_TARNAME).tar.gz $(RM) $(htmldocs).tar.gz $(manpages).tar.gz From patchwork Tue Jun 29 11:12:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12349695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16270C11F66 for ; Tue, 29 Jun 2021 11:13:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03A1961DD2 for ; Tue, 29 Jun 2021 11:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233477AbhF2LPy (ORCPT ); Tue, 29 Jun 2021 07:15:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233448AbhF2LPw (ORCPT ); Tue, 29 Jun 2021 07:15:52 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96EB4C061767 for ; Tue, 29 Jun 2021 04:13:24 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id i94so25366857wri.4 for ; Tue, 29 Jun 2021 04:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dkFecYtmMrIqHZBK4+m3WzH/C4uDf52UQVpYP73Upvc=; b=Cb/GNyR8Ab5xQNJRl3VPdRp9NV/Li/fduTJfzDPlYMXYp/mOhmSJRMtS7AWm4YfFd+ +wbWlIhM2gDn2ggZWFmPy+8qXLmC97bvE9olmMG68iBZ0WwjcS3syeRVIRN9tQtVXruP Qq7DYEiQ7reKRa/U4UxA2c+WHtj3jfvFZnBUrOei8s1gJMGv/Sn5oVfacR8fG/pZqSwe A5BNO+/G5YqeTxxnZjj5+UFlFpzYK7W3M8mlFYYk4hpqLv1DG0krH3C56X6tc4i+OXsm XDHai/wNmSOHNB2CyoPiaHvsHWJp+uLVft0zh3WmQhANNSPQwG+k3x5ilD4/CeYFEz9Y ceBQ== 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=dkFecYtmMrIqHZBK4+m3WzH/C4uDf52UQVpYP73Upvc=; b=Ds/yyjLcnNfyEquEcEh4or1rIKVn/xgCD+Err4mpA7g3LvJIsIEuyYUq57NYNqjLLq kCoyLZ5FbNghFsSPI/TaWUlqA/vHkcJofP7ccfiHSHs0B7ygoWeomJP2IicylKJpOcx9 HBR8nvs8r6B/BMxyJlpfcVyqLNZhCz2W42+Z4qoWXSE1lIMm58CDzFivi3QmKx0QBZcW m71HHB9VJp4wtlmuKHQa7NSpGZn3b3JizK5kKqUKwzCl5DLawaAKqfujk6xejEeaFsB1 3/AiMpVWnoTM4a5dWnylLYaZKeMS/7kQ920Zt3NaFV5TC8y4HXg+5AHWCedK22h129TK puMA== X-Gm-Message-State: AOAM532kc5SOAf+lNPpqBZGylTy+U2fRIPMh9wUs2UotDw3JVHjvsiNM KvBWDiGhpdHgev36n1HMPuGmKpRGRyvcMw== X-Google-Smtp-Source: ABdhPJzmrfrTce56mWFs8rm5miXd2SVKfg/fq/oH2SGuQT5QqvlZ9LT4knqKQJSYcm/3Dzi73lg/Ug== X-Received: by 2002:adf:f48c:: with SMTP id l12mr33140689wro.194.1624965203062; Tue, 29 Jun 2021 04:13:23 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id r1sm2499370wmn.10.2021.06.29.04.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 04:13:22 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Denton Liu , Felipe Contreras , Kristof Provost , Taylor Blau , Jeff King , =?utf-8?b?w4Z2?= =?utf-8?b?YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 4/5] Makefile: don't use "FORCE" for tags targets Date: Tue, 29 Jun 2021 13:12:58 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.613.g20d5ce26552 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove the "FORCE" dependency from the "tags", "TAGS" and "cscope.out" targets, instead make them depend on whether or not the relevant source files have changed. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2e3b257164..7b0d9773b0 100644 --- a/Makefile +++ b/Makefile @@ -2727,19 +2727,21 @@ FIND_SOURCE_FILES = ( \ | sed -e 's|^\./||' \ ) -$(ETAGS_TARGET): FORCE +FOUND_SOURCE_FILES = $(shell $(FIND_SOURCE_FILES)) + +$(ETAGS_TARGET): $(FOUND_SOURCE_FILES) $(QUIET_GEN)$(RM) "$(ETAGS_TARGET)+" && \ $(FIND_SOURCE_FILES) | xargs etags -a -o "$(ETAGS_TARGET)+" && \ mv "$(ETAGS_TARGET)+" "$(ETAGS_TARGET)" -tags: FORCE +tags: $(FOUND_SOURCE_FILES) $(QUIET_GEN)$(RM) tags+ && \ $(FIND_SOURCE_FILES) | xargs ctags -a -o tags+ && \ mv tags+ tags -cscope.out: +cscope.out: $(FOUND_SOURCE_FILES) $(QUIET_GEN)$(RM) cscope.out && \ - $(FIND_SOURCE_FILES) | xargs cscope -f$@ -b + echo $(FOUND_SOURCE_FILES) | xargs cscope -f$@ -b .PHONY: cscope cscope: cscope.out @@ -2923,7 +2925,7 @@ check: config-list.h command-list.h exit 1; \ fi -FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES))) +FOUND_C_SOURCES = $(filter %.c,$(FOUND_SOURCE_FILES)) COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES)) %.cocci.patch: %.cocci $(COCCI_SOURCES) From patchwork Tue Jun 29 11:12:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12349697 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 976B0C11F67 for ; Tue, 29 Jun 2021 11:13:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A3C661DD4 for ; Tue, 29 Jun 2021 11:13:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233465AbhF2LPz (ORCPT ); Tue, 29 Jun 2021 07:15:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233451AbhF2LPx (ORCPT ); Tue, 29 Jun 2021 07:15:53 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59D18C061760 for ; Tue, 29 Jun 2021 04:13:25 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id u6so3190053wrs.5 for ; Tue, 29 Jun 2021 04:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oLNRX4g8YYbeN8n/g4rtcPcjYSljj7AuXSJGltqZ6TU=; b=IGCrzGHnUbjeBdDnRf+v2UV6BzfrWtZR2eFZ1wQH8/1H+4rGZm4A6aFsOu7Z9HsjtH 7CzuD+iMcTiWP9KVBEovUDg7rFlCZIb9WU9sC3QeZGS/uQEtg99uW36h6wciaJmCIPGT iMSPR17ovgdypWiDlgF5oo1IrefVXPG9dO0spaE67v5VsD1rxnM/fSK4nV+kEqy7EnNC JfgscJNWhjuE1ymSDj2CR7TDm4QDCy9SSVKb+Thf76G/yIKfEG9YBbba51/H/KyJZ7Hi EOO0Qvbi78Xqp5cZ//nFqPNH72Xyo+/TQu1Kh8yr+79cQFhSu7qRYhiXipc2C+G6NGhX 4QWQ== 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=oLNRX4g8YYbeN8n/g4rtcPcjYSljj7AuXSJGltqZ6TU=; b=ZFIInflHj4YqTSffXQQQEY52Ki08LUClo6swmtbH/SUAXBrlwYSmSM6svVEPF2fNeY MivAO+tVjSWsV9bXEKhf+kjiuJrE8oEefSDKofK1+rS22UxhWblE9IGjU+EJUG3nD3jT wG1cKP8HXJ5CiVN4gSHROGVmu3+qqzCElV4SEmbQqfIpVHWoM0ublzBA8mulXd8MDrSb 38SfCt9yuw+ddM1INGa9WKjqIE1Lw7Vb18HcOowx7lDS99Ec7yDAUeS0N0yHwJHjAsnV ozbHd6XT5JiAIoPvbPpK+aYxHWrZrZrMMRi8MAIyiawbQem9Iv1IFgoKPicChxcX7q8J FESg== X-Gm-Message-State: AOAM530cptX5gA3chwoGQ/82tTvVxPUoqz93CTR5UQ+INM0iBSg+Ogih IwVsHl1Y16juOpIlJakESCq7hTuGKE7+Bw== X-Google-Smtp-Source: ABdhPJyDTmDBuISKPxFCxyJDuxq+yAYWggGe3twS66vV11BjyiDHiEEhE9VbtyFEiXCdVEI4dvzX9A== X-Received: by 2002:a5d:6d8d:: with SMTP id l13mr31259101wrs.358.1624965203793; Tue, 29 Jun 2021 04:13:23 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id r1sm2499370wmn.10.2021.06.29.04.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 04:13:23 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Denton Liu , Felipe Contreras , Kristof Provost , Taylor Blau , Jeff King , =?utf-8?b?w4Z2?= =?utf-8?b?YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 5/5] Makefile: normalize clobbering & xargs for tags targets Date: Tue, 29 Jun 2021 13:12:59 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.613.g20d5ce26552 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since the "tags", "TAGS" and "cscope.out" targets rely on ping into xargs with an "echo | xargs" pattern, we need to make sure we're in an append mode. Unlike recent changes of mine to make use of ".DELETE_ON_ERROR" we really do need the "rm $@+" at the beginning (note, not "rm $@"). This is because the xargs command may decide on multiple invocations of the program. We need to make sure we've got a union of its results at the end. For "ctags" and "etags" we used the "-a" flag for this, for cscope that behavior is the default. Its "-u" flag disables its equivalent of an implicit "-a" flag. Let's also consistently use the $@ and $@+ names instead of needlessly hardcoding or referring to more verbose names in the "tags" and "TAGS" rules. These targets could perhaps be improved in the future by factoring this "echo | xargs" pattern so that we make intermediate tags files for each source file, and then assemble them into one "tags" file at the end. The etags manual page suggests that doing that (or perhaps just --update) might be counter-productive, in any case, the tag building is fast enough for me, so I'm leaving that for now. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7b0d9773b0..926c9efe43 100644 --- a/Makefile +++ b/Makefile @@ -2730,18 +2730,19 @@ FIND_SOURCE_FILES = ( \ FOUND_SOURCE_FILES = $(shell $(FIND_SOURCE_FILES)) $(ETAGS_TARGET): $(FOUND_SOURCE_FILES) - $(QUIET_GEN)$(RM) "$(ETAGS_TARGET)+" && \ - $(FIND_SOURCE_FILES) | xargs etags -a -o "$(ETAGS_TARGET)+" && \ - mv "$(ETAGS_TARGET)+" "$(ETAGS_TARGET)" + $(QUIET_GEN)$(RM) $@+ && \ + echo $(FOUND_SOURCE_FILES) | xargs etags -a -o $@+ && \ + mv $@+ $@ tags: $(FOUND_SOURCE_FILES) - $(QUIET_GEN)$(RM) tags+ && \ - $(FIND_SOURCE_FILES) | xargs ctags -a -o tags+ && \ - mv tags+ tags + $(QUIET_GEN)$(RM) $@+ && \ + echo $(FOUND_SOURCE_FILES) | xargs ctags -a -o $@+ && \ + mv $@+ $@ cscope.out: $(FOUND_SOURCE_FILES) - $(QUIET_GEN)$(RM) cscope.out && \ - echo $(FOUND_SOURCE_FILES) | xargs cscope -f$@ -b + $(QUIET_GEN)$(RM) $@+ && \ + echo $(FOUND_SOURCE_FILES) | xargs cscope -f$@+ -b && \ + mv $@+ $@ .PHONY: cscope cscope: cscope.out