diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-24 04:43:08 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-05-29 17:35:35 -0300 |
commit | fb11081becb80d681c2c8ab61125b42b12961314 (patch) | |
tree | 65ec3be0da6000b92dd65ef98b388e5636b8759d /src | |
parent | build: define CC/GAWK if undefined (diff) | |
download | firejail-fb11081becb80d681c2c8ab61125b42b12961314.tar.gz firejail-fb11081becb80d681c2c8ab61125b42b12961314.tar.zst firejail-fb11081becb80d681c2c8ab61125b42b12961314.zip |
build: allow overriding common tools
Tools:
* gzip
* install
* rm
* strip
* tar
For the programs not checked in configure.ac:
From the manual of GNU Autoconf (version 2.71):
> If you use `AC_PROG_INSTALL`, you must include `install-sh` in your
> distribution
So set `install` just in the Makefile. Use `$(RM)` to ensure that `-f`
is always used and to make it easier to spot when `-r` is used.
See commit 93d623fdf ("build: allow overriding certain tools",
2024-02-23) / PR #6222.
Diffstat (limited to 'src')
-rw-r--r-- | src/bash_completion/Makefile | 5 | ||||
-rw-r--r-- | src/man/Makefile | 8 | ||||
-rw-r--r-- | src/prog.mk | 3 | ||||
-rw-r--r-- | src/so.mk | 3 | ||||
-rw-r--r-- | src/zsh_completion/Makefile | 5 |
5 files changed, 15 insertions, 9 deletions
diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile index 91a1be0bc..c06323f64 100644 --- a/src/bash_completion/Makefile +++ b/src/bash_completion/Makefile | |||
@@ -3,6 +3,7 @@ ROOT = ../.. | |||
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | GAWK ?= gawk | 5 | GAWK ?= gawk |
6 | RM ?= rm -f | ||
6 | 7 | ||
7 | .PHONY: all | 8 | .PHONY: all |
8 | all: firejail.bash_completion | 9 | all: firejail.bash_completion |
@@ -10,8 +11,8 @@ all: firejail.bash_completion | |||
10 | firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk | 11 | firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk |
11 | $(GAWK) -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 12 | $(GAWK) -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |
12 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ | 13 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ |
13 | rm $@.tmp | 14 | $(RM) $@.tmp |
14 | 15 | ||
15 | .PHONY: clean | 16 | .PHONY: clean |
16 | clean: | 17 | clean: |
17 | rm -fr firejail.bash_completion | 18 | $(RM) -r firejail.bash_completion |
diff --git a/src/man/Makefile b/src/man/Makefile index 682aadaad..767920e2b 100644 --- a/src/man/Makefile +++ b/src/man/Makefile | |||
@@ -3,6 +3,8 @@ ROOT = ../.. | |||
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | GAWK ?= gawk | 5 | GAWK ?= gawk |
6 | GZIP ?= gzip | ||
7 | RM ?= rm -f | ||
6 | 8 | ||
7 | MOD_DIR := $(ROOT)/src/man | 9 | MOD_DIR := $(ROOT)/src/man |
8 | MANPAGES_IN := $(sort $(wildcard $(MOD_DIR)/*.in)) | 10 | MANPAGES_IN := $(sort $(wildcard $(MOD_DIR)/*.in)) |
@@ -21,8 +23,8 @@ $(MOD_DIR)/%: $(MOD_DIR)/%.in $(ROOT)/config.mk | |||
21 | # foo.1.gz: foo.1 | 23 | # foo.1.gz: foo.1 |
22 | $(MOD_DIR)/%.gz: $(MOD_DIR)/% | 24 | $(MOD_DIR)/%.gz: $(MOD_DIR)/% |
23 | @printf 'Generating %s from %s\n' $@ $< | 25 | @printf 'Generating %s from %s\n' $@ $< |
24 | @rm -f $@ | 26 | @$(RM) $@ |
25 | @gzip -n9 $< | 27 | @$(GZIP) -n9 $< |
26 | 28 | ||
27 | .PHONY: clean | 29 | .PHONY: clean |
28 | clean:; rm -f *.1 *.5 *.gz | 30 | clean:; $(RM) *.1 *.5 *.gz |
diff --git a/src/prog.mk b/src/prog.mk index 4f9309d8c..3e89a6ba8 100644 --- a/src/prog.mk +++ b/src/prog.mk | |||
@@ -6,6 +6,7 @@ | |||
6 | # define EXTRA_OBJS and extend CLEANFILES. | 6 | # define EXTRA_OBJS and extend CLEANFILES. |
7 | 7 | ||
8 | CC ?= cc | 8 | CC ?= cc |
9 | RM ?= rm -f | ||
9 | 10 | ||
10 | HDRS := | 11 | HDRS := |
11 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) | 12 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) |
@@ -27,4 +28,4 @@ $(PROG): $(OBJS) $(EXTRA_OBJS) $(ROOT)/config.mk | |||
27 | $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRA_OBJS) $(LIBS) | 28 | $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRA_OBJS) $(LIBS) |
28 | 29 | ||
29 | .PHONY: clean | 30 | .PHONY: clean |
30 | clean:; rm -fr $(PROG) $(CLEANFILES) | 31 | clean:; $(RM) -r $(PROG) $(CLEANFILES) |
@@ -6,6 +6,7 @@ | |||
6 | # EXTRA_OBJS and extend CLEANFILES. | 6 | # EXTRA_OBJS and extend CLEANFILES. |
7 | 7 | ||
8 | CC ?= cc | 8 | CC ?= cc |
9 | RM ?= rm -f | ||
9 | 10 | ||
10 | HDRS := | 11 | HDRS := |
11 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) | 12 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) |
@@ -27,4 +28,4 @@ $(SO): $(OBJS) $(EXTRA_OBJS) $(ROOT)/config.mk | |||
27 | $(CC) $(SO_LDFLAGS) -shared $(LDFLAGS) -o $@ $(OBJS) $(EXTRA_OBJS) -ldl | 28 | $(CC) $(SO_LDFLAGS) -shared $(LDFLAGS) -o $@ $(OBJS) $(EXTRA_OBJS) -ldl |
28 | 29 | ||
29 | .PHONY: clean | 30 | .PHONY: clean |
30 | clean:; rm -fr $(SO) $(CLEANFILES) | 31 | clean:; $(RM) -r $(SO) $(CLEANFILES) |
diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile index 80c8b1608..cbc476a73 100644 --- a/src/zsh_completion/Makefile +++ b/src/zsh_completion/Makefile | |||
@@ -3,6 +3,7 @@ ROOT = ../.. | |||
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | GAWK ?= gawk | 5 | GAWK ?= gawk |
6 | RM ?= rm -f | ||
6 | 7 | ||
7 | .PHONY: all | 8 | .PHONY: all |
8 | all: _firejail | 9 | all: _firejail |
@@ -10,8 +11,8 @@ all: _firejail | |||
10 | _firejail: _firejail.in $(ROOT)/config.mk | 11 | _firejail: _firejail.in $(ROOT)/config.mk |
11 | $(GAWK) -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 12 | $(GAWK) -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |
12 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ | 13 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ |
13 | rm $@.tmp | 14 | $(RM) $@.tmp |
14 | 15 | ||
15 | .PHONY: clean | 16 | .PHONY: clean |
16 | clean: | 17 | clean: |
17 | rm -fr _firejail | 18 | $(RM) -r _firejail |