aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-05-10 15:47:44 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-30 05:30:14 -0300
commit011d84b462a78703b9b939cb5e48b4cc75ebe015 (patch)
treefe2ad82e289323a7749191a6e8f719b011e2b937 /src
parentTransmission fixes: drop private-lib (#5213) (diff)
downloadfirejail-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 }'
Diffstat (limited to 'src')
-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
27 files changed, 0 insertions, 26 deletions
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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
18distclean: clean 18distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: 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
14distclean: clean 14distclean: 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
24distclean: clean 24distclean: 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
24distclean: clean 24distclean: 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
24distclean: clean 24distclean: 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
14distclean: clean 14distclean: 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
17distclean: clean 17distclean: 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
17distclean: clean 17distclean: clean
18 rm -fr Makefile