diff options
-rw-r--r-- | Makefile.in | 8 | ||||
-rwxr-xr-x | configure | 23 | ||||
-rw-r--r-- | configure.ac | 15 | ||||
-rw-r--r-- | src/firejail/Makefile.in | 5 | ||||
-rw-r--r-- | src/firemon/Makefile.in | 11 | ||||
-rw-r--r-- | src/fnet/Makefile.in | 8 | ||||
-rw-r--r-- | src/fseccomp/Makefile.in | 8 | ||||
-rw-r--r-- | src/ftee/Makefile.in | 8 |
8 files changed, 68 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index 86acc206c..bc9f20bd0 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -39,6 +39,7 @@ clean: | |||
39 | for dir in $(APPS) $(MYLIBS); do \ | 39 | for dir in $(APPS) $(MYLIBS); do \ |
40 | $(MAKE) -C $$dir clean; \ | 40 | $(MAKE) -C $$dir clean; \ |
41 | done | 41 | done |
42 | rm -fr gcov-file gcov-dir | ||
42 | rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm | 43 | rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm |
43 | rm -f test/utils/index.html* | 44 | rm -f test/utils/index.html* |
44 | rm -f test/utils/wget-log | 45 | rm -f test/utils/wget-log |
@@ -222,3 +223,10 @@ test-fs: | |||
222 | 223 | ||
223 | test: test-profiles test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters | 224 | test: test-profiles test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters |
224 | echo "TEST COMPLETE" | 225 | echo "TEST COMPLETE" |
226 | |||
227 | gcov:; | ||
228 | lcov --capture -d src/firejail -d src/firemon -d src/fseccomp -d src/fnet -d src/ftee --output-file gcov-file | ||
229 | rm -fr gcov-dir | ||
230 | genhtml gcov-file --output-directory gcov-dir | ||
231 | |||
232 | \ No newline at end of file | ||
@@ -625,6 +625,7 @@ ac_includes_default="\ | |||
625 | ac_subst_vars='LTLIBOBJS | 625 | ac_subst_vars='LTLIBOBJS |
626 | LIBOBJS | 626 | LIBOBJS |
627 | HAVE_SECCOMP_H | 627 | HAVE_SECCOMP_H |
628 | HAVE_GCOV | ||
628 | BUSYBOX_WORKAROUND | 629 | BUSYBOX_WORKAROUND |
629 | HAVE_FATAL_WARNINGS | 630 | HAVE_FATAL_WARNINGS |
630 | HAVE_WHITELIST | 631 | HAVE_WHITELIST |
@@ -709,6 +710,7 @@ enable_file_transfer | |||
709 | enable_whitelist | 710 | enable_whitelist |
710 | enable_fatal_warnings | 711 | enable_fatal_warnings |
711 | enable_busybox_workaround | 712 | enable_busybox_workaround |
713 | enable_gcov | ||
712 | ' | 714 | ' |
713 | ac_precious_vars='build_alias | 715 | ac_precious_vars='build_alias |
714 | host_alias | 716 | host_alias |
@@ -1346,6 +1348,7 @@ Optional Features: | |||
1346 | --enable-fatal-warnings -W -Wall -Werror | 1348 | --enable-fatal-warnings -W -Wall -Werror |
1347 | --enable-busybox-workaround | 1349 | --enable-busybox-workaround |
1348 | enable busybox workaround | 1350 | enable busybox workaround |
1351 | --enable-gcov Gcov instrumentation | ||
1349 | 1352 | ||
1350 | Some influential environment variables: | 1353 | Some influential environment variables: |
1351 | CC C compiler command | 1354 | CC C compiler command |
@@ -3508,7 +3511,7 @@ fi | |||
3508 | fi | 3511 | fi |
3509 | if test "x$enable_apparmor" = "xyes"; then : | 3512 | if test "x$enable_apparmor" = "xyes"; then : |
3510 | 3513 | ||
3511 | EXTRA_LDFLAGS="-lapparmor" | 3514 | EXTRA_LDFLAGS+="-lapparmor " |
3512 | 3515 | ||
3513 | fi | 3516 | fi |
3514 | 3517 | ||
@@ -3693,6 +3696,21 @@ if test "x$enable_busybox_workaround" = "xyes"; then : | |||
3693 | fi | 3696 | fi |
3694 | 3697 | ||
3695 | 3698 | ||
3699 | HAVE_GCOV="" | ||
3700 | # Check whether --enable-gcov was given. | ||
3701 | if test "${enable_gcov+set}" = set; then : | ||
3702 | enableval=$enable_gcov; | ||
3703 | fi | ||
3704 | |||
3705 | if test "x$enable_gcov" = "xyes"; then : | ||
3706 | |||
3707 | HAVE_GCOV="--coverage " | ||
3708 | EXTRA_LDFLAGS+="-lgcov --coverage " | ||
3709 | |||
3710 | |||
3711 | fi | ||
3712 | |||
3713 | |||
3696 | 3714 | ||
3697 | # checking pthread library | 3715 | # checking pthread library |
3698 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 | 3716 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 |
@@ -4954,7 +4972,8 @@ echo " file transfer support: $HAVE_FILE_TRANSFER" | |||
4954 | echo " overlayfs support: $HAVE_OVERLAYFS" | 4972 | echo " overlayfs support: $HAVE_OVERLAYFS" |
4955 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 4973 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
4956 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 4974 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
4957 | printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 4975 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
4976 | echo " Gcov instrumentation: $HAVE_GCOV" | ||
4958 | echo | 4977 | echo |
4959 | 4978 | ||
4960 | 4979 | ||
diff --git a/configure.ac b/configure.ac index 9e7680d7d..e05c023f7 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -22,7 +22,7 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [ | |||
22 | [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )]) | 22 | [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )]) |
23 | ]) | 23 | ]) |
24 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 24 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
25 | EXTRA_LDFLAGS="-lapparmor" | 25 | EXTRA_LDFLAGS+="-lapparmor " |
26 | ]) | 26 | ]) |
27 | AC_SUBST([EXTRA_LDFLAGS]) | 27 | AC_SUBST([EXTRA_LDFLAGS]) |
28 | 28 | ||
@@ -136,6 +136,16 @@ AS_IF([test "x$enable_busybox_workaround" = "xyes"], [ | |||
136 | ]) | 136 | ]) |
137 | 137 | ||
138 | 138 | ||
139 | HAVE_GCOV="" | ||
140 | AC_ARG_ENABLE([gcov], | ||
141 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) | ||
142 | AS_IF([test "x$enable_gcov" = "xyes"], [ | ||
143 | HAVE_GCOV="--coverage " | ||
144 | EXTRA_LDFLAGS+="-lgcov --coverage " | ||
145 | AC_SUBST(HAVE_GCOV) | ||
146 | ]) | ||
147 | |||
148 | |||
139 | 149 | ||
140 | # checking pthread library | 150 | # checking pthread library |
141 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 151 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
@@ -170,7 +180,8 @@ echo " file transfer support: $HAVE_FILE_TRANSFER" | |||
170 | echo " overlayfs support: $HAVE_OVERLAYFS" | 180 | echo " overlayfs support: $HAVE_OVERLAYFS" |
171 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 181 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
172 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 182 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
173 | printf " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 183 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
184 | echo " Gcov instrumentation: $HAVE_GCOV" | ||
174 | echo | 185 | echo |
175 | 186 | ||
176 | 187 | ||
diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile.in index c99b6c30c..6e5071925 100644 --- a/src/firejail/Makefile.in +++ b/src/firejail/Makefile.in | |||
@@ -21,13 +21,14 @@ HAVE_GLOBALCFG=@HAVE_GLOBALCFG@ | |||
21 | HAVE_APPARMOR=@HAVE_APPARMOR@ | 21 | HAVE_APPARMOR=@HAVE_APPARMOR@ |
22 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ | 22 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ |
23 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | 23 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ |
24 | HAVE_GCOV=@HAVE_GCOV@ | ||
24 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 25 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
25 | 26 | ||
26 | H_FILE_LIST = $(sort $(wildcard *.[h])) | 27 | H_FILE_LIST = $(sort $(wildcard *.[h])) |
27 | C_FILE_LIST = $(sort $(wildcard *.c)) | 28 | C_FILE_LIST = $(sort $(wildcard *.c)) |
28 | OBJS = $(C_FILE_LIST:.c=.o) | 29 | OBJS = $(C_FILE_LIST:.c=.o) |
29 | BINOBJS = $(foreach file, $(OBJS), $file) | 30 | BINOBJS = $(foreach file, $(OBJS), $file) |
30 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 31 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security |
31 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 32 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
32 | 33 | ||
33 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall.h | 34 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall.h |
@@ -36,7 +37,7 @@ LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | |||
36 | firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o | 37 | firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o |
37 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) | 38 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) |
38 | 39 | ||
39 | clean:; rm -f *.o firejail firejail.1 firejail.1.gz | 40 | clean:; rm -f *.o firejail firejail.1 firejail.1.gz *.gcov *.gcda *.gcno |
40 | 41 | ||
41 | distclean: clean | 42 | distclean: clean |
42 | rm -fr Makefile | 43 | rm -fr Makefile |
diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile.in index 21888d354..efc48b212 100644 --- a/src/firemon/Makefile.in +++ b/src/firemon/Makefile.in | |||
@@ -4,21 +4,26 @@ PREFIX=@prefix@ | |||
4 | VERSION=@PACKAGE_VERSION@ | 4 | VERSION=@PACKAGE_VERSION@ |
5 | NAME=@PACKAGE_NAME@ | 5 | NAME=@PACKAGE_NAME@ |
6 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | 6 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ |
7 | HAVE_GCOV=@HAVE_GCOV@ | ||
8 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | ||
7 | 9 | ||
8 | H_FILE_LIST = $(sort $(wildcard *.[h])) | 10 | H_FILE_LIST = $(sort $(wildcard *.[h])) |
9 | C_FILE_LIST = $(sort $(wildcard *.c)) | 11 | C_FILE_LIST = $(sort $(wildcard *.c)) |
10 | OBJS = $(C_FILE_LIST:.c=.o) | 12 | OBJS = $(C_FILE_LIST:.c=.o) |
11 | BINOBJS = $(foreach file, $(OBJS), $file) | 13 | BINOBJS = $(foreach file, $(OBJS), $file) |
12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 14 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security |
13 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now | 15 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now |
16 | HAVE_GCOV=@HAVE_GCOV@ | ||
17 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | ||
18 | |||
14 | 19 | ||
15 | %.o : %.c $(H_FILE_LIST) | 20 | %.o : %.c $(H_FILE_LIST) |
16 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 21 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ |
17 | 22 | ||
18 | firemon: $(OBJS) ../lib/common.o ../lib/pid.o | 23 | firemon: $(OBJS) ../lib/common.o ../lib/pid.o |
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) | 24 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) |
20 | 25 | ||
21 | clean:; rm -f *.o firemon | 26 | clean:; rm -f *.o firemon *.gcov *.gcda *.gcno |
22 | 27 | ||
23 | distclean: clean | 28 | distclean: clean |
24 | rm -fr Makefile | 29 | rm -fr Makefile |
diff --git a/src/fnet/Makefile.in b/src/fnet/Makefile.in index bba4406d4..32f08882a 100644 --- a/src/fnet/Makefile.in +++ b/src/fnet/Makefile.in | |||
@@ -22,21 +22,23 @@ HAVE_APPARMOR=@HAVE_APPARMOR@ | |||
22 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ | 22 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ |
23 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | 23 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ |
24 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 24 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
25 | HAVE_GCOV=@HAVE_GCOV@ | ||
26 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | ||
25 | 27 | ||
26 | H_FILE_LIST = $(sort $(wildcard *.[h])) | 28 | H_FILE_LIST = $(sort $(wildcard *.[h])) |
27 | C_FILE_LIST = $(sort $(wildcard *.c)) | 29 | C_FILE_LIST = $(sort $(wildcard *.c)) |
28 | OBJS = $(C_FILE_LIST:.c=.o) | 30 | OBJS = $(C_FILE_LIST:.c=.o) |
29 | BINOBJS = $(foreach file, $(OBJS), $file) | 31 | BINOBJS = $(foreach file, $(OBJS), $file) |
30 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 32 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security |
31 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 33 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
32 | 34 | ||
33 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h | 35 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h |
34 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 36 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ |
35 | 37 | ||
36 | fnet: $(OBJS) ../lib/libnetlink.o | 38 | fnet: $(OBJS) ../lib/libnetlink.o |
37 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/libnetlink.o $(LIBS) | 39 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/libnetlink.o $(LIBS) $(EXTRA_LDFLAGS) |
38 | 40 | ||
39 | clean:; rm -f *.o fnet | 41 | clean:; rm -f *.o fnet *.gcov *.gcda *.gcno |
40 | 42 | ||
41 | distclean: clean | 43 | distclean: clean |
42 | rm -fr Makefile | 44 | rm -fr Makefile |
diff --git a/src/fseccomp/Makefile.in b/src/fseccomp/Makefile.in index 1878ad2f3..04c46f128 100644 --- a/src/fseccomp/Makefile.in +++ b/src/fseccomp/Makefile.in | |||
@@ -22,21 +22,23 @@ HAVE_APPARMOR=@HAVE_APPARMOR@ | |||
22 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ | 22 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ |
23 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | 23 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ |
24 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 24 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
25 | HAVE_GCOV=@HAVE_GCOV@ | ||
26 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | ||
25 | 27 | ||
26 | H_FILE_LIST = $(sort $(wildcard *.[h])) | 28 | H_FILE_LIST = $(sort $(wildcard *.[h])) |
27 | C_FILE_LIST = $(sort $(wildcard *.c)) | 29 | C_FILE_LIST = $(sort $(wildcard *.c)) |
28 | OBJS = $(C_FILE_LIST:.c=.o) | 30 | OBJS = $(C_FILE_LIST:.c=.o) |
29 | BINOBJS = $(foreach file, $(OBJS), $file) | 31 | BINOBJS = $(foreach file, $(OBJS), $file) |
30 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 32 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security |
31 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 33 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
32 | 34 | ||
33 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 35 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h |
34 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 36 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ |
35 | 37 | ||
36 | fseccomp: $(OBJS) | 38 | fseccomp: $(OBJS) |
37 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) | 39 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
38 | 40 | ||
39 | clean:; rm -f *.o fseccomp | 41 | clean:; rm -f *.o fseccomp *.gcov *.gcda *.gcno |
40 | 42 | ||
41 | distclean: clean | 43 | distclean: clean |
42 | rm -fr Makefile | 44 | rm -fr Makefile |
diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile.in index be159225f..ad508cadd 100644 --- a/src/ftee/Makefile.in +++ b/src/ftee/Makefile.in | |||
@@ -4,21 +4,23 @@ PREFIX=@prefix@ | |||
4 | VERSION=@PACKAGE_VERSION@ | 4 | VERSION=@PACKAGE_VERSION@ |
5 | NAME=@PACKAGE_NAME@ | 5 | NAME=@PACKAGE_NAME@ |
6 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | 6 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ |
7 | HAVE_GCOV=@HAVE_GCOV@ | ||
8 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | ||
7 | 9 | ||
8 | H_FILE_LIST = $(sort $(wildcard *.[h])) | 10 | H_FILE_LIST = $(sort $(wildcard *.[h])) |
9 | C_FILE_LIST = $(sort $(wildcard *.c)) | 11 | C_FILE_LIST = $(sort $(wildcard *.c)) |
10 | OBJS = $(C_FILE_LIST:.c=.o) | 12 | OBJS = $(C_FILE_LIST:.c=.o) |
11 | BINOBJS = $(foreach file, $(OBJS), $file) | 13 | BINOBJS = $(foreach file, $(OBJS), $file) |
12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(PREFIX)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 14 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) -DPREFIX='"$(PREFIX)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security |
13 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 15 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
14 | 16 | ||
15 | %.o : %.c $(H_FILE_LIST) | 17 | %.o : %.c $(H_FILE_LIST) |
16 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 18 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ |
17 | 19 | ||
18 | ftee: $(OBJS) | 20 | ftee: $(OBJS) |
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) | 21 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRA_LDFLAGS) |
20 | 22 | ||
21 | clean:; rm -f *.o ftee | 23 | clean:; rm -f *.o ftee *.gcov *.gcda *.gcno |
22 | 24 | ||
23 | distclean: clean | 25 | distclean: clean |
24 | rm -fr Makefile | 26 | rm -fr Makefile |