diff options
author | netblue30 <netblue30@protonmail.com> | 2022-06-30 09:00:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-30 09:00:15 -0400 |
commit | 70aaf6fea40ac4f4f28094cad639ec4c00897843 (patch) | |
tree | b3013b4abeaf00cde4ab63f90bdc91ef8e6520a9 | |
parent | test/fs: enable private-lib in firejail.config (diff) | |
parent | makefiles: add generated files as dependencies (diff) | |
download | firejail-70aaf6fea40ac4f4f28094cad639ec4c00897843.tar.gz firejail-70aaf6fea40ac4f4f28094cad639ec4c00897843.tar.zst firejail-70aaf6fea40ac4f4f28094cad639ec4c00897843.zip |
Merge pull request #5219 from kmk3/build-reduce-config-files
build: reduce autoconf input files from 32 to 2
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | Makefile (renamed from Makefile.in) | 35 | ||||
-rwxr-xr-x | configure | 39 | ||||
-rw-r--r-- | configure.ac | 35 | ||||
-rwxr-xr-x | contrib/fj-mkdeb.py | 8 | ||||
-rwxr-xr-x | mkdeb.sh (renamed from mkdeb.sh.in) | 0 | ||||
-rw-r--r-- | src/bash_completion/Makefile (renamed from src/bash_completion/Makefile.in) | 5 | ||||
-rw-r--r-- | src/common.mk (renamed from src/common.mk.in) | 2 | ||||
-rw-r--r-- | src/fbuilder/Makefile (renamed from src/fbuilder/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fcopy/Makefile (renamed from src/fcopy/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fids/Makefile (renamed from src/fids/Makefile.in) | 5 | ||||
-rw-r--r-- | src/firecfg/Makefile (renamed from src/firecfg/Makefile.in) | 5 | ||||
-rw-r--r-- | src/firejail/Makefile (renamed from src/firejail/Makefile.in) | 5 | ||||
-rw-r--r-- | src/firemon/Makefile (renamed from src/firemon/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fldd/Makefile (renamed from src/fldd/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fnet/Makefile (renamed from src/fnet/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fnetfilter/Makefile (renamed from src/fnetfilter/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fnettrace-dns/Makefile (renamed from src/fnettrace-dns/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fnettrace-sni/Makefile (renamed from src/fnettrace-sni/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fnettrace/Makefile (renamed from src/fnettrace/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fsec-optimize/Makefile (renamed from src/fsec-optimize/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fsec-print/Makefile (renamed from src/fsec-print/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fseccomp/Makefile (renamed from src/fseccomp/Makefile.in) | 5 | ||||
-rw-r--r-- | src/ftee/Makefile (renamed from src/ftee/Makefile.in) | 5 | ||||
-rw-r--r-- | src/fzenity/Makefile (renamed from src/fzenity/Makefile.in) | 5 | ||||
-rw-r--r-- | src/jailcheck/Makefile (renamed from src/jailcheck/Makefile.in) | 5 | ||||
-rw-r--r-- | src/lib/Makefile (renamed from src/lib/Makefile.in) | 3 | ||||
-rw-r--r-- | src/libpostexecseccomp/Makefile (renamed from src/libpostexecseccomp/Makefile.in) | 7 | ||||
-rw-r--r-- | src/libtrace/Makefile (renamed from src/libtrace/Makefile.in) | 7 | ||||
-rw-r--r-- | src/libtracelog/Makefile (renamed from src/libtracelog/Makefile.in) | 7 | ||||
-rw-r--r-- | src/man/Makefile (renamed from src/man/Makefile.in) | 5 | ||||
-rw-r--r-- | src/profstats/Makefile (renamed from src/profstats/Makefile.in) | 5 | ||||
-rw-r--r-- | src/zsh_completion/Makefile (renamed from src/zsh_completion/Makefile.in) | 5 | ||||
-rw-r--r-- | test/Makefile (renamed from test/Makefile.in) | 1 |
34 files changed, 80 insertions, 177 deletions
diff --git a/.gitignore b/.gitignore index 70dba09b2..66daccf5d 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -10,7 +10,6 @@ | |||
10 | .directory | 10 | .directory |
11 | *.man | 11 | *.man |
12 | .vscode | 12 | .vscode |
13 | Makefile | ||
14 | autom4te.cache/ | 13 | autom4te.cache/ |
15 | config.log | 14 | config.log |
16 | config.mk | 15 | config.mk |
@@ -25,7 +24,6 @@ firejail.1 | |||
25 | firemon.1 | 24 | firemon.1 |
26 | firecfg.1 | 25 | firecfg.1 |
27 | jailcheck.1 | 26 | jailcheck.1 |
28 | mkdeb.sh | ||
29 | src/fnettrace-dns/fnettrace-dns | 27 | src/fnettrace-dns/fnettrace-dns |
30 | src/fnettrace-sni/fnettrace-sni | 28 | src/fnettrace-sni/fnettrace-sni |
31 | src/firejail/firejail | 29 | src/firejail/firejail |
@@ -57,7 +55,6 @@ seccomp.64 | |||
57 | seccomp.block_secondary | 55 | seccomp.block_secondary |
58 | seccomp.mdwx | 56 | seccomp.mdwx |
59 | seccomp.mdwx.32 | 57 | seccomp.mdwx.32 |
60 | src/common.mk | ||
61 | aclocal.m4 | 58 | aclocal.m4 |
62 | __pycache__ | 59 | __pycache__ |
63 | *.pyc | 60 | *.pyc |
@@ -1,4 +1,4 @@ | |||
1 | include config.mk | 1 | -include config.mk |
2 | 2 | ||
3 | ifneq ($(HAVE_MAN),no) | 3 | ifneq ($(HAVE_MAN),no) |
4 | MAN_TARGET = man | 4 | MAN_TARGET = man |
@@ -21,6 +21,10 @@ MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 fi | |||
21 | SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 | 21 | SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 |
22 | ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS) | 22 | ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS) |
23 | 23 | ||
24 | config.mk config.sh: | ||
25 | printf 'run ./configure to generate %s\n' "$@" >&2 | ||
26 | false | ||
27 | |||
24 | .PHONY: all_items $(ALL_ITEMS) | 28 | .PHONY: all_items $(ALL_ITEMS) |
25 | all_items: $(ALL_ITEMS) | 29 | all_items: $(ALL_ITEMS) |
26 | $(ALL_ITEMS): $(MYDIRS) | 30 | $(ALL_ITEMS): $(MYDIRS) |
@@ -31,7 +35,7 @@ mydirs: $(MYDIRS) | |||
31 | $(MYDIRS): | 35 | $(MYDIRS): |
32 | $(MAKE) -C $@ | 36 | $(MAKE) -C $@ |
33 | 37 | ||
34 | $(MANPAGES): src/man | 38 | $(MANPAGES): src/man config.mk |
35 | ./mkman.sh $(VERSION) src/man/$(basename $@).man $@ | 39 | ./mkman.sh $(VERSION) src/man/$(basename $@).man $@ |
36 | 40 | ||
37 | man: $(MANPAGES) | 41 | man: $(MANPAGES) |
@@ -85,9 +89,9 @@ distclean: clean | |||
85 | $(MAKE) -C $$dir distclean; \ | 89 | $(MAKE) -C $$dir distclean; \ |
86 | done | 90 | done |
87 | $(MAKE) -C test distclean | 91 | $(MAKE) -C test distclean |
88 | rm -fr Makefile autom4te.cache config.log config.mk config.sh config.status src/common.mk mkdeb.sh | 92 | rm -fr autom4te.cache config.log config.mk config.sh config.status |
89 | 93 | ||
90 | realinstall: | 94 | realinstall: config.mk |
91 | # firejail executable | 95 | # firejail executable |
92 | install -m 0755 -d $(DESTDIR)$(bindir) | 96 | install -m 0755 -d $(DESTDIR)$(bindir) |
93 | install -m 0755 src/firejail/firejail $(DESTDIR)$(bindir) | 97 | install -m 0755 src/firejail/firejail $(DESTDIR)$(bindir) |
@@ -171,7 +175,7 @@ install-strip: all | |||
171 | strip $(ALL_ITEMS) | 175 | strip $(ALL_ITEMS) |
172 | $(MAKE) realinstall | 176 | $(MAKE) realinstall |
173 | 177 | ||
174 | uninstall: | 178 | uninstall: config.mk |
175 | rm -f $(DESTDIR)$(bindir)/firejail | 179 | rm -f $(DESTDIR)$(bindir)/firejail |
176 | rm -f $(DESTDIR)$(bindir)/firemon | 180 | rm -f $(DESTDIR)$(bindir)/firemon |
177 | rm -f $(DESTDIR)$(bindir)/firecfg | 181 | rm -f $(DESTDIR)$(bindir)/firecfg |
@@ -189,7 +193,7 @@ uninstall: | |||
189 | 193 | ||
190 | DISTFILES = \ | 194 | DISTFILES = \ |
191 | COPYING \ | 195 | COPYING \ |
192 | Makefile.in \ | 196 | Makefile \ |
193 | README \ | 197 | README \ |
194 | RELNOTES \ | 198 | RELNOTES \ |
195 | config.mk.in \ | 199 | config.mk.in \ |
@@ -200,20 +204,18 @@ contrib \ | |||
200 | etc \ | 204 | etc \ |
201 | install.sh \ | 205 | install.sh \ |
202 | m4 \ | 206 | m4 \ |
203 | mkdeb.sh.in \ | 207 | mkdeb.sh \ |
204 | mketc.sh \ | 208 | mketc.sh \ |
205 | mkman.sh \ | 209 | mkman.sh \ |
206 | platform \ | 210 | platform \ |
207 | src | 211 | src |
208 | 212 | ||
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 | 213 | DISTFILES_TEST = test/Makefile 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 |
210 | 214 | ||
211 | dist: | 215 | dist: config.mk |
212 | mv config.sh config.sh.old | 216 | mv config.sh config.sh.old |
213 | mv config.status config.status.old | 217 | mv config.status config.status.old |
214 | mv mkdeb.sh mkdeb.sh.old | ||
215 | make distclean | 218 | make distclean |
216 | mv mkdeb.sh.old mkdeb.sh | ||
217 | mv config.status.old config.status | 219 | mv config.status.old config.status |
218 | mv config.sh.old config.sh | 220 | mv config.sh.old config.sh |
219 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz | 221 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz |
@@ -225,19 +227,20 @@ dist: | |||
225 | tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION) | 227 | tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION) |
226 | rm -fr $(NAME)-$(VERSION) | 228 | rm -fr $(NAME)-$(VERSION) |
227 | 229 | ||
228 | asc:; ./mkasc.sh $(VERSION) | 230 | asc: config.mk |
231 | ./mkasc.sh $(VERSION) | ||
229 | 232 | ||
230 | deb: dist | 233 | deb: dist config.sh |
231 | ./mkdeb.sh | 234 | ./mkdeb.sh |
232 | 235 | ||
233 | deb-apparmor: dist | 236 | deb-apparmor: dist config.sh |
234 | ./mkdeb.sh -apparmor --enable-apparmor | 237 | ./mkdeb.sh -apparmor --enable-apparmor |
235 | 238 | ||
236 | test-compile: dist | 239 | test-compile: dist config.mk |
237 | cd test/compile; ./compile.sh $(NAME)-$(VERSION) | 240 | cd test/compile; ./compile.sh $(NAME)-$(VERSION) |
238 | 241 | ||
239 | .PHONY: rpms | 242 | .PHONY: rpms |
240 | rpms: src/man | 243 | rpms: src/man config.mk |
241 | ./platform/rpm/mkrpm.sh $(NAME) $(VERSION) | 244 | ./platform/rpm/mkrpm.sh $(NAME) $(VERSION) |
242 | 245 | ||
243 | extras: all | 246 | extras: all |
@@ -4085,9 +4085,7 @@ if test "$prefix" = /usr; then | |||
4085 | test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" | 4085 | test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" |
4086 | fi | 4086 | fi |
4087 | 4087 | ||
4088 | ac_config_files="$ac_config_files mkdeb.sh" | 4088 | ac_config_files="$ac_config_files config.mk config.sh" |
4089 | |||
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 | 4089 | ||
4092 | cat >confcache <<\_ACEOF | 4090 | cat >confcache <<\_ACEOF |
4093 | # This file is a shell script that caches the results of configure | 4091 | # This file is a shell script that caches the results of configure |
@@ -4795,38 +4793,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
4795 | for ac_config_target in $ac_config_targets | 4793 | for ac_config_target in $ac_config_targets |
4796 | do | 4794 | do |
4797 | case $ac_config_target in | 4795 | case $ac_config_target in |
4798 | "mkdeb.sh") CONFIG_FILES="$CONFIG_FILES mkdeb.sh" ;; | ||
4799 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | ||
4800 | "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; | 4796 | "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; |
4801 | "config.sh") CONFIG_FILES="$CONFIG_FILES config.sh" ;; | 4797 | "config.sh") CONFIG_FILES="$CONFIG_FILES config.sh" ;; |
4802 | "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;; | ||
4803 | "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; | ||
4804 | "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;; | ||
4805 | "src/fcopy/Makefile") CONFIG_FILES="$CONFIG_FILES src/fcopy/Makefile" ;; | ||
4806 | "src/fids/Makefile") CONFIG_FILES="$CONFIG_FILES src/fids/Makefile" ;; | ||
4807 | "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;; | ||
4808 | "src/firejail/Makefile") CONFIG_FILES="$CONFIG_FILES src/firejail/Makefile" ;; | ||
4809 | "src/firemon/Makefile") CONFIG_FILES="$CONFIG_FILES src/firemon/Makefile" ;; | ||
4810 | "src/fldd/Makefile") CONFIG_FILES="$CONFIG_FILES src/fldd/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" ;; | ||
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" ;; | ||
4820 | "src/fzenity/Makefile") CONFIG_FILES="$CONFIG_FILES src/fzenity/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" ;; | ||
4826 | "src/man/Makefile") CONFIG_FILES="$CONFIG_FILES src/man/Makefile" ;; | ||
4827 | "src/profstats/Makefile") CONFIG_FILES="$CONFIG_FILES src/profstats/Makefile" ;; | ||
4828 | "src/zsh_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/zsh_completion/Makefile" ;; | ||
4829 | "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; | ||
4830 | 4798 | ||
4831 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 4799 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
4832 | esac | 4800 | esac |
@@ -5240,11 +5208,6 @@ which seems to be undefined. Please make sure it is defined" >&2;} | |||
5240 | 5208 | ||
5241 | esac | 5209 | esac |
5242 | 5210 | ||
5243 | |||
5244 | case $ac_file$ac_mode in | ||
5245 | "mkdeb.sh":F) chmod +x mkdeb.sh ;; | ||
5246 | |||
5247 | esac | ||
5248 | done # for ac_tag | 5211 | done # for ac_tag |
5249 | 5212 | ||
5250 | 5213 | ||
diff --git a/configure.ac b/configure.ac index 53de0eb1d..8a488ff43 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -282,40 +282,7 @@ if test "$prefix" = /usr; then | |||
282 | test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" | 282 | test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" |
283 | fi | 283 | fi |
284 | 284 | ||
285 | AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) | 285 | AC_CONFIG_FILES([config.mk config.sh]) |
286 | AC_CONFIG_FILES([ | ||
287 | Makefile | ||
288 | config.mk | ||
289 | config.sh | ||
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 | ]) | ||
319 | AC_OUTPUT | 286 | AC_OUTPUT |
320 | 287 | ||
321 | cat <<EOF | 288 | cat <<EOF |
diff --git a/contrib/fj-mkdeb.py b/contrib/fj-mkdeb.py index 854e8d1a8..b215b157b 100755 --- a/contrib/fj-mkdeb.py +++ b/contrib/fj-mkdeb.py | |||
@@ -12,7 +12,7 @@ import os, subprocess, sys | |||
12 | def run(srcdir, args): | 12 | def run(srcdir, args): |
13 | if srcdir: os.chdir(srcdir) | 13 | if srcdir: os.chdir(srcdir) |
14 | 14 | ||
15 | if not (os.path.isfile('./mkdeb.sh.in')): | 15 | if not (os.path.isfile('./mkdeb.sh')): |
16 | print('Error: Not a firejail source tree? Exiting.') | 16 | print('Error: Not a firejail source tree? Exiting.') |
17 | return 1 | 17 | return 1 |
18 | 18 | ||
@@ -22,7 +22,7 @@ def run(srcdir, args): | |||
22 | # prefix should ALWAYS be /usr here. Discard user-set values | 22 | # prefix should ALWAYS be /usr here. Discard user-set values |
23 | args.remove(a) | 23 | args.remove(a) |
24 | 24 | ||
25 | # Run configure to generate mkdeb.sh. | 25 | # Run configure to generate config.sh. |
26 | first_config = subprocess.call(['./configure', '--prefix=/usr'] + args) | 26 | first_config = subprocess.call(['./configure', '--prefix=/usr'] + args) |
27 | if first_config != 0: | 27 | if first_config != 0: |
28 | return first_config | 28 | return first_config |
@@ -62,9 +62,9 @@ usage: | |||
62 | if not (srcdir): | 62 | if not (srcdir): |
63 | # srcdir not manually specified, try to auto-detect | 63 | # srcdir not manually specified, try to auto-detect |
64 | srcdir = os.path.dirname(os.path.abspath(sys.argv[0] + '/..')) | 64 | srcdir = os.path.dirname(os.path.abspath(sys.argv[0] + '/..')) |
65 | if not (os.path.isfile(srcdir + '/mkdeb.sh.in')): | 65 | if not (os.path.isfile(srcdir + '/mkdeb.sh')): |
66 | # Script is probably installed. Check the cwd. | 66 | # Script is probably installed. Check the cwd. |
67 | if os.path.isfile('./mkdeb.sh.in'): | 67 | if os.path.isfile('./mkdeb.sh'): |
68 | srcdir = None | 68 | srcdir = None |
69 | else: | 69 | else: |
70 | print( | 70 | print( |
diff --git a/src/bash_completion/Makefile.in b/src/bash_completion/Makefile index 69f35e7ae..e787a7b92 100644 --- a/src/bash_completion/Makefile.in +++ b/src/bash_completion/Makefile | |||
@@ -2,9 +2,9 @@ | |||
2 | all: firejail.bash_completion | 2 | all: firejail.bash_completion |
3 | 3 | ||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/config.mk | 5 | -include $(ROOT)/config.mk |
6 | 6 | ||
7 | firejail.bash_completion: firejail.bash_completion.in | 7 | firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk |
8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |
9 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ | 9 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ |
10 | rm $@.tmp | 10 | rm $@.tmp |
@@ -15,4 +15,3 @@ clean: | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/common.mk.in b/src/common.mk index 2b87c33f0..07b5e373d 100644 --- a/src/common.mk.in +++ b/src/common.mk | |||
@@ -2,7 +2,7 @@ | |||
2 | # | 2 | # |
3 | # Note: "ROOT" must be defined before including this file. | 3 | # Note: "ROOT" must be defined before including this file. |
4 | 4 | ||
5 | include $(ROOT)/config.mk | 5 | -include $(ROOT)/config.mk |
6 | 6 | ||
7 | H_FILE_LIST = $(sort $(wildcard *.h)) | 7 | H_FILE_LIST = $(sort $(wildcard *.h)) |
8 | C_FILE_LIST = $(sort $(wildcard *.c)) | 8 | C_FILE_LIST = $(sort $(wildcard *.c)) |
diff --git a/src/fbuilder/Makefile.in b/src/fbuilder/Makefile index 060f97493..da0403c6e 100644 --- a/src/fbuilder/Makefile.in +++ b/src/fbuilder/Makefile | |||
@@ -4,10 +4,10 @@ all: fbuilder | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fbuilder: $(OBJS) | 10 | fbuilder: $(OBJS) $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fbuilder *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fcopy/Makefile.in b/src/fcopy/Makefile index a2a4172a9..ae128df9b 100644 --- a/src/fcopy/Makefile.in +++ b/src/fcopy/Makefile | |||
@@ -4,10 +4,10 @@ all: fcopy | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fcopy: $(OBJS) ../lib/common.o | 10 | fcopy: $(OBJS) ../lib/common.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fcopy *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fids/Makefile.in b/src/fids/Makefile index 8aac55419..e57c56b5b 100644 --- a/src/fids/Makefile.in +++ b/src/fids/Makefile | |||
@@ -4,11 +4,11 @@ all: fids | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | #fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o | 10 | #fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o |
11 | fids: $(OBJS) | 11 | fids: $(OBJS) $(ROOT)/config.mk |
12 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 12 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
13 | 13 | ||
14 | .PHONY: clean | 14 | .PHONY: clean |
@@ -16,4 +16,3 @@ clean:; rm -fr *.o fids *.gcov *.gcda *.gcno *.plist | |||
16 | 16 | ||
17 | .PHONY: distclean | 17 | .PHONY: distclean |
18 | distclean: clean | 18 | distclean: clean |
19 | rm -fr Makefile | ||
diff --git a/src/firecfg/Makefile.in b/src/firecfg/Makefile index d112cc40a..3b0daed71 100644 --- a/src/firecfg/Makefile.in +++ b/src/firecfg/Makefile | |||
@@ -4,10 +4,10 @@ all: firecfg | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.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 $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o | 10 | firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/firejail_user.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/firejail_user.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firecfg *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile index 0dec3da98..23444107f 100644 --- a/src/firejail/Makefile.in +++ b/src/firejail/Makefile | |||
@@ -4,10 +4,10 @@ all: firejail | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
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 | %.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 $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o | 10 | firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firejail *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile index 6ac0cfff1..b2d2f4d14 100644 --- a/src/firemon/Makefile.in +++ b/src/firemon/Makefile | |||
@@ -4,10 +4,10 @@ all: firemon | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | firemon: $(OBJS) ../lib/common.o ../lib/pid.o | 10 | firemon: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firemon *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fldd/Makefile.in b/src/fldd/Makefile index f3842cbee..d9a70529b 100644 --- a/src/fldd/Makefile.in +++ b/src/fldd/Makefile | |||
@@ -4,10 +4,10 @@ all: fldd | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.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 $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o | 10 | fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fldd *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fnet/Makefile.in b/src/fnet/Makefile index 3d70e50bf..36e95522f 100644 --- a/src/fnet/Makefile.in +++ b/src/fnet/Makefile | |||
@@ -4,10 +4,10 @@ all: fnet | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o | 10 | fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/libnetlink.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/libnetlink.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnet *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fnetfilter/Makefile.in b/src/fnetfilter/Makefile index 32b4bbada..758561b9e 100644 --- a/src/fnetfilter/Makefile.in +++ b/src/fnetfilter/Makefile | |||
@@ -4,10 +4,10 @@ all: fnetfilter | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fnetfilter: $(OBJS) ../lib/common.o | 10 | fnetfilter: $(OBJS) ../lib/common.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnetfilter *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fnettrace-dns/Makefile.in b/src/fnettrace-dns/Makefile index 7cafe6907..101abd4d4 100644 --- a/src/fnettrace-dns/Makefile.in +++ b/src/fnettrace-dns/Makefile | |||
@@ -4,10 +4,10 @@ all: fnettrace-dns | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fnettrace-dns: $(OBJS) | 10 | fnettrace-dns: $(OBJS) $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace-dns *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fnettrace-sni/Makefile.in b/src/fnettrace-sni/Makefile index 9349d06f8..da7c1ca4e 100644 --- a/src/fnettrace-sni/Makefile.in +++ b/src/fnettrace-sni/Makefile | |||
@@ -4,10 +4,10 @@ all: fnettrace-sni | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fnettrace-sni: $(OBJS) | 10 | fnettrace-sni: $(OBJS) $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace-sni *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fnettrace/Makefile.in b/src/fnettrace/Makefile index a7b93194a..f41a4d36d 100644 --- a/src/fnettrace/Makefile.in +++ b/src/fnettrace/Makefile | |||
@@ -4,10 +4,10 @@ all: fnettrace | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fnettrace: $(OBJS) | 10 | fnettrace: $(OBJS) $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fsec-optimize/Makefile.in b/src/fsec-optimize/Makefile index cfd876953..1aa49d34b 100644 --- a/src/fsec-optimize/Makefile.in +++ b/src/fsec-optimize/Makefile | |||
@@ -4,10 +4,10 @@ all: fsec-optimize | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.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 $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fsec-optimize: $(OBJS) ../lib/common.o ../lib/libnetlink.o | 10 | fsec-optimize: $(OBJS) ../lib/common.o ../lib/libnetlink.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fsec-print/Makefile.in b/src/fsec-print/Makefile index d07c42405..b076c0588 100644 --- a/src/fsec-print/Makefile.in +++ b/src/fsec-print/Makefile | |||
@@ -4,10 +4,10 @@ all: fsec-print | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.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 $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fsec-print: $(OBJS) ../lib/common.o ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o | 10 | fsec-print: $(OBJS) ../lib/common.o ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fseccomp/Makefile.in b/src/fseccomp/Makefile index 140a56ab0..9bf4c050b 100644 --- a/src/fseccomp/Makefile.in +++ b/src/fseccomp/Makefile | |||
@@ -4,10 +4,10 @@ all: fseccomp | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o | 10 | fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fseccomp *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile index f9ad78de2..535d7ff63 100644 --- a/src/ftee/Makefile.in +++ b/src/ftee/Makefile | |||
@@ -4,10 +4,10 @@ all: ftee | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | ftee: $(OBJS) | 10 | ftee: $(OBJS) $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o ftee *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/fzenity/Makefile.in b/src/fzenity/Makefile index 6b7ce0874..0358dd3e9 100644 --- a/src/fzenity/Makefile.in +++ b/src/fzenity/Makefile | |||
@@ -4,10 +4,10 @@ all: fzenity | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | fzenity: $(OBJS) | 10 | fzenity: $(OBJS) $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fzenity *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/jailcheck/Makefile.in b/src/jailcheck/Makefile index cf619ad1e..52feb86e6 100644 --- a/src/jailcheck/Makefile.in +++ b/src/jailcheck/Makefile | |||
@@ -4,10 +4,10 @@ all: jailcheck | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | jailcheck: $(OBJS) | 10 | jailcheck: $(OBJS) $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/lib/Makefile.in b/src/lib/Makefile index 330a47892..d9bc63ef7 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile | |||
@@ -4,7 +4,7 @@ include $(ROOT)/src/common.mk | |||
4 | .PHONY: all | 4 | .PHONY: all |
5 | all: $(OBJS) | 5 | all: $(OBJS) |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) | 7 | %.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | .PHONY: clean | 10 | .PHONY: clean |
@@ -12,4 +12,3 @@ clean:; rm -fr $(OBJS) *.gcov *.gcda *.gcno *.plist | |||
12 | 12 | ||
13 | .PHONY: distclean | 13 | .PHONY: distclean |
14 | distclean: clean | 14 | distclean: clean |
15 | rm -fr Makefile | ||
diff --git a/src/libpostexecseccomp/Makefile.in b/src/libpostexecseccomp/Makefile index 6f354757c..5386af58b 100644 --- a/src/libpostexecseccomp/Makefile.in +++ b/src/libpostexecseccomp/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | H_FILE_LIST = $(sort $(wildcard *.h)) | 4 | H_FILE_LIST = $(sort $(wildcard *.h)) |
5 | C_FILE_LIST = $(sort $(wildcard *.c)) | 5 | C_FILE_LIST = $(sort $(wildcard *.c)) |
@@ -11,10 +11,10 @@ LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | |||
11 | .PHONY: all | 11 | .PHONY: all |
12 | all: libpostexecseccomp.so | 12 | all: libpostexecseccomp.so |
13 | 13 | ||
14 | %.o : %.c $(H_FILE_LIST) ../include/seccomp.h ../include/rundefs.h | 14 | %.o : %.c $(H_FILE_LIST) ../include/seccomp.h ../include/rundefs.h $(ROOT)/config.mk |
15 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 15 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ |
16 | 16 | ||
17 | libpostexecseccomp.so: $(OBJS) | 17 | libpostexecseccomp.so: $(OBJS) $(ROOT)/config.mk |
18 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl | 18 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl |
19 | 19 | ||
20 | .PHONY: clean | 20 | .PHONY: clean |
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libpostexecseccomp.so *.plist | |||
22 | 22 | ||
23 | .PHONY: distclean | 23 | .PHONY: distclean |
24 | distclean: clean | 24 | distclean: clean |
25 | rm -fr Makefile | ||
diff --git a/src/libtrace/Makefile.in b/src/libtrace/Makefile index ced036865..6f28b3442 100644 --- a/src/libtrace/Makefile.in +++ b/src/libtrace/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | H_FILE_LIST = $(sort $(wildcard *.h)) | 4 | H_FILE_LIST = $(sort $(wildcard *.h)) |
5 | C_FILE_LIST = $(sort $(wildcard *.c)) | 5 | C_FILE_LIST = $(sort $(wildcard *.c)) |
@@ -11,10 +11,10 @@ LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | |||
11 | .PHONY: all | 11 | .PHONY: all |
12 | all: libtrace.so | 12 | all: libtrace.so |
13 | 13 | ||
14 | %.o : %.c $(H_FILE_LIST) | 14 | %.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk |
15 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 15 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ |
16 | 16 | ||
17 | libtrace.so: $(OBJS) | 17 | libtrace.so: $(OBJS) $(ROOT)/config.mk |
18 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl | 18 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl |
19 | 19 | ||
20 | .PHONY: clean | 20 | .PHONY: clean |
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libtrace.so *.plist | |||
22 | 22 | ||
23 | .PHONY: distclean | 23 | .PHONY: distclean |
24 | distclean: clean | 24 | distclean: clean |
25 | rm -fr Makefile | ||
diff --git a/src/libtracelog/Makefile.in b/src/libtracelog/Makefile index 52d4bcb08..c5d9c131d 100644 --- a/src/libtracelog/Makefile.in +++ b/src/libtracelog/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | H_FILE_LIST = $(sort $(wildcard *.h)) | 4 | H_FILE_LIST = $(sort $(wildcard *.h)) |
5 | C_FILE_LIST = $(sort $(wildcard *.c)) | 5 | C_FILE_LIST = $(sort $(wildcard *.c)) |
@@ -11,10 +11,10 @@ LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | |||
11 | .PHONY: all | 11 | .PHONY: all |
12 | all: libtracelog.so | 12 | all: libtracelog.so |
13 | 13 | ||
14 | %.o : %.c $(H_FILE_LIST) ../include/rundefs.h | 14 | %.o : %.c $(H_FILE_LIST) ../include/rundefs.h $(ROOT)/config.mk |
15 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 15 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ |
16 | 16 | ||
17 | libtracelog.so: $(OBJS) | 17 | libtracelog.so: $(OBJS) $(ROOT)/config.mk |
18 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl | 18 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl |
19 | 19 | ||
20 | .PHONY: clean | 20 | .PHONY: clean |
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libtracelog.so *.plist | |||
22 | 22 | ||
23 | .PHONY: distclean | 23 | .PHONY: distclean |
24 | distclean: clean | 24 | distclean: clean |
25 | rm -fr Makefile | ||
diff --git a/src/man/Makefile.in b/src/man/Makefile index a63f9d28e..283822d1f 100644 --- a/src/man/Makefile.in +++ b/src/man/Makefile | |||
@@ -2,9 +2,9 @@ | |||
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 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/config.mk | 5 | -include $(ROOT)/config.mk |
6 | 6 | ||
7 | %.man: %.txt | 7 | %.man: %.txt $(ROOT)/config.mk |
8 | gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ | 8 | gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ |
9 | 9 | ||
10 | .PHONY: clean | 10 | .PHONY: clean |
@@ -12,4 +12,3 @@ clean:; rm -fr *.man | |||
12 | 12 | ||
13 | .PHONY: distclean | 13 | .PHONY: distclean |
14 | distclean: clean | 14 | distclean: clean |
15 | rm -fr Makefile | ||
diff --git a/src/profstats/Makefile.in b/src/profstats/Makefile index 394f30fda..0274aead2 100644 --- a/src/profstats/Makefile.in +++ b/src/profstats/Makefile | |||
@@ -4,10 +4,10 @@ all: profstats | |||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/src/common.mk | 5 | include $(ROOT)/src/common.mk |
6 | 6 | ||
7 | %.o : %.c $(H_FILE_LIST) ../include/common.h | 7 | %.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk |
8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 8 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
9 | 9 | ||
10 | profstats: $(OBJS) | 10 | profstats: $(OBJS) $(ROOT)/config.mk |
11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 11 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
12 | 12 | ||
13 | .PHONY: clean | 13 | .PHONY: clean |
@@ -15,4 +15,3 @@ clean:; rm -fr *.o profstats *.gcov *.gcda *.gcno *.plist | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/src/zsh_completion/Makefile.in b/src/zsh_completion/Makefile index fceab1d00..d7bc1038a 100644 --- a/src/zsh_completion/Makefile.in +++ b/src/zsh_completion/Makefile | |||
@@ -2,9 +2,9 @@ | |||
2 | all: _firejail | 2 | all: _firejail |
3 | 3 | ||
4 | ROOT = ../.. | 4 | ROOT = ../.. |
5 | include $(ROOT)/config.mk | 5 | -include $(ROOT)/config.mk |
6 | 6 | ||
7 | _firejail: _firejail.in | 7 | _firejail: _firejail.in $(ROOT)/config.mk |
8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp | 8 | gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp |
9 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ | 9 | sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ |
10 | rm $@.tmp | 10 | rm $@.tmp |
@@ -15,4 +15,3 @@ clean: | |||
15 | 15 | ||
16 | .PHONY: distclean | 16 | .PHONY: distclean |
17 | distclean: clean | 17 | distclean: clean |
18 | rm -fr Makefile | ||
diff --git a/test/Makefile.in b/test/Makefile index 264314a3b..2f3a97d73 100644 --- a/test/Makefile.in +++ b/test/Makefile | |||
@@ -11,4 +11,3 @@ clean: | |||
11 | 11 | ||
12 | .PHONY: distclean | 12 | .PHONY: distclean |
13 | distclean: clean | 13 | distclean: clean |
14 | rm -f Makefile | ||