Skip to content

Commit 331a434

Browse files
committed
build: disable most implicit make rules (.SUFFIXES)
To reduce unnecessary filesystem lookups. Overall, this appears to reduce the amount of implicit rule searches by ~62% for the default build and by ~96% for the "man" target (as an example): $ git checkout master >/dev/null 2>&1 $ git show --pretty='%h %ai %s' -s a8f01a3 2023-06-20 05:26:23 +0000 Merge pull request #5859 from kmk3/build-remove-retpoline $ ./configure >/dev/null $ make clean >/dev/null && make --debug=i -j 4 | grep -F 'Trying implicit' | wc -l 6798 $ make clean >/dev/null && make --debug=i -j 4 man | grep -F 'Trying implicit' | wc -l 1085 # (with this commit applied) $ make clean >/dev/null && make --debug=i -j 4 | grep -F 'Trying implicit' | wc -l 2535 $ make clean >/dev/null && make --debug=i -j 4 man | grep -F 'Trying implicit' | wc -l 42 Environment: GNU make 4.4.1-2 on Artix Linux. Commands used to search and replace: $ git ls-files -z -- '*Makefile*' | xargs -0 -I '{}' sh -c \ "printf '%s\n' \"\$(sed '1s/^/.SUFFIXES:\n/' '{}')\" >'{}'" See also commit f48886f ("build: mark most phony targets as such", 2023-02-01) / PR #5637.
1 parent a8f01a3 commit 331a434

File tree

30 files changed

+30
-0
lines changed

30 files changed

+30
-0
lines changed

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = .
23
-include config.mk
34

src/bash_completion/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
.PHONY: all
23
all: firejail.bash_completion
34

src/etc-cleanup/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fbuilder/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fcopy/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fids/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/firecfg/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/firejail/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/firemon/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fldd/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fnet/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fnetfilter/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fnettrace-dns/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fnettrace-icmp/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fnettrace-sni/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fnettrace/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fsec-optimize/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fsec-print/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fseccomp/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/ftee/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/fzenity/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/jailcheck/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/lib/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/libpostexecseccomp/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/libtrace/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/libtracelog/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/man/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
.PHONY: all
23
all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man
34

src/profstats/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
ROOT = ../..
23
-include $(ROOT)/config.mk
34

src/zsh_completion/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
.PHONY: all
23
all: _firejail
34

test/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.SUFFIXES:
12
TESTS=$(patsubst %/,%,$(wildcard */))
23

34
.PHONY: $(TESTS)

0 commit comments

Comments
 (0)