aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-07-29 22:54:52 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-11-21 16:59:43 -0300
commit72345b7305e1cc7e079c83d805f3af979d7493cd (patch)
tree96cccb324b48b6a06a24c272ae25482d476365b7 /src
parentMakefile: put the all target after variables (diff)
downloadfirejail-72345b7305e1cc7e079c83d805f3af979d7493cd.tar.gz
firejail-72345b7305e1cc7e079c83d805f3af979d7493cd.tar.zst
firejail-72345b7305e1cc7e079c83d805f3af979d7493cd.zip
makefiles: include config.mk directly
Instead of including it through src/common.mk. This allows each makefile to directly override any value defined in config.mk.
Diffstat (limited to 'src')
-rw-r--r--src/common.mk4
-rw-r--r--src/fbuilder/Makefile4
-rw-r--r--src/fcopy/Makefile4
-rw-r--r--src/fids/Makefile4
-rw-r--r--src/firecfg/Makefile4
-rw-r--r--src/firejail/Makefile4
-rw-r--r--src/firemon/Makefile4
-rw-r--r--src/fldd/Makefile4
-rw-r--r--src/fnet/Makefile4
-rw-r--r--src/fnetfilter/Makefile4
-rw-r--r--src/fnettrace-dns/Makefile4
-rw-r--r--src/fnettrace-icmp/Makefile4
-rw-r--r--src/fnettrace-sni/Makefile4
-rw-r--r--src/fnettrace/Makefile4
-rw-r--r--src/fsec-optimize/Makefile4
-rw-r--r--src/fsec-print/Makefile4
-rw-r--r--src/fseccomp/Makefile4
-rw-r--r--src/ftee/Makefile4
-rw-r--r--src/fzenity/Makefile4
-rw-r--r--src/jailcheck/Makefile4
-rw-r--r--src/lib/Makefile4
-rw-r--r--src/profstats/Makefile4
22 files changed, 64 insertions, 24 deletions
diff --git a/src/common.mk b/src/common.mk
index 7fc23c6e7..30ba2b494 100644
--- a/src/common.mk
+++ b/src/common.mk
@@ -1,8 +1,6 @@
1# Common definitions for building C programs and non-shared objects. 1# Common definitions for building C programs and non-shared objects.
2# 2#
3# Note: "ROOT" must be defined before including this file. 3# Note: $(ROOT)/config.mk must be included before this file.
4
5-include $(ROOT)/config.mk
6 4
7H_FILE_LIST = $(sort $(wildcard *.h)) 5H_FILE_LIST = $(sort $(wildcard *.h))
8C_FILE_LIST = $(sort $(wildcard *.c)) 6C_FILE_LIST = $(sort $(wildcard *.c))
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index da0403c6e..92e207e61 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fbuilder 5all: fbuilder
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
index ae128df9b..a4c4a293c 100644
--- a/src/fcopy/Makefile
+++ b/src/fcopy/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fcopy 5all: fcopy
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
diff --git a/src/fids/Makefile b/src/fids/Makefile
index 4233e09ae..8da9fd40f 100644
--- a/src/fids/Makefile
+++ b/src/fids/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fids 5all: fids
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
index 3b0daed71..f40d96ebe 100644
--- a/src/firecfg/Makefile
+++ b/src/firecfg/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: firecfg 5all: firecfg
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
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 9%.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
diff --git a/src/firejail/Makefile b/src/firejail/Makefile
index 23444107f..6473e4aa0 100644
--- a/src/firejail/Makefile
+++ b/src/firejail/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: firejail 5all: firejail
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
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 9%.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
diff --git a/src/firemon/Makefile b/src/firemon/Makefile
index b2d2f4d14..19828a2da 100644
--- a/src/firemon/Makefile
+++ b/src/firemon/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: firemon 5all: firemon
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk
diff --git a/src/fldd/Makefile b/src/fldd/Makefile
index d9a70529b..899efb597 100644
--- a/src/fldd/Makefile
+++ b/src/fldd/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fldd 5all: fldd
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h $(ROOT)/config.mk
diff --git a/src/fnet/Makefile b/src/fnet/Makefile
index 36e95522f..249cd8501 100644
--- a/src/fnet/Makefile
+++ b/src/fnet/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fnet 5all: fnet
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h $(ROOT)/config.mk
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
index 758561b9e..5c7cf4733 100644
--- a/src/fnetfilter/Makefile
+++ b/src/fnetfilter/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fnetfilter 5all: fnetfilter
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile
index 101abd4d4..f3417dc69 100644
--- a/src/fnettrace-dns/Makefile
+++ b/src/fnettrace-dns/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fnettrace-dns 5all: fnettrace-dns
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile
index 4dfdc891a..3f5443a34 100644
--- a/src/fnettrace-icmp/Makefile
+++ b/src/fnettrace-icmp/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fnettrace-icmp 5all: fnettrace-icmp
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile
index da7c1ca4e..3510e73f1 100644
--- a/src/fnettrace-sni/Makefile
+++ b/src/fnettrace-sni/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fnettrace-sni 5all: fnettrace-sni
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile
index f41a4d36d..6c4e27f01 100644
--- a/src/fnettrace/Makefile
+++ b/src/fnettrace/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fnettrace 5all: fnettrace
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index 1aa49d34b..2aae732cb 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fsec-optimize 5all: fsec-optimize
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
index b076c0588..354c72c08 100644
--- a/src/fsec-print/Makefile
+++ b/src/fsec-print/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fsec-print 5all: fsec-print
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
index 9bf4c050b..9517df8ef 100644
--- a/src/fseccomp/Makefile
+++ b/src/fseccomp/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fseccomp 5all: fseccomp
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
diff --git a/src/ftee/Makefile b/src/ftee/Makefile
index 535d7ff63..d2177cb3d 100644
--- a/src/ftee/Makefile
+++ b/src/ftee/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: ftee 5all: ftee
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
index 0358dd3e9..b9f57fee5 100644
--- a/src/fzenity/Makefile
+++ b/src/fzenity/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: fzenity 5all: fzenity
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
index 52feb86e6..f21252a56 100644
--- a/src/jailcheck/Makefile
+++ b/src/jailcheck/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: jailcheck 5all: jailcheck
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 7cfd38f10..d9b500409 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: lib 5all: lib
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7.PHONY: lib 9.PHONY: lib
diff --git a/src/profstats/Makefile b/src/profstats/Makefile
index 0274aead2..e7c302186 100644
--- a/src/profstats/Makefile
+++ b/src/profstats/Makefile
@@ -1,7 +1,9 @@
1ROOT = ../..
2-include $(ROOT)/config.mk
3
1.PHONY: all 4.PHONY: all
2all: profstats 5all: profstats
3 6
4ROOT = ../..
5include $(ROOT)/src/common.mk 7include $(ROOT)/src/common.mk
6 8
7%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk 9%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-03 14:03:22 +0000