From a0db67572e12c192f56e6f40b30957144682c16a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 11 Mar 2026 09:33:09 +0100 Subject: [PATCH] build: hook up badwords check to lint targets Also: - autotools: make `badwords` target honor `@PERL@`. Suggested-by: Stefan Eissing Closes #20884 --- CMakeLists.txt | 2 ++ Makefile.am | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eb64a9cd2..aaa1df85d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -561,9 +561,11 @@ if(PERL_EXECUTABLE) add_custom_target(curl-lint COMMENT "Running lint checks" VERBATIM USES_TERMINAL WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/badwords-all" COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/checksrc-all.pl" COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/spacecheck.pl" DEPENDS + "${PROJECT_SOURCE_DIR}/scripts/badwords-all" "${PROJECT_SOURCE_DIR}/scripts/badwords" "${PROJECT_SOURCE_DIR}/scripts/checksrc-all.pl" "${PROJECT_SOURCE_DIR}/scripts/checksrc.pl" "${PROJECT_SOURCE_DIR}/scripts/spacecheck.pl" ) diff --git a/Makefile.am b/Makefile.am index fb14cf7c6f..8d2505d7aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -172,7 +172,10 @@ checksrc: (cd docs/examples && $(MAKE) checksrc) (cd projects && $(MAKE) checksrc) -lint: checksrc +badwords: + @PERL@ $(top_srcdir)/scripts/badwords-all + +lint: badwords checksrc @PERL@ $(top_srcdir)/scripts/spacecheck.pl tidy: @@ -181,6 +184,3 @@ tidy: clean-local: (cd tests && $(MAKE) clean) - -badwords: - $(top_srcdir)/scripts/badwords-all