diff options
author | 2022-05-10 15:47:44 -0300 | |
---|---|---|
committer | 2022-06-30 05:30:14 -0300 | |
commit | 011d84b462a78703b9b939cb5e48b4cc75ebe015 (patch) | |
tree | fe2ad82e289323a7749191a6e8f719b011e2b937 | |
parent | Transmission fixes: drop private-lib (#5213) (diff) | |
download | firejail-011d84b462a78703b9b939cb5e48b4cc75ebe015.tar.gz firejail-011d84b462a78703b9b939cb5e48b4cc75ebe015.tar.zst firejail-011d84b462a78703b9b939cb5e48b4cc75ebe015.zip |
build: reduce autoconf input files from 32 to 2
Configure summary: autoconf essentially only parses configure.ac and
generates the configure script (that is, the "./configure" shell
script). The latter is what actually checks what is available on the
system and internally sets the value of the output variables. It then,
for every filename foo in AC_CONFIG_FILES (and for every output variable
name BAR in AC_SUBST), reads foo.in, replaces every occurrence of
`@BAR@` with the value of the shell variable `$BAR` and generates the
file foo from the result. After this, configure is finished and `make`
could be executed to start the build.
Now that (as of #5140) all output variables are only defined on
config.mk.in and on config.sh.in, there is no need to generate any
makefile nor any other mkfile or shell script at configure time. So
rename every "Makefile.in" to "Makefile", mkdeb.sh.in to mkdeb.sh,
src/common.mk.in to src/common.mk and leave just config.mk and config.sh
as the files to be generated at configure time.
This allows editing and committing all makefiles directly, without
potentially having to run ./configure in between.
Commands used to rename the makefiles:
$ git ls-files -z -- '*Makefile.in' | xargs -0 -I '{}' sh -c \
"git mv '{}' \"\$(dirname '{}')/Makefile\""
Additionally, from my (rudimentary) testing, this commit reduces the
time it takes to run ./configure by about 20~25% compared to commit
72ece92ea ("Transmission fixes: drop private-lib (#5213)", 2022-06-22).
Environment: dash 0.5.11.5-1, gcc 12.1.0-2, Artix Linux, ext4 on an HDD.
Commands used for benchmarking each commit:
$ : >time_configure && ./configure && make distclean &&
for i in $(seq 1 10); do
{ time -p ./configure; } 2>>time_configure; done
$ grep real time_configure |
awk '{ total += $2 } END { print total/NR }'
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | Makefile (renamed from Makefile.in) | 10 | ||||
-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) | 1 | ||||
-rw-r--r-- | src/common.mk (renamed from src/common.mk.in) | 0 | ||||
-rw-r--r-- | src/fbuilder/Makefile (renamed from src/fbuilder/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fcopy/Makefile (renamed from src/fcopy/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fids/Makefile (renamed from src/fids/Makefile.in) | 1 | ||||
-rw-r--r-- | src/firecfg/Makefile (renamed from src/firecfg/Makefile.in) | 1 | ||||
-rw-r--r-- | src/firejail/Makefile (renamed from src/firejail/Makefile.in) | 1 | ||||
-rw-r--r-- | src/firemon/Makefile (renamed from src/firemon/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fldd/Makefile (renamed from src/fldd/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fnet/Makefile (renamed from src/fnet/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fnetfilter/Makefile (renamed from src/fnetfilter/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fnettrace-dns/Makefile (renamed from src/fnettrace-dns/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fnettrace-sni/Makefile (renamed from src/fnettrace-sni/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fnettrace/Makefile (renamed from src/fnettrace/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fsec-optimize/Makefile (renamed from src/fsec-optimize/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fsec-print/Makefile (renamed from src/fsec-print/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fseccomp/Makefile (renamed from src/fseccomp/Makefile.in) | 1 | ||||
-rw-r--r-- | src/ftee/Makefile (renamed from src/ftee/Makefile.in) | 1 | ||||
-rw-r--r-- | src/fzenity/Makefile (renamed from src/fzenity/Makefile.in) | 1 | ||||
-rw-r--r-- | src/jailcheck/Makefile (renamed from src/jailcheck/Makefile.in) | 1 | ||||
-rw-r--r-- | src/lib/Makefile (renamed from src/lib/Makefile.in) | 1 | ||||
-rw-r--r-- | src/libpostexecseccomp/Makefile (renamed from src/libpostexecseccomp/Makefile.in) | 1 | ||||
-rw-r--r-- | src/libtrace/Makefile (renamed from src/libtrace/Makefile.in) | 1 | ||||
-rw-r--r-- | src/libtracelog/Makefile (renamed from src/libtracelog/Makefile.in) | 1 | ||||
-rw-r--r-- | src/man/Makefile (renamed from src/man/Makefile.in) | 1 | ||||
-rw-r--r-- | src/profstats/Makefile (renamed from src/profstats/Makefile.in) | 1 | ||||
-rw-r--r-- | src/zsh_completion/Makefile (renamed from src/zsh_completion/Makefile.in) | 1 | ||||
-rw-r--r-- | test/Makefile (renamed from test/Makefile.in) | 1 |
34 files changed, 10 insertions, 112 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 |
@@ -85,7 +85,7 @@ distclean: clean | |||
85 | $(MAKE) -C $$dir distclean; \ | 85 | $(MAKE) -C $$dir distclean; \ |
86 | done | 86 | done |
87 | $(MAKE) -C test distclean | 87 | $(MAKE) -C test distclean |
88 | rm -fr Makefile autom4te.cache config.log config.mk config.sh config.status src/common.mk mkdeb.sh | 88 | rm -fr autom4te.cache config.log config.mk config.sh config.status |
89 | 89 | ||
90 | realinstall: | 90 | realinstall: |
91 | # firejail executable | 91 | # firejail executable |
@@ -189,7 +189,7 @@ uninstall: | |||
189 | 189 | ||
190 | DISTFILES = \ | 190 | DISTFILES = \ |
191 | COPYING \ | 191 | COPYING \ |
192 | Makefile.in \ | 192 | Makefile \ |
193 | README \ | 193 | README \ |
194 | RELNOTES \ | 194 | RELNOTES \ |
195 | config.mk.in \ | 195 | config.mk.in \ |
@@ -200,20 +200,18 @@ contrib \ | |||
200 | etc \ | 200 | etc \ |
201 | install.sh \ | 201 | install.sh \ |
202 | m4 \ | 202 | m4 \ |
203 | mkdeb.sh.in \ | 203 | mkdeb.sh \ |
204 | mketc.sh \ | 204 | mketc.sh \ |
205 | mkman.sh \ | 205 | mkman.sh \ |
206 | platform \ | 206 | platform \ |
207 | src | 207 | src |
208 | 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 | 209 | 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 | 210 | ||
211 | dist: | 211 | dist: |
212 | mv config.sh config.sh.old | 212 | mv config.sh config.sh.old |
213 | mv config.status config.status.old | 213 | mv config.status config.status.old |
214 | mv mkdeb.sh mkdeb.sh.old | ||
215 | make distclean | 214 | make distclean |
216 | mv mkdeb.sh.old mkdeb.sh | ||
217 | mv config.status.old config.status | 215 | mv config.status.old config.status |
218 | mv config.sh.old config.sh | 216 | mv config.sh.old config.sh |
219 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz | 217 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz |
@@ -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..9157c9225 100644 --- a/src/bash_completion/Makefile.in +++ b/src/bash_completion/Makefile | |||
@@ -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..2b87c33f0 100644 --- a/src/common.mk.in +++ b/src/common.mk | |||
diff --git a/src/fbuilder/Makefile.in b/src/fbuilder/Makefile index 060f97493..b769deac9 100644 --- a/src/fbuilder/Makefile.in +++ b/src/fbuilder/Makefile | |||
@@ -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..801615878 100644 --- a/src/fcopy/Makefile.in +++ b/src/fcopy/Makefile | |||
@@ -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..eed6e44ea 100644 --- a/src/fids/Makefile.in +++ b/src/fids/Makefile | |||
@@ -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..c06bb5338 100644 --- a/src/firecfg/Makefile.in +++ b/src/firecfg/Makefile | |||
@@ -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..ffe978957 100644 --- a/src/firejail/Makefile.in +++ b/src/firejail/Makefile | |||
@@ -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..45203673b 100644 --- a/src/firemon/Makefile.in +++ b/src/firemon/Makefile | |||
@@ -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..fdaa202fd 100644 --- a/src/fldd/Makefile.in +++ b/src/fldd/Makefile | |||
@@ -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..2642fea38 100644 --- a/src/fnet/Makefile.in +++ b/src/fnet/Makefile | |||
@@ -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..e0738281a 100644 --- a/src/fnetfilter/Makefile.in +++ b/src/fnetfilter/Makefile | |||
@@ -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..9946f545d 100644 --- a/src/fnettrace-dns/Makefile.in +++ b/src/fnettrace-dns/Makefile | |||
@@ -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..556727831 100644 --- a/src/fnettrace-sni/Makefile.in +++ b/src/fnettrace-sni/Makefile | |||
@@ -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..406d095ff 100644 --- a/src/fnettrace/Makefile.in +++ b/src/fnettrace/Makefile | |||
@@ -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..1ccc2fa8f 100644 --- a/src/fsec-optimize/Makefile.in +++ b/src/fsec-optimize/Makefile | |||
@@ -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..b5ba6f160 100644 --- a/src/fsec-print/Makefile.in +++ b/src/fsec-print/Makefile | |||
@@ -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..527ec0a68 100644 --- a/src/fseccomp/Makefile.in +++ b/src/fseccomp/Makefile | |||
@@ -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..00c1a2662 100644 --- a/src/ftee/Makefile.in +++ b/src/ftee/Makefile | |||
@@ -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..169b78f09 100644 --- a/src/fzenity/Makefile.in +++ b/src/fzenity/Makefile | |||
@@ -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..62e82c9b3 100644 --- a/src/jailcheck/Makefile.in +++ b/src/jailcheck/Makefile | |||
@@ -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..bac2d4e93 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile | |||
@@ -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..2f108d8b9 100644 --- a/src/libpostexecseccomp/Makefile.in +++ b/src/libpostexecseccomp/Makefile | |||
@@ -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..11c75136d 100644 --- a/src/libtrace/Makefile.in +++ b/src/libtrace/Makefile | |||
@@ -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..d09a8aa1c 100644 --- a/src/libtracelog/Makefile.in +++ b/src/libtracelog/Makefile | |||
@@ -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..c83a4b7eb 100644 --- a/src/man/Makefile.in +++ b/src/man/Makefile | |||
@@ -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..0e3b101ef 100644 --- a/src/profstats/Makefile.in +++ b/src/profstats/Makefile | |||
@@ -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..303057b0b 100644 --- a/src/zsh_completion/Makefile.in +++ b/src/zsh_completion/Makefile | |||
@@ -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 | ||