[PATCH 2/3] Makefile: fix "cscope" target to refer to cscope.out
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jun 22, 2021, 14:21 UTC
- Message-ID
- <patch-2.3-ea39f1f5cd2-20210622T141844Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.3-00000000000-20210622T141844Z-avarab@gmail.com>
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 <avarab@gmail.com> --- .gitignore | 2 +- Makefile | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore index 311841f9bed..d74029c1ca7 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 4dd9711a653..25d2a3e5ddc 100644 --- a/Makefile +++ b/Makefile @@ -2737,10 +2737,11 @@ tags: FORCE $(FIND_SOURCE_FILES) | xargs ctags -a -o tags+ && \ mv tags+ tags +cscope.out: + $(FIND_SOURCE_FILES) | xargs cscope -f$@ -b + .PHONY: cscope -cscope: - $(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 +3212,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
-- 2.32.0.599.g3967b4fa4ac