diff options
author | Topi Miettinen <toiwoton@gmail.com> | 2020-04-11 10:56:55 +0300 |
---|---|---|
committer | Topi Miettinen <toiwoton@gmail.com> | 2020-04-11 10:56:55 +0300 |
commit | d8fa95f30561054afd062095604188c596c851ff (patch) | |
tree | 7fbb710d07608eb54406cc07b560a2c6a441ac6e | |
parent | Fix build with --enable-fatal-warnings (diff) | |
download | firejail-d8fa95f30561054afd062095604188c596c851ff.tar.gz firejail-d8fa95f30561054afd062095604188c596c851ff.tar.zst firejail-d8fa95f30561054afd062095604188c596c851ff.zip |
Move autoconfigured lines up in Makefile.in
Move autoconfigured lines up in Makefile.in so that they are defined
before they are used .
Closes #3341 #3344.
-rw-r--r-- | Makefile.in | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 98ce3bb1a..0a0715023 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,15 +1,3 @@ | |||
1 | all: all_items man filters | ||
2 | APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon | ||
3 | SBOX_APPS = src/faudit/faudit src/fbuilder/fbuilder src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter src/ftee/ftee | ||
4 | MYDIRS = src/lib src/profstats | ||
5 | MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so | ||
6 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 | ||
7 | ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP) | ||
8 | SBOX_APPS += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp | ||
9 | SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 | ||
10 | endif | ||
11 | ALL_ITEMS = $(APPS) $(SBOX_APPS) $(MYLIBS) | ||
12 | |||
13 | prefix=@prefix@ | 1 | prefix=@prefix@ |
14 | exec_prefix=@exec_prefix@ | 2 | exec_prefix=@exec_prefix@ |
15 | bindir=@bindir@ | 3 | bindir=@bindir@ |
@@ -28,6 +16,18 @@ HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ | |||
28 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ | 16 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ |
29 | HAVE_SUID=@HAVE_SUID@ | 17 | HAVE_SUID=@HAVE_SUID@ |
30 | 18 | ||
19 | all: all_items man filters | ||
20 | APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon | ||
21 | SBOX_APPS = src/faudit/faudit src/fbuilder/fbuilder src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter src/ftee/ftee | ||
22 | MYDIRS = src/lib src/profstats | ||
23 | MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so | ||
24 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 | ||
25 | ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP) | ||
26 | SBOX_APPS += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp | ||
27 | SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 | ||
28 | endif | ||
29 | ALL_ITEMS = $(APPS) $(SBOX_APPS) $(MYLIBS) | ||
30 | |||
31 | .PHONY: apps filters man mylibs | 31 | .PHONY: apps filters man mylibs |
32 | all_items: $(ALL_ITEMS) | 32 | all_items: $(ALL_ITEMS) |
33 | $(ALL_ITEMS): | 33 | $(ALL_ITEMS): |