aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--Makefile.in21
-rw-r--r--config.mk.in58
-rwxr-xr-xconfigure3
-rw-r--r--configure.ac1
-rw-r--r--src/common.mk.in43
-rw-r--r--src/libpostexecseccomp/Makefile.in7
-rw-r--r--src/libtrace/Makefile.in7
-rw-r--r--src/libtracelog/Makefile.in7
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 @@
13Makefile 13Makefile
14autom4te.cache/ 14autom4te.cache/
15config.log 15config.log
16config.mk
16config.status 17config.status
17firejail-*.tar.xz 18firejail-*.tar.xz
18firejail-login.5 19firejail-login.5
diff --git a/Makefile.in b/Makefile.in
index 18163d195..42ef2070f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,20 +1,4 @@
1prefix=@prefix@ 1include config.mk
2exec_prefix=@exec_prefix@
3bindir=@bindir@
4libdir=@libdir@
5datarootdir=@datarootdir@
6mandir=@mandir@
7sysconfdir=@sysconfdir@
8
9VERSION=@PACKAGE_VERSION@
10NAME=@PACKAGE_NAME@
11PACKAGE_TARNAME=@PACKAGE_TARNAME@
12DOCDIR=@docdir@
13HAVE_APPARMOR=@HAVE_APPARMOR@
14HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
15BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
16HAVE_SUID=@HAVE_SUID@
17HAVE_MAN=@HAVE_MAN@
18 2
19ifneq ($(HAVE_MAN),no) 3ifneq ($(HAVE_MAN),no)
20MAN_TARGET = man 4MAN_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
106realinstall: 90realinstall:
107 # firejail executable 91 # firejail executable
@@ -208,6 +192,7 @@ COPYING \
208Makefile.in \ 192Makefile.in \
209README \ 193README \
210RELNOTES \ 194RELNOTES \
195config.mk.in \
211configure \ 196configure \
212configure.ac \ 197configure.ac \
213contrib \ 198contrib \
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
8CC=@CC@
9prefix=@prefix@
10exec_prefix=@exec_prefix@
11bindir=@bindir@
12libdir=@libdir@
13datarootdir=@datarootdir@
14mandir=@mandir@
15sysconfdir=@sysconfdir@
16
17VERSION=@PACKAGE_VERSION@
18NAME=@PACKAGE_NAME@
19PACKAGE_TARNAME=@PACKAGE_TARNAME@
20DOCDIR=@docdir@
21HAVE_APPARMOR=@HAVE_APPARMOR@
22HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
23BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
24HAVE_SUID=@HAVE_SUID@
25HAVE_MAN=@HAVE_MAN@
26
27HAVE_CHROOT=@HAVE_CHROOT@
28HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
29HAVE_NETWORK=@HAVE_NETWORK@
30HAVE_USERNS=@HAVE_USERNS@
31HAVE_X11=@HAVE_X11@
32HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@
33HAVE_GLOBALCFG=@HAVE_GLOBALCFG@
34HAVE_APPARMOR=@HAVE_APPARMOR@
35HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
36HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
37HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
38HAVE_IDS=@HAVE_IDS@
39HAVE_GCOV=@HAVE_GCOV@
40HAVE_SELINUX=@HAVE_SELINUX@
41HAVE_SUID=@HAVE_SUID@
42HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
43HAVE_USERTMPFS=@HAVE_USERTMPFS@
44HAVE_OUTPUT=@HAVE_OUTPUT@
45HAVE_LTS=@HAVE_LTS@
46HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
47HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
48
49MANFLAGS = $(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
51CFLAGS=@CFLAGS@
52
53ifdef NO_EXTRA_CFLAGS
54else
55EXTRA_CFLAGS +=@EXTRA_CFLAGS@
56endif
57
58EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
diff --git a/configure b/configure
index c4d250c33..0b83a9ab0 100755
--- a/configure
+++ b/configure
@@ -4087,7 +4087,7 @@ fi
4087 4087
4088ac_config_files="$ac_config_files mkdeb.sh" 4088ac_config_files="$ac_config_files mkdeb.sh"
4089 4089
4090ac_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" 4090ac_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
4092cat >confcache <<\_ACEOF 4092cat >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
285AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) 285AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh])
286AC_CONFIG_FILES([ 286AC_CONFIG_FILES([
287Makefile 287Makefile
288config.mk
288src/bash_completion/Makefile 289src/bash_completion/Makefile
289src/common.mk 290src/common.mk
290src/fbuilder/Makefile 291src/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
3CC=@CC@ 5include $(ROOT)/config.mk
4prefix=@prefix@
5exec_prefix=@exec_prefix@
6bindir=@bindir@
7libdir=@libdir@
8sysconfdir=@sysconfdir@
9
10VERSION=@PACKAGE_VERSION@
11NAME=@PACKAGE_NAME@
12HAVE_CHROOT=@HAVE_CHROOT@
13HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
14HAVE_NETWORK=@HAVE_NETWORK@
15HAVE_USERNS=@HAVE_USERNS@
16HAVE_X11=@HAVE_X11@
17HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@
18HAVE_GLOBALCFG=@HAVE_GLOBALCFG@
19HAVE_APPARMOR=@HAVE_APPARMOR@
20HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
21HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
22HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
23HAVE_IDS=@HAVE_IDS@
24HAVE_GCOV=@HAVE_GCOV@
25HAVE_SELINUX=@HAVE_SELINUX@
26HAVE_SUID=@HAVE_SUID@
27HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
28HAVE_USERTMPFS=@HAVE_USERTMPFS@
29HAVE_OUTPUT=@HAVE_OUTPUT@
30HAVE_LTS=@HAVE_LTS@
31HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
32HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
33 6
34H_FILE_LIST = $(sort $(wildcard *.h)) 7H_FILE_LIST = $(sort $(wildcard *.h))
35C_FILE_LIST = $(sort $(wildcard *.c)) 8C_FILE_LIST = $(sort $(wildcard *.c))
36OBJS = $(C_FILE_LIST:.c=.o) 9OBJS = $(C_FILE_LIST:.c=.o)
37BINOBJS = $(foreach file, $(OBJS), $file) 10BINOBJS = $(foreach file, $(OBJS), $file)
38 11
39CFLAGS = @CFLAGS@
40CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) 12CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV)
41CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' 13CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"'
42MANFLAGS = $(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)
43CFLAGS += $(MANFLAGS) 14CFLAGS += $(MANFLAGS)
44CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security 15CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security
45LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now 16LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
46EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
47
48ifdef NO_EXTRA_CFLAGS
49else
50EXTRA_CFLAGS +=@EXTRA_CFLAGS@
51endif
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 @@
1CC=@CC@ 1ROOT = ../..
2PREFIX=@prefix@ 2include $(ROOT)/config.mk
3VERSION=@PACKAGE_VERSION@
4NAME=@PACKAGE_NAME@
5HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
6 3
7H_FILE_LIST = $(sort $(wildcard *.h)) 4H_FILE_LIST = $(sort $(wildcard *.h))
8C_FILE_LIST = $(sort $(wildcard *.c)) 5C_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 @@
1CC=@CC@ 1ROOT = ../..
2PREFIX=@prefix@ 2include $(ROOT)/config.mk
3VERSION=@PACKAGE_VERSION@
4NAME=@PACKAGE_NAME@
5HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
6 3
7H_FILE_LIST = $(sort $(wildcard *.h)) 4H_FILE_LIST = $(sort $(wildcard *.h))
8C_FILE_LIST = $(sort $(wildcard *.c)) 5C_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 @@
1CC=@CC@ 1ROOT = ../..
2PREFIX=@prefix@ 2include $(ROOT)/config.mk
3VERSION=@PACKAGE_VERSION@
4NAME=@PACKAGE_NAME@
5HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
6 3
7H_FILE_LIST = $(sort $(wildcard *.h)) 4H_FILE_LIST = $(sort $(wildcard *.h))
8C_FILE_LIST = $(sort $(wildcard *.c)) 5C_FILE_LIST = $(sort $(wildcard *.c))
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-19 20:59:56 +0000