aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-01-25 13:09:38 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-01-27 02:47:21 -0300
commitfab675241bde7946c2eebab4cff0145b8a8ccdac (patch)
tree039013c526726f69c86a3c17a80fe1b9ed3cc8a5 /Makefile
parentbuild: run commands silently on config targets (diff)
downloadfirejail-fab675241bde7946c2eebab4cff0145b8a8ccdac.tar.gz
firejail-fab675241bde7946c2eebab4cff0145b8a8ccdac.tar.zst
firejail-fab675241bde7946c2eebab4cff0145b8a8ccdac.zip
build: move man page targets to after seccomp filters
The seccomp filters are used by firejail itself at runtime (and are installed to `$(libdir)`), while the man pages are used by an external program (and installing them is optional; see `HAVE_MAN`), so reorder them. Misc: The seccomp filter targets were apparently added on commit 64431c712 ("seccomp work 1", 2016-11-20).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index a412aa767..4809b4b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,12 @@ SBOX_APPS_NON_DUMPABLE += src/fnettrace-icmp/fnettrace-icmp
17MYDIRS = src/lib $(MAN_SRC) $(COMPLETIONDIRS) 17MYDIRS = src/lib $(MAN_SRC) $(COMPLETIONDIRS)
18MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so 18MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so
19COMPLETIONS = src/zsh_completion/_firejail src/bash_completion/firejail.bash_completion 19COMPLETIONS = src/zsh_completion/_firejail src/bash_completion/firejail.bash_completion
20MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 jailcheck.1
21SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 20SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32
21MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 jailcheck.1
22ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS) 22ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS)
23 23
24.PHONY: all 24.PHONY: all
25all: all_items mydirs $(MAN_TARGET) filters 25all: all_items mydirs filters $(MAN_TARGET)
26 26
27config.mk config.sh: 27config.mk config.sh:
28 @printf 'error: run ./configure to generate %s\n' "$@" >&2 28 @printf 'error: run ./configure to generate %s\n' "$@" >&2
@@ -38,11 +38,6 @@ mydirs: $(MYDIRS)
38$(MYDIRS): 38$(MYDIRS):
39 $(MAKE) -C $@ 39 $(MAKE) -C $@
40 40
41$(MANPAGES): src/man config.mk
42 ./mkman.sh $(VERSION) src/man/$(basename $@).man $@
43
44man: $(MANPAGES)
45
46filters: $(SECCOMP_FILTERS) $(SBOX_APPS_NON_DUMPABLE) 41filters: $(SECCOMP_FILTERS) $(SBOX_APPS_NON_DUMPABLE)
47seccomp: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize 42seccomp: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize
48 src/fseccomp/fseccomp default seccomp 43 src/fseccomp/fseccomp default seccomp
@@ -65,14 +60,19 @@ seccomp.mdwx: src/fseccomp/fseccomp
65seccomp.mdwx.32: src/fseccomp/fseccomp 60seccomp.mdwx.32: src/fseccomp/fseccomp
66 src/fseccomp/fseccomp memory-deny-write-execute.32 seccomp.mdwx.32 61 src/fseccomp/fseccomp memory-deny-write-execute.32 seccomp.mdwx.32
67 62
63$(MANPAGES): src/man config.mk
64 ./mkman.sh $(VERSION) src/man/$(basename $@).man $@
65
66man: $(MANPAGES)
67
68.PHONY: clean 68.PHONY: clean
69clean: 69clean:
70 for dir in $$(dirname $(ALL_ITEMS)) $(MYDIRS); do \ 70 for dir in $$(dirname $(ALL_ITEMS)) $(MYDIRS); do \
71 $(MAKE) -C $$dir clean; \ 71 $(MAKE) -C $$dir clean; \
72 done 72 done
73 $(MAKE) -C test clean 73 $(MAKE) -C test clean
74 rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm
75 rm -f $(SECCOMP_FILTERS) 74 rm -f $(SECCOMP_FILTERS)
75 rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm
76 rm -f test/utils/index.html* 76 rm -f test/utils/index.html*
77 rm -f test/utils/wget-log 77 rm -f test/utils/wget-log
78 rm -f test/utils/firejail-test-file* 78 rm -f test/utils/firejail-test-file*