diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-04 21:32:18 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-06-12 16:08:47 -0300 |
commit | aaada595539a2dbe66deed97343f1a738b40752c (patch) | |
tree | 4bbc2e8a32065088f06917430b5b0b3e7d62eeda | |
parent | makefiles: deduplicate configure-time vars into new config.mk.in (diff) | |
download | firejail-aaada595539a2dbe66deed97343f1a738b40752c.tar.gz firejail-aaada595539a2dbe66deed97343f1a738b40752c.tar.zst firejail-aaada595539a2dbe66deed97343f1a738b40752c.zip |
makefiles: include config.mk instead of common.mk where possible
common.mk contains definitions for building programs and it includes
config.mk.
Some makefiles that include common.mk do not contain any targets for
building programs. They depend only on configure-time variable
definitions (which are defined on config.mk) rather than anything
specific to common.mk. So change their includes of common.mk to
config.mk.
-rw-r--r-- | src/bash_completion/Makefile.in | 2 | ||||
-rw-r--r-- | src/man/Makefile.in | 2 | ||||
-rw-r--r-- | src/zsh_completion/Makefile.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bash_completion/Makefile.in b/src/bash_completion/Makefile.in index 750cd9524..69f35e7ae 100644 --- a/src/bash_completion/Makefile.in +++ b/src/bash_completion/Makefile.in | |||
@@ -2,7 +2,7 @@ | |||
2 | all: firejail.bash_completion | 2 | all: firejail.bash_completion |
3 | 3 | ||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/config.mk |
6 | 6 | ||
7 | firejail.bash_completion: firejail.bash_completion.in | 7 | firejail.bash_completion: firejail.bash_completion.in |
8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |
diff --git a/src/man/Makefile.in b/src/man/Makefile.in index 0bd7607ef..a63f9d28e 100644 --- a/src/man/Makefile.in +++ b/src/man/Makefile.in | |||
@@ -2,7 +2,7 @@ | |||
2 | all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man | 2 | all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man |
3 | 3 | ||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/config.mk |
6 | 6 | ||
7 | %.man: %.txt | 7 | %.man: %.txt |
8 | gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ | 8 | gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ |
diff --git a/src/zsh_completion/Makefile.in b/src/zsh_completion/Makefile.in index 9ca12e92b..fceab1d00 100644 --- a/src/zsh_completion/Makefile.in +++ b/src/zsh_completion/Makefile.in | |||
@@ -2,7 +2,7 @@ | |||
2 | all: _firejail | 2 | all: _firejail |
3 | 3 | ||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/config.mk |
6 | 6 | ||
7 | _firejail: _firejail.in | 7 | _firejail: _firejail.in |
8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |