summaryrefslogtreecommitdiff
path: root/maint.mk
diff options
context:
space:
mode:
Diffstat (limited to 'maint.mk')
-rw-r--r--maint.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/maint.mk b/maint.mk
index 5745d5831..034e25be3 100644
--- a/maint.mk
+++ b/maint.mk
@@ -2,7 +2,7 @@
# This Makefile fragment tries to be general-purpose enough to be
# used by many projects via the gnulib maintainer-makefile module.
-## Copyright (C) 2001-2022 Free Software Foundation, Inc.
+## Copyright (C) 2001-2023 Free Software Foundation, Inc.
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -765,7 +765,7 @@ sc_prohibit_dirent_without_use:
# Prohibit the inclusion of verify.h without an actual use.
sc_prohibit_verify_without_use:
@h='verify.h' \
- re='\<(verify(true|expr)?|assume|static_assert) *\(' \
+ re='\<(verify(_expr)?|assume) *\(' \
$(_sc_header_without_use)
# Don't include xfreopen.h unless you use one of its functions.
@@ -1292,7 +1292,7 @@ sc_copyright_check:
in_vc_files=$(sample-test) \
halt='out of date copyright in $(sample-test); update it' \
$(_sc_search_regexp)
- @require='Copyright @copyright\{\} .*'$$(date +%Y) \
+ @require='Copyright @copyright\{} .*'$$(date +%Y) \
in_vc_files=$(texi) \
halt='out of date copyright in $(texi); update it' \
$(_sc_search_regexp)
@@ -1373,6 +1373,10 @@ sc_vulnerable_makefile_CVE-2012-3386:
' see https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-3386 for details') \
$(_sc_search_regexp)
+sc_unportable_grep_q:
+ @prohibit='grep -q' halt="unportable 'grep -q', use >/dev/null instead" \
+ $(_sc_search_regexp)
+
vc-diff-check:
$(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
$(AM_V_at)if test -s vc-diffs; then \
@@ -1659,8 +1663,8 @@ indent: # Running indent once is not idempotent, but running it twice is.
indent $(indent_args) $(INDENT_SOURCES)
sc_indent:
- @if ! command -v indent > /dev/null; then \
- echo 1>&2 '$(ME): sc_indent: indent is missing'; \
+ @if ! indent --version 2> /dev/null | grep 'GNU indent' > /dev/null; then \
+ echo 1>&2 '$(ME): sc_indent: GNU indent is missing'; \
else \
fail=0; files="$(INDENT_SOURCES)"; \
for f in $$files; do \