aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-05-06 21:00:19 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-12 16:08:47 -0300
commitda6d855dc29e0db10ecf1065f9860a2874b6bf07 (patch)
tree1ccebf31579401effbd97467ccce86b84805eeba
parentcommon.mk.in: fix comment about file usage intent (diff)
downloadfirejail-da6d855dc29e0db10ecf1065f9860a2874b6bf07.tar.gz
firejail-da6d855dc29e0db10ecf1065f9860a2874b6bf07.tar.zst
firejail-da6d855dc29e0db10ecf1065f9860a2874b6bf07.zip
makefiles: define root dir and include relative to it
A non-absolute path on an include command is always treated as being relative to the directory in which "make" was started in, rather than being relative to the makefile that contains the command. For example, given the following project structure and file contents: * Makefile: include src/foo.mk * src/foo.mk: include bar.mk * src/bar.mk: Running "make" on the root project directory (that is, where "Makefile" is) yields the following: src/foo.mk:1: bar.mk: No such file or directory As "bar.mk" in "include bar.mk" is relative to the current (process) directory (that is, "./bar.mk") and not to where foo.mk is located in ("./src/bar.mk"). So on every makefile that contains an include command, define the root project directory in the ROOT variable and always include relative to it, to later enable any included mkfiles to include other mkfiles without having to worry about the correct path. Commands used to search and replace: $ git grep -Flz 'include ../common.mk' -- src | xargs -0 -I '{}' sh -c \ "printf '%s\n' \"\`sed 's|include ../common.mk|ROOT = ../..\ninclude \$(ROOT)/src/common.mk|' '{}'\`\" >'{}'" Environment: GNU make 4.3-3.1 on Artix Linux
Diffstat
-rw-r--r--src/bash_completion/Makefile.in3
-rw-r--r--src/fbuilder/Makefile.in3
-rw-r--r--src/fcopy/Makefile.in3
-rw-r--r--src/fids/Makefile.in3
-rw-r--r--src/firecfg/Makefile.in3
-rw-r--r--src/firejail/Makefile.in3
-rw-r--r--src/firemon/Makefile.in3
-rw-r--r--src/fldd/Makefile.in3
-rw-r--r--src/fnet/Makefile.in3
-rw-r--r--src/fnetfilter/Makefile.in3
-rw-r--r--src/fnettrace-dns/Makefile.in3
-rw-r--r--src/fnettrace-sni/Makefile.in3
-rw-r--r--src/fnettrace/Makefile.in3
-rw-r--r--src/fsec-optimize/Makefile.in3
-rw-r--r--src/fsec-print/Makefile.in3
-rw-r--r--src/fseccomp/Makefile.in3
-rw-r--r--src/ftee/Makefile.in3
-rw-r--r--src/fzenity/Makefile.in3
-rw-r--r--src/jailcheck/Makefile.in3
-rw-r--r--src/lib/Makefile.in3
-rw-r--r--src/man/Makefile.in3
-rw-r--r--src/profstats/Makefile.in3
-rw-r--r--src/zsh_completion/Makefile.in3
23 files changed, 46 insertions, 23 deletions
diff --git a/src/bash_completion/Makefile.in b/src/bash_completion/Makefile.in
index f7db9e6b4..750cd9524 100644
--- a/src/bash_completion/Makefile.in
+++ b/src/bash_completion/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: firejail.bash_completion 2all: firejail.bash_completion
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6firejail.bash_completion: firejail.bash_completion.in 7firejail.bash_completion: firejail.bash_completion.in
7 gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp 8 gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp
diff --git a/src/fbuilder/Makefile.in b/src/fbuilder/Makefile.in
index 6eaee284b..060f97493 100644
--- a/src/fbuilder/Makefile.in
+++ b/src/fbuilder/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fbuilder 2all: fbuilder
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fcopy/Makefile.in b/src/fcopy/Makefile.in
index e19f5d3b5..a2a4172a9 100644
--- a/src/fcopy/Makefile.in
+++ b/src/fcopy/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fcopy 2all: fcopy
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fids/Makefile.in b/src/fids/Makefile.in
index 5530bcee2..8aac55419 100644
--- a/src/fids/Makefile.in
+++ b/src/fids/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fids 2all: fids
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/firecfg/Makefile.in b/src/firecfg/Makefile.in
index 43329be46..d112cc40a 100644
--- a/src/firecfg/Makefile.in
+++ b/src/firecfg/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: firecfg 2all: firecfg
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile.in
index 793d2cdd1..0dec3da98 100644
--- a/src/firejail/Makefile.in
+++ b/src/firejail/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: firejail 2all: firejail
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/rundefs.h ../include/common.h ../include/ldd_utils.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall_i386.h ../include/syscall_x86_64.h ../include/firejail_user.h 7%.o : %.c $(H_FILE_LIST) ../include/rundefs.h ../include/common.h ../include/ldd_utils.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall_i386.h ../include/syscall_x86_64.h ../include/firejail_user.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile.in
index a1b6692aa..6ac0cfff1 100644
--- a/src/firemon/Makefile.in
+++ b/src/firemon/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: firemon 2all: firemon
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fldd/Makefile.in b/src/fldd/Makefile.in
index ba87d16cd..f3842cbee 100644
--- a/src/fldd/Makefile.in
+++ b/src/fldd/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fldd 2all: fldd
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fnet/Makefile.in b/src/fnet/Makefile.in
index 7447c6d3f..3d70e50bf 100644
--- a/src/fnet/Makefile.in
+++ b/src/fnet/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fnet 2all: fnet
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fnetfilter/Makefile.in b/src/fnetfilter/Makefile.in
index 825262482..32b4bbada 100644
--- a/src/fnetfilter/Makefile.in
+++ b/src/fnetfilter/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fnetfilter 2all: fnetfilter
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fnettrace-dns/Makefile.in b/src/fnettrace-dns/Makefile.in
index 6c11e5bc8..7cafe6907 100644
--- a/src/fnettrace-dns/Makefile.in
+++ b/src/fnettrace-dns/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fnettrace-dns 2all: fnettrace-dns
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) 7%.o : %.c $(H_FILE_LIST)
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fnettrace-sni/Makefile.in b/src/fnettrace-sni/Makefile.in
index 9fe954874..9349d06f8 100644
--- a/src/fnettrace-sni/Makefile.in
+++ b/src/fnettrace-sni/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fnettrace-sni 2all: fnettrace-sni
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) 7%.o : %.c $(H_FILE_LIST)
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fnettrace/Makefile.in b/src/fnettrace/Makefile.in
index 755ddcc3a..a7b93194a 100644
--- a/src/fnettrace/Makefile.in
+++ b/src/fnettrace/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fnettrace 2all: fnettrace
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) 7%.o : %.c $(H_FILE_LIST)
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fsec-optimize/Makefile.in b/src/fsec-optimize/Makefile.in
index a2187e89c..cfd876953 100644
--- a/src/fsec-optimize/Makefile.in
+++ b/src/fsec-optimize/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fsec-optimize 2all: fsec-optimize
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fsec-print/Makefile.in b/src/fsec-print/Makefile.in
index 824fb5daf..d07c42405 100644
--- a/src/fsec-print/Makefile.in
+++ b/src/fsec-print/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fsec-print 2all: fsec-print
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fseccomp/Makefile.in b/src/fseccomp/Makefile.in
index 41abfce17..140a56ab0 100644
--- a/src/fseccomp/Makefile.in
+++ b/src/fseccomp/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fseccomp 2all: fseccomp
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile.in
index 05caf81be..f9ad78de2 100644
--- a/src/ftee/Makefile.in
+++ b/src/ftee/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: ftee 2all: ftee
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) 7%.o : %.c $(H_FILE_LIST)
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/fzenity/Makefile.in b/src/fzenity/Makefile.in
index d9f976165..6b7ce0874 100644
--- a/src/fzenity/Makefile.in
+++ b/src/fzenity/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: fzenity 2all: fzenity
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/jailcheck/Makefile.in b/src/jailcheck/Makefile.in
index d218c1f90..cf619ad1e 100644
--- a/src/jailcheck/Makefile.in
+++ b/src/jailcheck/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: jailcheck 2all: jailcheck
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 49c8057b3..330a47892 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,4 +1,5 @@
1include ../common.mk 1ROOT = ../..
2include $(ROOT)/src/common.mk
2 3
3.PHONY: all 4.PHONY: all
4all: $(OBJS) 5all: $(OBJS)
diff --git a/src/man/Makefile.in b/src/man/Makefile.in
index fbd2d795e..0bd7607ef 100644
--- a/src/man/Makefile.in
+++ b/src/man/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man 2all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.man: %.txt 7%.man: %.txt
7 gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ 8 gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@
diff --git a/src/profstats/Makefile.in b/src/profstats/Makefile.in
index fa1b4f200..394f30fda 100644
--- a/src/profstats/Makefile.in
+++ b/src/profstats/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: profstats 2all: profstats
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6%.o : %.c $(H_FILE_LIST) ../include/common.h 7%.o : %.c $(H_FILE_LIST) ../include/common.h
7 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ 8 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/src/zsh_completion/Makefile.in b/src/zsh_completion/Makefile.in
index a83cccf6c..9ca12e92b 100644
--- a/src/zsh_completion/Makefile.in
+++ b/src/zsh_completion/Makefile.in
@@ -1,7 +1,8 @@
1.PHONY: all 1.PHONY: all
2all: _firejail 2all: _firejail
3 3
4include ../common.mk 4ROOT = ../..
5include $(ROOT)/src/common.mk
5 6
6_firejail: _firejail.in 7_firejail: _firejail.in
7 gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp 8 gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-01 12:37:05 +0000