From: Bruno Haible <bruno@clisp.org>
Date: Wed, 7 May 2025 07:24:30 +0000 (+0200)
Subject: Tidy "make sc_prohibit_AC_LIBOBJ_in_m4" check.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ea54f75ef5591c245a575d8fa0104d26ed7ce3c;p=thirdparty%2Fgnulib.git

Tidy "make sc_prohibit_AC_LIBOBJ_in_m4" check.

* Makefile (sc_prohibit_AC_LIBOBJ_in_m4): Don't hide the rule commands.
(allow_AC_LIBOBJ): Remove exceptions that are no longer needed.
---

diff --git a/ChangeLog b/ChangeLog
index 70275d6619..62e0f4011b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-05-07  Bruno Haible  <bruno@clisp.org>
+
+	Tidy "make sc_prohibit_AC_LIBOBJ_in_m4" check.
+	* Makefile (sc_prohibit_AC_LIBOBJ_in_m4): Don't hide the rule commands.
+	(allow_AC_LIBOBJ): Remove exceptions that are no longer needed.
+
 2025-05-07  Bruno Haible  <bruno@clisp.org>
 
 	Fix "make sc_prohibit_sc_omitted_at" failure.
diff --git a/Makefile b/Makefile
index daaffc2f68..a725c5349e 100644
--- a/Makefile
+++ b/Makefile
@@ -80,22 +80,24 @@ sc_maint:
 	        -f cfg.mk -f maint.mk syntax-check
 	rm -f maint.mk
 
-# Files in m4/ that (exceptionally) may use AC_LIBOBJ.
-# Do not include their ".m4" suffix.
+sc_prohibit_AC_LIBOBJ_in_m4:
+	url=https://lists.gnu.org/r/bug-gnulib/2011-06/msg00051.html; \
+	if test -d .git; then						\
+	  git ls-files m4						\
+	     | grep -Ev '^m4/($(allow_AC_LIBOBJ_or))\.m4$$'		\
+	     | xargs grep '^ *AC_LIBOBJ('				\
+	    && { printf '%s\n' 'Do not use AC_LIBOBJ in m4/*.m4;'	\
+		 "see <$$url>"; exit 1; } || :;				\
+	else :; fi
+allow_AC_LIBOBJ_or = $(shell echo $(allow_AC_LIBOBJ) | tr -s ' ' '|')
+# Files in m4/ that (exceptionally) may use AC_LIBOBJ, without their ".m4"
+# suffix.
 allow_AC_LIBOBJ =	\
-  close			\
   dprintf		\
-  dup2			\
-  faccessat		\
-  fchdir		\
-  fclose		\
-  fcntl			\
   fprintf-posix		\
-  open			\
   printf-posix		\
   snprintf		\
   sprintf-posix		\
-  stdio_h		\
   termcap		\
   terminfo		\
   vasnprintf		\
@@ -106,18 +108,6 @@ allow_AC_LIBOBJ =	\
   vsnprintf		\
   vsprintf-posix
 
-allow_AC_LIBOBJ_or := $(shell echo $(allow_AC_LIBOBJ) | tr -s ' ' '|')
-
-sc_prohibit_AC_LIBOBJ_in_m4:
-	@url=https://lists.gnu.org/r/bug-gnulib/2011-06/msg00051.html; \
-	if test -d .git; then						\
-	  git ls-files m4						\
-	     | grep -Ev '^m4/($(allow_AC_LIBOBJ_or))\.m4$$'		\
-	     | xargs grep '^ *AC_LIBOBJ('				\
-	    && { printf '%s\n' 'Do not use AC_LIBOBJ in m4/*.m4;'	\
-		 "see <$$url>"; exit 1; } || :;				\
-	else :; fi
-
 sc_pragma_columns:
 	if test -d .git; then						\
 	  git ls-files|grep '\.in\.h$$'					\