diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-06-13 01:04:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-13 01:04:26 +0000 |
commit | a1972c24f8cf137eaddf4f87f33bc675dbdbfd87 (patch) | |
tree | 2f6c44cb83afe0b9c32a76f22f404e80c7090269 | |
parent | README.md update (diff) | |
parent | mkdeb.sh.in: move configure-time vars into new config.sh.in (diff) | |
download | firejail-a1972c24f8cf137eaddf4f87f33bc675dbdbfd87.tar.gz firejail-a1972c24f8cf137eaddf4f87f33bc675dbdbfd87.tar.zst firejail-a1972c24f8cf137eaddf4f87f33bc675dbdbfd87.zip |
Merge pull request #5140 from kmk3/build-dedup-config-vars
build: deduplicate configure-time vars into new config files
34 files changed, 205 insertions, 129 deletions
diff --git a/.gitignore b/.gitignore index 756918943..70dba09b2 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -13,6 +13,8 @@ | |||
13 | Makefile | 13 | Makefile |
14 | autom4te.cache/ | 14 | autom4te.cache/ |
15 | config.log | 15 | config.log |
16 | config.mk | ||
17 | config.sh | ||
16 | config.status | 18 | config.status |
17 | firejail-*.tar.xz | 19 | firejail-*.tar.xz |
18 | firejail-login.5 | 20 | firejail-login.5 |
diff --git a/Makefile.in b/Makefile.in index f788435c0..4d9983672 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 config.h src/common.mk mkdeb.sh | 88 | rm -fr Makefile autom4te.cache config.log config.mk config.sh config.status src/common.mk mkdeb.sh |
105 | 89 | ||
106 | realinstall: | 90 | realinstall: |
107 | # firejail executable | 91 | # firejail executable |
@@ -203,19 +187,39 @@ uninstall: | |||
203 | rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg | 187 | rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg |
204 | @echo "If you want to install a different version of firejail, you might also need to run 'rm -fr $(DESTDIR)$(sysconfdir)/firejail', see #2038." | 188 | @echo "If you want to install a different version of firejail, you might also need to run 'rm -fr $(DESTDIR)$(sysconfdir)/firejail', see #2038." |
205 | 189 | ||
206 | DISTFILES = "src etc m4 platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh.in COPYING README RELNOTES" | 190 | DISTFILES = \ |
207 | DISTFILES_TEST = "test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot" | 191 | COPYING \ |
192 | Makefile.in \ | ||
193 | README \ | ||
194 | RELNOTES \ | ||
195 | config.mk.in \ | ||
196 | config.sh.in \ | ||
197 | configure \ | ||
198 | configure.ac \ | ||
199 | contrib \ | ||
200 | etc \ | ||
201 | install.sh \ | ||
202 | m4 \ | ||
203 | mkdeb.sh.in \ | ||
204 | mketc.sh \ | ||
205 | mkman.sh \ | ||
206 | platform \ | ||
207 | src | ||
208 | |||
209 | DISTFILES_TEST = test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot | ||
208 | 210 | ||
209 | dist: | 211 | dist: |
212 | mv config.sh config.sh.old | ||
210 | mv config.status config.status.old | 213 | mv config.status config.status.old |
211 | mv mkdeb.sh mkdeb.sh.old | 214 | mv mkdeb.sh mkdeb.sh.old |
212 | make distclean | 215 | make distclean |
213 | mv mkdeb.sh.old mkdeb.sh | 216 | mv mkdeb.sh.old mkdeb.sh |
214 | mv config.status.old config.status | 217 | mv config.status.old config.status |
218 | mv config.sh.old config.sh | ||
215 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz | 219 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz |
216 | mkdir -p $(NAME)-$(VERSION)/test | 220 | mkdir -p $(NAME)-$(VERSION)/test |
217 | cp -a "$(DISTFILES)" $(NAME)-$(VERSION) | 221 | cp -a $(DISTFILES) $(NAME)-$(VERSION) |
218 | cp -a "$(DISTFILES_TEST)" $(NAME)-$(VERSION)/test | 222 | cp -a $(DISTFILES_TEST) $(NAME)-$(VERSION)/test |
219 | rm -rf $(NAME)-$(VERSION)/src/tools | 223 | rm -rf $(NAME)-$(VERSION)/src/tools |
220 | find $(NAME)-$(VERSION) -name .svn -delete | 224 | find $(NAME)-$(VERSION) -name .svn -delete |
221 | tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION) | 225 | tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION) |
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@ | ||
diff --git a/config.sh.in b/config.sh.in new file mode 100644 index 000000000..28251b3d5 --- /dev/null +++ b/config.sh.in | |||
@@ -0,0 +1,2 @@ | |||
1 | NAME=@PACKAGE_NAME@ | ||
2 | VERSION=@PACKAGE_VERSION@ | ||
@@ -3236,8 +3236,8 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3236 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 3236 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
3237 | 3237 | ||
3238 | pkg_failed=no | 3238 | pkg_failed=no |
3239 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libapparmor" >&5 | 3239 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AA" >&5 |
3240 | $as_echo_n "checking for libapparmor... " >&6; } | 3240 | $as_echo_n "checking for AA... " >&6; } |
3241 | 3241 | ||
3242 | if test -n "$AA_CFLAGS"; then | 3242 | if test -n "$AA_CFLAGS"; then |
3243 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" | 3243 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" |
@@ -3277,7 +3277,7 @@ fi | |||
3277 | 3277 | ||
3278 | 3278 | ||
3279 | if test $pkg_failed = yes; then | 3279 | if test $pkg_failed = yes; then |
3280 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3280 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3281 | $as_echo "no" >&6; } | 3281 | $as_echo "no" >&6; } |
3282 | 3282 | ||
3283 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 3283 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
@@ -3304,7 +3304,7 @@ Alternatively, you may set the environment variables AA_CFLAGS | |||
3304 | and AA_LIBS to avoid the need to call pkg-config. | 3304 | and AA_LIBS to avoid the need to call pkg-config. |
3305 | See the pkg-config man page for more details." "$LINENO" 5 | 3305 | See the pkg-config man page for more details." "$LINENO" 5 |
3306 | elif test $pkg_failed = untried; then | 3306 | elif test $pkg_failed = untried; then |
3307 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3307 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3308 | $as_echo "no" >&6; } | 3308 | $as_echo "no" >&6; } |
3309 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3309 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3310 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3310 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
@@ -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/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile src/ftee/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile src/fzenity/Makefile src/profstats/Makefile src/man/Makefile src/zsh_completion/Makefile src/bash_completion/Makefile test/Makefile src/jailcheck/Makefile src/fids/Makefile src/fnettrace/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile" | 4090 | ac_config_files="$ac_config_files Makefile config.mk config.sh 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,34 +4797,36 @@ 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" ;; | ||
4801 | "config.sh") CONFIG_FILES="$CONFIG_FILES config.sh" ;; | ||
4802 | "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;; | ||
4800 | "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; | 4803 | "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; |
4801 | "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; | 4804 | "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;; |
4802 | "src/fcopy/Makefile") CONFIG_FILES="$CONFIG_FILES src/fcopy/Makefile" ;; | 4805 | "src/fcopy/Makefile") CONFIG_FILES="$CONFIG_FILES src/fcopy/Makefile" ;; |
4803 | "src/fnet/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnet/Makefile" ;; | 4806 | "src/fids/Makefile") CONFIG_FILES="$CONFIG_FILES src/fids/Makefile" ;; |
4807 | "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;; | ||
4804 | "src/firejail/Makefile") CONFIG_FILES="$CONFIG_FILES src/firejail/Makefile" ;; | 4808 | "src/firejail/Makefile") CONFIG_FILES="$CONFIG_FILES src/firejail/Makefile" ;; |
4805 | "src/fnetfilter/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnetfilter/Makefile" ;; | ||
4806 | "src/firemon/Makefile") CONFIG_FILES="$CONFIG_FILES src/firemon/Makefile" ;; | 4809 | "src/firemon/Makefile") CONFIG_FILES="$CONFIG_FILES src/firemon/Makefile" ;; |
4807 | "src/libtrace/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtrace/Makefile" ;; | ||
4808 | "src/libtracelog/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtracelog/Makefile" ;; | ||
4809 | "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;; | ||
4810 | "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;; | ||
4811 | "src/fsec-print/Makefile") CONFIG_FILES="$CONFIG_FILES src/fsec-print/Makefile" ;; | ||
4812 | "src/ftee/Makefile") CONFIG_FILES="$CONFIG_FILES src/ftee/Makefile" ;; | ||
4813 | "src/fseccomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/fseccomp/Makefile" ;; | ||
4814 | "src/fldd/Makefile") CONFIG_FILES="$CONFIG_FILES src/fldd/Makefile" ;; | 4810 | "src/fldd/Makefile") CONFIG_FILES="$CONFIG_FILES src/fldd/Makefile" ;; |
4815 | "src/libpostexecseccomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpostexecseccomp/Makefile" ;; | 4811 | "src/fnet/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnet/Makefile" ;; |
4812 | "src/fnetfilter/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnetfilter/Makefile" ;; | ||
4813 | "src/fnettrace-dns/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace-dns/Makefile" ;; | ||
4814 | "src/fnettrace-sni/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace-sni/Makefile" ;; | ||
4815 | "src/fnettrace/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace/Makefile" ;; | ||
4816 | "src/fsec-optimize/Makefile") CONFIG_FILES="$CONFIG_FILES src/fsec-optimize/Makefile" ;; | 4816 | "src/fsec-optimize/Makefile") CONFIG_FILES="$CONFIG_FILES src/fsec-optimize/Makefile" ;; |
4817 | "src/fsec-print/Makefile") CONFIG_FILES="$CONFIG_FILES src/fsec-print/Makefile" ;; | ||
4818 | "src/fseccomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/fseccomp/Makefile" ;; | ||
4819 | "src/ftee/Makefile") CONFIG_FILES="$CONFIG_FILES src/ftee/Makefile" ;; | ||
4817 | "src/fzenity/Makefile") CONFIG_FILES="$CONFIG_FILES src/fzenity/Makefile" ;; | 4820 | "src/fzenity/Makefile") CONFIG_FILES="$CONFIG_FILES src/fzenity/Makefile" ;; |
4818 | "src/profstats/Makefile") CONFIG_FILES="$CONFIG_FILES src/profstats/Makefile" ;; | 4821 | "src/jailcheck/Makefile") CONFIG_FILES="$CONFIG_FILES src/jailcheck/Makefile" ;; |
4822 | "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; | ||
4823 | "src/libpostexecseccomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpostexecseccomp/Makefile" ;; | ||
4824 | "src/libtrace/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtrace/Makefile" ;; | ||
4825 | "src/libtracelog/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtracelog/Makefile" ;; | ||
4819 | "src/man/Makefile") CONFIG_FILES="$CONFIG_FILES src/man/Makefile" ;; | 4826 | "src/man/Makefile") CONFIG_FILES="$CONFIG_FILES src/man/Makefile" ;; |
4827 | "src/profstats/Makefile") CONFIG_FILES="$CONFIG_FILES src/profstats/Makefile" ;; | ||
4820 | "src/zsh_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/zsh_completion/Makefile" ;; | 4828 | "src/zsh_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/zsh_completion/Makefile" ;; |
4821 | "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;; | ||
4822 | "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; | 4829 | "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; |
4823 | "src/jailcheck/Makefile") CONFIG_FILES="$CONFIG_FILES src/jailcheck/Makefile" ;; | ||
4824 | "src/fids/Makefile") CONFIG_FILES="$CONFIG_FILES src/fids/Makefile" ;; | ||
4825 | "src/fnettrace/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace/Makefile" ;; | ||
4826 | "src/fnettrace-dns/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace-dns/Makefile" ;; | ||
4827 | "src/fnettrace-sni/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace-sni/Makefile" ;; | ||
4828 | 4830 | ||
4829 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 4831 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
4830 | esac | 4832 | esac |
diff --git a/configure.ac b/configure.ac index ec7835013..cb20589cb 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -283,11 +283,39 @@ if test "$prefix" = /usr; then | |||
283 | fi | 283 | fi |
284 | 284 | ||
285 | AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) | 285 | AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) |
286 | AC_CONFIG_FILES([Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ | 286 | AC_CONFIG_FILES([ |
287 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile \ | 287 | Makefile |
288 | src/ftee/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile \ | 288 | config.mk |
289 | src/fzenity/Makefile src/profstats/Makefile src/man/Makefile src/zsh_completion/Makefile src/bash_completion/Makefile test/Makefile \ | 289 | config.sh |
290 | src/jailcheck/Makefile src/fids/Makefile src/fnettrace/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile]) | 290 | src/bash_completion/Makefile |
291 | src/common.mk | ||
292 | src/fbuilder/Makefile | ||
293 | src/fcopy/Makefile | ||
294 | src/fids/Makefile | ||
295 | src/firecfg/Makefile | ||
296 | src/firejail/Makefile | ||
297 | src/firemon/Makefile | ||
298 | src/fldd/Makefile | ||
299 | src/fnet/Makefile | ||
300 | src/fnetfilter/Makefile | ||
301 | src/fnettrace-dns/Makefile | ||
302 | src/fnettrace-sni/Makefile | ||
303 | src/fnettrace/Makefile | ||
304 | src/fsec-optimize/Makefile | ||
305 | src/fsec-print/Makefile | ||
306 | src/fseccomp/Makefile | ||
307 | src/ftee/Makefile | ||
308 | src/fzenity/Makefile | ||
309 | src/jailcheck/Makefile | ||
310 | src/lib/Makefile | ||
311 | src/libpostexecseccomp/Makefile | ||
312 | src/libtrace/Makefile | ||
313 | src/libtracelog/Makefile | ||
314 | src/man/Makefile | ||
315 | src/profstats/Makefile | ||
316 | src/zsh_completion/Makefile | ||
317 | test/Makefile | ||
318 | ]) | ||
291 | AC_OUTPUT | 319 | AC_OUTPUT |
292 | 320 | ||
293 | cat <<EOF | 321 | cat <<EOF |
diff --git a/mkdeb.sh.in b/mkdeb.sh.in index 79f8d748c..a98261ba6 100755 --- a/mkdeb.sh.in +++ b/mkdeb.sh.in | |||
@@ -7,8 +7,9 @@ | |||
7 | # a code archive should already be available | 7 | # a code archive should already be available |
8 | 8 | ||
9 | set -e | 9 | set -e |
10 | NAME=@PACKAGE_NAME@ | 10 | |
11 | VERSION=@PACKAGE_VERSION@ | 11 | . "$(dirname "$0")/config.sh" |
12 | |||
12 | EXTRA_VERSION=$1 | 13 | EXTRA_VERSION=$1 |
13 | 14 | ||
14 | test "$#" -gt 0 && shift | 15 | test "$#" -gt 0 && shift |
diff --git a/src/bash_completion/Makefile.in b/src/bash_completion/Makefile.in index f7db9e6b4..69f35e7ae 100644 --- a/src/bash_completion/Makefile.in +++ b/src/bash_completion/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: firejail.bash_completion | 2 | all: firejail.bash_completion |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/config.mk | ||
5 | 6 | ||
6 | firejail.bash_completion: firejail.bash_completion.in | 7 | firejail.bash_completion: firejail.bash_completion.in |
7 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |
diff --git a/src/common.mk.in b/src/common.mk.in index 64ed774ad..2b87c33f0 100644 --- a/src/common.mk.in +++ b/src/common.mk.in | |||
@@ -1,51 +1,16 @@ | |||
1 | # common definitions for all makefiles | 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/fbuilder/Makefile.in b/src/fbuilder/Makefile.in index 6eaee284b..060f97493 100644 --- a/src/fbuilder/Makefile.in +++ b/src/fbuilder/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fbuilder | 2 | all: fbuilder |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fcopy/Makefile.in b/src/fcopy/Makefile.in index e19f5d3b5..a2a4172a9 100644 --- a/src/fcopy/Makefile.in +++ b/src/fcopy/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fcopy | 2 | all: fcopy |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fids/Makefile.in b/src/fids/Makefile.in index 5530bcee2..8aac55419 100644 --- a/src/fids/Makefile.in +++ b/src/fids/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fids | 2 | all: fids |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/firecfg/Makefile.in b/src/firecfg/Makefile.in index 43329be46..d112cc40a 100644 --- a/src/firecfg/Makefile.in +++ b/src/firecfg/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: firecfg | 2 | all: firecfg |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile.in index 793d2cdd1..0dec3da98 100644 --- a/src/firejail/Makefile.in +++ b/src/firejail/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: firejail | 2 | all: firejail |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/rundefs.h ../include/common.h ../include/ldd_utils.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall_i386.h ../include/syscall_x86_64.h ../include/firejail_user.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/rundefs.h ../include/common.h ../include/ldd_utils.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall_i386.h ../include/syscall_x86_64.h ../include/firejail_user.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile.in index a1b6692aa..6ac0cfff1 100644 --- a/src/firemon/Makefile.in +++ b/src/firemon/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: firemon | 2 | all: firemon |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fldd/Makefile.in b/src/fldd/Makefile.in index ba87d16cd..f3842cbee 100644 --- a/src/fldd/Makefile.in +++ b/src/fldd/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fldd | 2 | all: fldd |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fnet/Makefile.in b/src/fnet/Makefile.in index 7447c6d3f..3d70e50bf 100644 --- a/src/fnet/Makefile.in +++ b/src/fnet/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fnet | 2 | all: fnet |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fnetfilter/Makefile.in b/src/fnetfilter/Makefile.in index 825262482..32b4bbada 100644 --- a/src/fnetfilter/Makefile.in +++ b/src/fnetfilter/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fnetfilter | 2 | all: fnetfilter |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fnettrace-dns/Makefile.in b/src/fnettrace-dns/Makefile.in index 6c11e5bc8..7cafe6907 100644 --- a/src/fnettrace-dns/Makefile.in +++ b/src/fnettrace-dns/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fnettrace-dns | 2 | all: fnettrace-dns |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fnettrace-sni/Makefile.in b/src/fnettrace-sni/Makefile.in index 9fe954874..9349d06f8 100644 --- a/src/fnettrace-sni/Makefile.in +++ b/src/fnettrace-sni/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fnettrace-sni | 2 | all: fnettrace-sni |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fnettrace/Makefile.in b/src/fnettrace/Makefile.in index 755ddcc3a..a7b93194a 100644 --- a/src/fnettrace/Makefile.in +++ b/src/fnettrace/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fnettrace | 2 | all: fnettrace |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fsec-optimize/Makefile.in b/src/fsec-optimize/Makefile.in index a2187e89c..cfd876953 100644 --- a/src/fsec-optimize/Makefile.in +++ b/src/fsec-optimize/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fsec-optimize | 2 | all: fsec-optimize |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fsec-print/Makefile.in b/src/fsec-print/Makefile.in index 824fb5daf..d07c42405 100644 --- a/src/fsec-print/Makefile.in +++ b/src/fsec-print/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fsec-print | 2 | all: fsec-print |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fseccomp/Makefile.in b/src/fseccomp/Makefile.in index 41abfce17..140a56ab0 100644 --- a/src/fseccomp/Makefile.in +++ b/src/fseccomp/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fseccomp | 2 | all: fseccomp |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile.in index 05caf81be..f9ad78de2 100644 --- a/src/ftee/Makefile.in +++ b/src/ftee/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: ftee | 2 | all: ftee |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/fzenity/Makefile.in b/src/fzenity/Makefile.in index d9f976165..6b7ce0874 100644 --- a/src/fzenity/Makefile.in +++ b/src/fzenity/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: fzenity | 2 | all: fzenity |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/jailcheck/Makefile.in b/src/jailcheck/Makefile.in index d218c1f90..cf619ad1e 100644 --- a/src/jailcheck/Makefile.in +++ b/src/jailcheck/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: jailcheck | 2 | all: jailcheck |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 49c8057b3..330a47892 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in | |||
@@ -1,4 +1,5 @@ | |||
1 | include ../common.mk | 1 | ROOT = ../.. |
2 | include $(ROOT)/src/common.mk | ||
2 | 3 | ||
3 | .PHONY: all | 4 | .PHONY: all |
4 | all: $(OBJS) | 5 | all: $(OBJS) |
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)) |
diff --git a/src/man/Makefile.in b/src/man/Makefile.in index fbd2d795e..a63f9d28e 100644 --- a/src/man/Makefile.in +++ b/src/man/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man | 2 | all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/config.mk | ||
5 | 6 | ||
6 | %.man: %.txt | 7 | %.man: %.txt |
7 | gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ | 8 | gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ |
diff --git a/src/profstats/Makefile.in b/src/profstats/Makefile.in index fa1b4f200..394f30fda 100644 --- a/src/profstats/Makefile.in +++ b/src/profstats/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: profstats | 2 | all: profstats |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | ||
5 | 6 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
diff --git a/src/zsh_completion/Makefile.in b/src/zsh_completion/Makefile.in index a83cccf6c..fceab1d00 100644 --- a/src/zsh_completion/Makefile.in +++ b/src/zsh_completion/Makefile.in | |||
@@ -1,7 +1,8 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: _firejail | 2 | all: _firejail |
3 | 3 | ||
4 | include ../common.mk | 4 | ROOT = ../.. |
5 | include $(ROOT)/config.mk | ||
5 | 6 | ||
6 | _firejail: _firejail.in | 7 | _firejail: _firejail.in |
7 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |