diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-21 12:14:44 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-21 12:22:10 -0300 |
| commit | 6ece8cec3d1327872bd655899ccb34f92f911608 (patch) | |
| tree | 7af7fa201ff4e20e1ec2ae47018505a65375de24 | |
| parent | Merge pull request #5859 from kmk3/build-remove-retpoline (diff) | |
| download | firejail-6ece8cec3d1327872bd655899ccb34f92f911608.tar.gz firejail-6ece8cec3d1327872bd655899ccb34f92f911608.tar.zst firejail-6ece8cec3d1327872bd655899ccb34f92f911608.zip | |
build: standardize commands on top of makefiles
To make the makefiles look more similar.
| -rw-r--r-- | src/bash_completion/Makefile | 6 | ||||
| -rw-r--r-- | src/man/Makefile | 6 | ||||
| -rw-r--r-- | src/zsh_completion/Makefile | 6 | ||||
| -rw-r--r-- | test/Makefile | 3 |
4 files changed, 12 insertions, 9 deletions
diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile index e787a7b92..bd447857e 100644 --- a/src/bash_completion/Makefile +++ b/src/bash_completion/Makefile | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | .PHONY: all | ||
| 2 | all: firejail.bash_completion | ||
| 3 | |||
| 4 | ROOT = ../.. | 1 | ROOT = ../.. |
| 5 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
| 6 | 3 | ||
| 4 | .PHONY: all | ||
| 5 | all: firejail.bash_completion | ||
| 6 | |||
| 7 | firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk | 7 | firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk |
| 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |
| 9 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ | 9 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ |
diff --git a/src/man/Makefile b/src/man/Makefile index 283822d1f..bff4c30d0 100644 --- a/src/man/Makefile +++ b/src/man/Makefile | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | .PHONY: all | ||
| 2 | all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man | ||
| 3 | |||
| 4 | ROOT = ../.. | 1 | ROOT = ../.. |
| 5 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
| 6 | 3 | ||
| 4 | .PHONY: all | ||
| 5 | all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man | ||
| 6 | |||
| 7 | %.man: %.txt $(ROOT)/config.mk | 7 | %.man: %.txt $(ROOT)/config.mk |
| 8 | gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ | 8 | gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ |
| 9 | 9 | ||
diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile index d7bc1038a..c68ed2d72 100644 --- a/src/zsh_completion/Makefile +++ b/src/zsh_completion/Makefile | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | .PHONY: all | ||
| 2 | all: _firejail | ||
| 3 | |||
| 4 | ROOT = ../.. | 1 | ROOT = ../.. |
| 5 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
| 6 | 3 | ||
| 4 | .PHONY: all | ||
| 5 | all: _firejail | ||
| 6 | |||
| 7 | _firejail: _firejail.in $(ROOT)/config.mk | 7 | _firejail: _firejail.in $(ROOT)/config.mk |
| 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |
| 9 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ | 9 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ |
diff --git a/test/Makefile b/test/Makefile index 2c376da58..2f023b8b1 100644 --- a/test/Makefile +++ b/test/Makefile | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | ROOT = .. | ||
| 2 | -include $(ROOT)/config.mk | ||
| 3 | |||
| 1 | TESTS=$(patsubst %/,%,$(wildcard */)) | 4 | TESTS=$(patsubst %/,%,$(wildcard */)) |
| 2 | 5 | ||
| 3 | .PHONY: $(TESTS) | 6 | .PHONY: $(TESTS) |