aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-23 07:35:19 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-30 05:32:07 -0300
commite21637ca82199d9b659f34d71674090e45fc89db (patch)
tree2a0629d8202ee179124ff7466165aa65cd937e22 /src
parentmakefiles: stop failing when config.mk does not exist (diff)
downloadfirejail-e21637ca82199d9b659f34d71674090e45fc89db.tar.gz
firejail-e21637ca82199d9b659f34d71674090e45fc89db.tar.zst
firejail-e21637ca82199d9b659f34d71674090e45fc89db.zip
makefiles: add generated files as dependencies
With the previous commit ("makefiles: stop failing when config.mk does not exist", 2022-06-23), make will not immediately fail when trying to build a target without having the proper compile-time flags (which are defined on common.mk). For example, when running the command below: make distclean && make It will throw an error only after (mis-)compiling multiple objects. So add a dependency on config.mk on every target that uses output variables (such as @NAME@ / $(NAME)) on its recipe. And add a dependency on config.sh on targets that call shell scripts that use output variables (such as @NAME@ / $NAME). Also, add a recipe for config.mk / config.sh telling to run ./configure, to make it a bit more obvious just in case. With this commit, make will abort earlier, by detecting that the config.mk / config.sh dependency does not exist. This happens before trying to execute the recipe. This also makes the dependencies more accurate, since if config.mk (which defines some CFLAGS) is changed, the CFLAGS may also have changed, so a target that uses CFLAGS should probably be considered out of date in this case anyway. Relates to #5140.
Diffstat (limited to 'src')
-rw-r--r--src/bash_completion/Makefile2
-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-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/Makefile2
-rw-r--r--src/libpostexecseccomp/Makefile4
-rw-r--r--src/libtrace/Makefile4
-rw-r--r--src/libtracelog/Makefile4
-rw-r--r--src/man/Makefile2
-rw-r--r--src/profstats/Makefile4
-rw-r--r--src/zsh_completion/Makefile2
26 files changed, 48 insertions, 48 deletions
diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile
index 16c4a31ee..e787a7b92 100644
--- a/src/bash_completion/Makefile
+++ b/src/bash_completion/Makefile
@@ -4,7 +4,7 @@ all: firejail.bash_completion
4ROOT = ../.. 4ROOT = ../..
5-include $(ROOT)/config.mk 5-include $(ROOT)/config.mk
6 6
7firejail.bash_completion: firejail.bash_completion.in 7firejail.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
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index b769deac9..da0403c6e 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -4,10 +4,10 @@ all: fbuilder
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fbuilder: $(OBJS) 10fbuilder: $(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
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
index 801615878..ae128df9b 100644
--- a/src/fcopy/Makefile
+++ b/src/fcopy/Makefile
@@ -4,10 +4,10 @@ all: fcopy
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fcopy: $(OBJS) ../lib/common.o 10fcopy: $(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
diff --git a/src/fids/Makefile b/src/fids/Makefile
index eed6e44ea..e57c56b5b 100644
--- a/src/fids/Makefile
+++ b/src/fids/Makefile
@@ -4,11 +4,11 @@ all: fids
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
11fids: $(OBJS) 11fids: $(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
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
index c06bb5338..3b0daed71 100644
--- a/src/firecfg/Makefile
+++ b/src/firecfg/Makefile
@@ -4,10 +4,10 @@ all: firecfg
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o 10firecfg: $(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
diff --git a/src/firejail/Makefile b/src/firejail/Makefile
index ffe978957..23444107f 100644
--- a/src/firejail/Makefile
+++ b/src/firejail/Makefile
@@ -4,10 +4,10 @@ all: firejail
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o 10firejail: $(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
diff --git a/src/firemon/Makefile b/src/firemon/Makefile
index 45203673b..b2d2f4d14 100644
--- a/src/firemon/Makefile
+++ b/src/firemon/Makefile
@@ -4,10 +4,10 @@ all: firemon
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10firemon: $(OBJS) ../lib/common.o ../lib/pid.o 10firemon: $(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
diff --git a/src/fldd/Makefile b/src/fldd/Makefile
index fdaa202fd..d9a70529b 100644
--- a/src/fldd/Makefile
+++ b/src/fldd/Makefile
@@ -4,10 +4,10 @@ all: fldd
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o 10fldd: $(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
diff --git a/src/fnet/Makefile b/src/fnet/Makefile
index 2642fea38..36e95522f 100644
--- a/src/fnet/Makefile
+++ b/src/fnet/Makefile
@@ -4,10 +4,10 @@ all: fnet
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o 10fnet: $(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
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
index e0738281a..758561b9e 100644
--- a/src/fnetfilter/Makefile
+++ b/src/fnetfilter/Makefile
@@ -4,10 +4,10 @@ all: fnetfilter
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fnetfilter: $(OBJS) ../lib/common.o 10fnetfilter: $(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
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile
index 9946f545d..101abd4d4 100644
--- a/src/fnettrace-dns/Makefile
+++ b/src/fnettrace-dns/Makefile
@@ -4,10 +4,10 @@ all: fnettrace-dns
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fnettrace-dns: $(OBJS) 10fnettrace-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
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile
index 556727831..da7c1ca4e 100644
--- a/src/fnettrace-sni/Makefile
+++ b/src/fnettrace-sni/Makefile
@@ -4,10 +4,10 @@ all: fnettrace-sni
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fnettrace-sni: $(OBJS) 10fnettrace-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
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile
index 406d095ff..f41a4d36d 100644
--- a/src/fnettrace/Makefile
+++ b/src/fnettrace/Makefile
@@ -4,10 +4,10 @@ all: fnettrace
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fnettrace: $(OBJS) 10fnettrace: $(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
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index 1ccc2fa8f..1aa49d34b 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -4,10 +4,10 @@ all: fsec-optimize
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fsec-optimize: $(OBJS) ../lib/common.o ../lib/libnetlink.o 10fsec-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
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
index b5ba6f160..b076c0588 100644
--- a/src/fsec-print/Makefile
+++ b/src/fsec-print/Makefile
@@ -4,10 +4,10 @@ all: fsec-print
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fsec-print: $(OBJS) ../lib/common.o ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o 10fsec-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
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
index 527ec0a68..9bf4c050b 100644
--- a/src/fseccomp/Makefile
+++ b/src/fseccomp/Makefile
@@ -4,10 +4,10 @@ all: fseccomp
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o 10fseccomp: $(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
diff --git a/src/ftee/Makefile b/src/ftee/Makefile
index 00c1a2662..535d7ff63 100644
--- a/src/ftee/Makefile
+++ b/src/ftee/Makefile
@@ -4,10 +4,10 @@ all: ftee
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10ftee: $(OBJS) 10ftee: $(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
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
index 169b78f09..0358dd3e9 100644
--- a/src/fzenity/Makefile
+++ b/src/fzenity/Makefile
@@ -4,10 +4,10 @@ all: fzenity
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10fzenity: $(OBJS) 10fzenity: $(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
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
index 62e82c9b3..52feb86e6 100644
--- a/src/jailcheck/Makefile
+++ b/src/jailcheck/Makefile
@@ -4,10 +4,10 @@ all: jailcheck
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10jailcheck: $(OBJS) 10jailcheck: $(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
diff --git a/src/lib/Makefile b/src/lib/Makefile
index bac2d4e93..d9bc63ef7 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -4,7 +4,7 @@ include $(ROOT)/src/common.mk
4.PHONY: all 4.PHONY: all
5all: $(OBJS) 5all: $(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
diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile
index 14e0cdb1d..5386af58b 100644
--- a/src/libpostexecseccomp/Makefile
+++ b/src/libpostexecseccomp/Makefile
@@ -11,10 +11,10 @@ LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
11.PHONY: all 11.PHONY: all
12all: libpostexecseccomp.so 12all: 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
17libpostexecseccomp.so: $(OBJS) 17libpostexecseccomp.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
diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile
index 46a8f97c2..6f28b3442 100644
--- a/src/libtrace/Makefile
+++ b/src/libtrace/Makefile
@@ -11,10 +11,10 @@ LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
11.PHONY: all 11.PHONY: all
12all: libtrace.so 12all: 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
17libtrace.so: $(OBJS) 17libtrace.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
diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile
index 1a3ab1ba5..c5d9c131d 100644
--- a/src/libtracelog/Makefile
+++ b/src/libtracelog/Makefile
@@ -11,10 +11,10 @@ LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
11.PHONY: all 11.PHONY: all
12all: libtracelog.so 12all: 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
17libtracelog.so: $(OBJS) 17libtracelog.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
diff --git a/src/man/Makefile b/src/man/Makefile
index b786e1ca9..283822d1f 100644
--- a/src/man/Makefile
+++ b/src/man/Makefile
@@ -4,7 +4,7 @@ all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-pro
4ROOT = ../.. 4ROOT = ../..
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
diff --git a/src/profstats/Makefile b/src/profstats/Makefile
index 0e3b101ef..0274aead2 100644
--- a/src/profstats/Makefile
+++ b/src/profstats/Makefile
@@ -4,10 +4,10 @@ all: profstats
4ROOT = ../.. 4ROOT = ../..
5include $(ROOT)/src/common.mk 5include $(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
10profstats: $(OBJS) 10profstats: $(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
diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile
index bec015049..d7bc1038a 100644
--- a/src/zsh_completion/Makefile
+++ b/src/zsh_completion/Makefile
@@ -4,7 +4,7 @@ all: _firejail
4ROOT = ../.. 4ROOT = ../..
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
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-20 01:46:05 +0000