From 7c2ef659cc98959b58f0c3f33c56176da4ed2bc0 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Wed, 3 Mar 2021 18:54:41 -0300 Subject: makefiles: replace character class with plain char MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using the "wildcard" internal functions. This usage has been present since the first "real" commit in the repository: commit 137985136 ("Baseline firejail 0.9.28"). > H_FILE_LIST = $(sort $(wildcard *.[h])) > C_FILE_LIST = $(sort $(wildcard *.c)) There is only a single character (i.e.: "h") inside the character class, so its usage should make no functional difference. It may stem from a construct that could have originally looked something like this: C_FILE_LIST = $(sort $(wildcard *.[ch])) Which would match both the implementation files and the headers. From Section 4.4, [Using Wildcard Characters in File Names][1] of the GNU make manual: > A single file name can specify many files using wildcard characters. > The wildcard characters in make are ‘*’, ‘?’ and ‘[…]’, the same as in > the Bourne shell. For example, *.c specifies a list of all the files > (in the working directory) whose names end in ‘.c’. See also Section 2.13, [Pattern Matching Notation][2] of POSIX.1-2017. Commands used to search, replace and clean up: $ find . -name .git -prune -o -type f \ \( -name Makefile -o -name Makefile.in \ -o -name '*.mk' -o -name '*.mk.in' \) -print0 | xargs -0 grep -Fl '$(wildcard *.[h])' | tr '\n' '\000' | xargs -0 sed -i.bak -e \ 's/\$(wildcard \*.\[h\])/$(wildcard *.h)/' $ find . -name .git -prune -o -type f \ -name '*.bak' -exec rm '{}' + Note: To make sure that this doesn't actually change anything functionally, I built firejail-git (AUR) on Artix from master and from this commit and diffing the resulting files produced no output (other than showing changes related to the build timestamps). Misc: Reference to the previous makefile-related changes: commit 2465f9248 ("makefiles: make all, clean and distclean PHONY") / https://github.com/netblue30/firejail/pull/4024 [1]: https://www.gnu.org/software/make/manual/html_node/Wildcards.html [2]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html --- src/libtrace/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libtrace/Makefile.in') diff --git a/src/libtrace/Makefile.in b/src/libtrace/Makefile.in index 095037569..804671ee2 100644 --- a/src/libtrace/Makefile.in +++ b/src/libtrace/Makefile.in @@ -4,7 +4,7 @@ VERSION=@PACKAGE_VERSION@ NAME=@PACKAGE_NAME@ HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ -H_FILE_LIST = $(sort $(wildcard *.[h])) +H_FILE_LIST = $(sort $(wildcard *.h)) C_FILE_LIST = $(sort $(wildcard *.c)) OBJS = $(C_FILE_LIST:.c=.o) BINOBJS = $(foreach file, $(OBJS), $file) -- cgit v1.2.3-54-g00ecf