diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.in | 21 | ||||
-rw-r--r-- | config.mk.in | 58 | ||||
-rwxr-xr-x | configure | 3 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/common.mk.in | 43 | ||||
-rw-r--r-- | src/libpostexecseccomp/Makefile.in | 7 | ||||
-rw-r--r-- | src/libtrace/Makefile.in | 7 | ||||
-rw-r--r-- | src/libtracelog/Makefile.in | 7 |
9 files changed, 75 insertions, 73 deletions
diff --git a/.gitignore b/.gitignore index 756918943..d5716f157 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -13,6 +13,7 @@ | |||
13 | Makefile | 13 | Makefile |
14 | autom4te.cache/ | 14 | autom4te.cache/ |
15 | config.log | 15 | config.log |
16 | config.mk | ||
16 | config.status | 17 | config.status |
17 | firejail-*.tar.xz | 18 | firejail-*.tar.xz |
18 | firejail-login.5 | 19 | firejail-login.5 |
diff --git a/Makefile.in b/Makefile.in index 18163d195..42ef2070f 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,20 +1,4 @@ | |||
1 | prefix=@prefix@ | 1 | include config.mk |
2 | exec_prefix=@exec_prefix@ | ||
3 | bindir=@bindir@ | ||
4 | libdir=@libdir@ | ||
5 | datarootdir=@datarootdir@ | ||
6 | mandir=@mandir@ | ||
7 | sysconfdir=@sysconfdir@ | ||
8 | |||
9 | VERSION=@PACKAGE_VERSION@ | ||
10 | NAME=@PACKAGE_NAME@ | ||
11 | PACKAGE_TARNAME=@PACKAGE_TARNAME@ | ||
12 | DOCDIR=@docdir@ | ||
13 | HAVE_APPARMOR=@HAVE_APPARMOR@ | ||
14 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ | ||
15 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ | ||
16 | HAVE_SUID=@HAVE_SUID@ | ||
17 | HAVE_MAN=@HAVE_MAN@ | ||
18 | 2 | ||
19 | ifneq ($(HAVE_MAN),no) | 3 | ifneq ($(HAVE_MAN),no) |
20 | MAN_TARGET = man | 4 | MAN_TARGET = man |
@@ -101,7 +85,7 @@ distclean: clean | |||
101 | $(MAKE) -C $$dir distclean; \ | 85 | $(MAKE) -C $$dir distclean; \ |
102 | done | 86 | done |
103 | $(MAKE) -C test distclean | 87 | $(MAKE) -C test distclean |
104 | rm -fr Makefile autom4te.cache config.log config.status src/common.mk mkdeb.sh | 88 | rm -fr Makefile autom4te.cache config.log config.mk config.status src/common.mk mkdeb.sh |
105 | 89 | ||
106 | realinstall: | 90 | realinstall: |
107 | # firejail executable | 91 | # firejail executable |
@@ -208,6 +192,7 @@ COPYING \ | |||
208 | Makefile.in \ | 192 | Makefile.in \ |
209 | README \ | 193 | README \ |
210 | RELNOTES \ | 194 | RELNOTES \ |
195 | config.mk.in \ | ||
211 | configure \ | 196 | configure \ |
212 | configure.ac \ | 197 | configure.ac \ |
213 | contrib \ | 198 | contrib \ |
diff --git a/config.mk.in b/config.mk.in new file mode 100644 index 000000000..e76b7ac34 --- /dev/null +++ b/config.mk.in | |||
@@ -0,0 +1,58 @@ | |||
1 | # Configure-time variable definitions and any other common definition that can | ||
2 | # be safely included by all makefiles. | ||
3 | # | ||
4 | # Note: Do not define any targets on this file, as that could potentially end | ||
5 | # up overriding the includer's intended default target (which by default is the | ||
6 | # first target encountered). | ||
7 | |||
8 | CC=@CC@ | ||
9 | prefix=@prefix@ | ||
10 | exec_prefix=@exec_prefix@ | ||
11 | bindir=@bindir@ | ||
12 | libdir=@libdir@ | ||
13 | datarootdir=@datarootdir@ | ||
14 | mandir=@mandir@ | ||
15 | sysconfdir=@sysconfdir@ | ||
16 | |||
17 | VERSION=@PACKAGE_VERSION@ | ||
18 | NAME=@PACKAGE_NAME@ | ||
19 | PACKAGE_TARNAME=@PACKAGE_TARNAME@ | ||
20 | DOCDIR=@docdir@ | ||
21 | HAVE_APPARMOR=@HAVE_APPARMOR@ | ||
22 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ | ||
23 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ | ||
24 | HAVE_SUID=@HAVE_SUID@ | ||
25 | HAVE_MAN=@HAVE_MAN@ | ||
26 | |||
27 | HAVE_CHROOT=@HAVE_CHROOT@ | ||
28 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
29 | HAVE_NETWORK=@HAVE_NETWORK@ | ||
30 | HAVE_USERNS=@HAVE_USERNS@ | ||
31 | HAVE_X11=@HAVE_X11@ | ||
32 | HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@ | ||
33 | HAVE_GLOBALCFG=@HAVE_GLOBALCFG@ | ||
34 | HAVE_APPARMOR=@HAVE_APPARMOR@ | ||
35 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ | ||
36 | HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@ | ||
37 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | ||
38 | HAVE_IDS=@HAVE_IDS@ | ||
39 | HAVE_GCOV=@HAVE_GCOV@ | ||
40 | HAVE_SELINUX=@HAVE_SELINUX@ | ||
41 | HAVE_SUID=@HAVE_SUID@ | ||
42 | HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ | ||
43 | HAVE_USERTMPFS=@HAVE_USERTMPFS@ | ||
44 | HAVE_OUTPUT=@HAVE_OUTPUT@ | ||
45 | HAVE_LTS=@HAVE_LTS@ | ||
46 | HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@ | ||
47 | HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@ | ||
48 | |||
49 | MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES) | ||
50 | |||
51 | CFLAGS=@CFLAGS@ | ||
52 | |||
53 | ifdef NO_EXTRA_CFLAGS | ||
54 | else | ||
55 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | ||
56 | endif | ||
57 | |||
58 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | ||
@@ -4087,7 +4087,7 @@ fi | |||
4087 | 4087 | ||
4088 | ac_config_files="$ac_config_files mkdeb.sh" | 4088 | ac_config_files="$ac_config_files mkdeb.sh" |
4089 | 4089 | ||
4090 | ac_config_files="$ac_config_files Makefile src/bash_completion/Makefile src/common.mk src/fbuilder/Makefile src/fcopy/Makefile src/fids/Makefile src/firecfg/Makefile src/firejail/Makefile src/firemon/Makefile src/fldd/Makefile src/fnet/Makefile src/fnetfilter/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile src/fnettrace/Makefile src/fsec-optimize/Makefile src/fsec-print/Makefile src/fseccomp/Makefile src/ftee/Makefile src/fzenity/Makefile src/jailcheck/Makefile src/lib/Makefile src/libpostexecseccomp/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/man/Makefile src/profstats/Makefile src/zsh_completion/Makefile test/Makefile" | 4090 | ac_config_files="$ac_config_files Makefile config.mk src/bash_completion/Makefile src/common.mk src/fbuilder/Makefile src/fcopy/Makefile src/fids/Makefile src/firecfg/Makefile src/firejail/Makefile src/firemon/Makefile src/fldd/Makefile src/fnet/Makefile src/fnetfilter/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile src/fnettrace/Makefile src/fsec-optimize/Makefile src/fsec-print/Makefile src/fseccomp/Makefile src/ftee/Makefile src/fzenity/Makefile src/jailcheck/Makefile src/lib/Makefile src/libpostexecseccomp/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/man/Makefile src/profstats/Makefile src/zsh_completion/Makefile test/Makefile" |
4091 | 4091 | ||
4092 | cat >confcache <<\_ACEOF | 4092 | cat >confcache <<\_ACEOF |
4093 | # This file is a shell script that caches the results of configure | 4093 | # This file is a shell script that caches the results of configure |
@@ -4797,6 +4797,7 @@ do | |||
4797 | case $ac_config_target in | 4797 | case $ac_config_target in |
4798 | "mkdeb.sh") CONFIG_FILES="$CONFIG_FILES mkdeb.sh" ;; | 4798 | "mkdeb.sh") CONFIG_FILES="$CONFIG_FILES mkdeb.sh" ;; |
4799 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 4799 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
4800 | "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; | ||
4800 | "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;; | 4801 | "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;; |
4801 | "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; | 4802 | "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; |
4802 | "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;; | 4803 | "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;; |
diff --git a/configure.ac b/configure.ac index 88ee7bca1..d61f87b97 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -285,6 +285,7 @@ fi | |||
285 | AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) | 285 | AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) |
286 | AC_CONFIG_FILES([ | 286 | AC_CONFIG_FILES([ |
287 | Makefile | 287 | Makefile |
288 | config.mk | ||
288 | src/bash_completion/Makefile | 289 | src/bash_completion/Makefile |
289 | src/common.mk | 290 | src/common.mk |
290 | src/fbuilder/Makefile | 291 | src/fbuilder/Makefile |
diff --git a/src/common.mk.in b/src/common.mk.in index 8c83e372b..2b87c33f0 100644 --- a/src/common.mk.in +++ b/src/common.mk.in | |||
@@ -1,51 +1,16 @@ | |||
1 | # Common definitions for building C programs and non-shared objects | 1 | # Common definitions for building C programs and non-shared objects. |
2 | # | ||
3 | # Note: "ROOT" must be defined before including this file. | ||
2 | 4 | ||
3 | CC=@CC@ | 5 | include $(ROOT)/config.mk |
4 | prefix=@prefix@ | ||
5 | exec_prefix=@exec_prefix@ | ||
6 | bindir=@bindir@ | ||
7 | libdir=@libdir@ | ||
8 | sysconfdir=@sysconfdir@ | ||
9 | |||
10 | VERSION=@PACKAGE_VERSION@ | ||
11 | NAME=@PACKAGE_NAME@ | ||
12 | HAVE_CHROOT=@HAVE_CHROOT@ | ||
13 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
14 | HAVE_NETWORK=@HAVE_NETWORK@ | ||
15 | HAVE_USERNS=@HAVE_USERNS@ | ||
16 | HAVE_X11=@HAVE_X11@ | ||
17 | HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@ | ||
18 | HAVE_GLOBALCFG=@HAVE_GLOBALCFG@ | ||
19 | HAVE_APPARMOR=@HAVE_APPARMOR@ | ||
20 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ | ||
21 | HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@ | ||
22 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | ||
23 | HAVE_IDS=@HAVE_IDS@ | ||
24 | HAVE_GCOV=@HAVE_GCOV@ | ||
25 | HAVE_SELINUX=@HAVE_SELINUX@ | ||
26 | HAVE_SUID=@HAVE_SUID@ | ||
27 | HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ | ||
28 | HAVE_USERTMPFS=@HAVE_USERTMPFS@ | ||
29 | HAVE_OUTPUT=@HAVE_OUTPUT@ | ||
30 | HAVE_LTS=@HAVE_LTS@ | ||
31 | HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@ | ||
32 | HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@ | ||
33 | 6 | ||
34 | H_FILE_LIST = $(sort $(wildcard *.h)) | 7 | H_FILE_LIST = $(sort $(wildcard *.h)) |
35 | C_FILE_LIST = $(sort $(wildcard *.c)) | 8 | C_FILE_LIST = $(sort $(wildcard *.c)) |
36 | OBJS = $(C_FILE_LIST:.c=.o) | 9 | OBJS = $(C_FILE_LIST:.c=.o) |
37 | BINOBJS = $(foreach file, $(OBJS), $file) | 10 | BINOBJS = $(foreach file, $(OBJS), $file) |
38 | 11 | ||
39 | CFLAGS = @CFLAGS@ | ||
40 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) | 12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) |
41 | CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' | 13 | CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' |
42 | MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES) | ||
43 | CFLAGS += $(MANFLAGS) | 14 | CFLAGS += $(MANFLAGS) |
44 | CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security | 15 | CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security |
45 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | 16 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now |
46 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | ||
47 | |||
48 | ifdef NO_EXTRA_CFLAGS | ||
49 | else | ||
50 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | ||
51 | endif | ||
diff --git a/src/libpostexecseccomp/Makefile.in b/src/libpostexecseccomp/Makefile.in index c08ae78ce..6f354757c 100644 --- a/src/libpostexecseccomp/Makefile.in +++ b/src/libpostexecseccomp/Makefile.in | |||
@@ -1,8 +1,5 @@ | |||
1 | CC=@CC@ | 1 | ROOT = ../.. |
2 | PREFIX=@prefix@ | 2 | include $(ROOT)/config.mk |
3 | VERSION=@PACKAGE_VERSION@ | ||
4 | NAME=@PACKAGE_NAME@ | ||
5 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
6 | 3 | ||
7 | H_FILE_LIST = $(sort $(wildcard *.h)) | 4 | H_FILE_LIST = $(sort $(wildcard *.h)) |
8 | C_FILE_LIST = $(sort $(wildcard *.c)) | 5 | C_FILE_LIST = $(sort $(wildcard *.c)) |
diff --git a/src/libtrace/Makefile.in b/src/libtrace/Makefile.in index 804671ee2..ced036865 100644 --- a/src/libtrace/Makefile.in +++ b/src/libtrace/Makefile.in | |||
@@ -1,8 +1,5 @@ | |||
1 | CC=@CC@ | 1 | ROOT = ../.. |
2 | PREFIX=@prefix@ | 2 | include $(ROOT)/config.mk |
3 | VERSION=@PACKAGE_VERSION@ | ||
4 | NAME=@PACKAGE_NAME@ | ||
5 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
6 | 3 | ||
7 | H_FILE_LIST = $(sort $(wildcard *.h)) | 4 | H_FILE_LIST = $(sort $(wildcard *.h)) |
8 | C_FILE_LIST = $(sort $(wildcard *.c)) | 5 | C_FILE_LIST = $(sort $(wildcard *.c)) |
diff --git a/src/libtracelog/Makefile.in b/src/libtracelog/Makefile.in index aea1b11f2..52d4bcb08 100644 --- a/src/libtracelog/Makefile.in +++ b/src/libtracelog/Makefile.in | |||
@@ -1,8 +1,5 @@ | |||
1 | CC=@CC@ | 1 | ROOT = ../.. |
2 | PREFIX=@prefix@ | 2 | include $(ROOT)/config.mk |
3 | VERSION=@PACKAGE_VERSION@ | ||
4 | NAME=@PACKAGE_NAME@ | ||
5 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
6 | 3 | ||
7 | H_FILE_LIST = $(sort $(wildcard *.h)) | 4 | H_FILE_LIST = $(sort $(wildcard *.h)) |
8 | C_FILE_LIST = $(sort $(wildcard *.c)) | 5 | C_FILE_LIST = $(sort $(wildcard *.c)) |