makefiles: move extra deps into new MOD vars

To make the makefiles more similar. That is, add the following new variables: * MOD_HDRS * MOD_SRCS * MOD_OBJS And move existing module-specific header and object dependencies into `MOD_HDRS` and `MOD_OBJS`, respectively. `MOD_SRCS` is added mostly for symmetry/consistency. Note: Use `MOD_` as a prefix instead of `EXTRA_` to avoid confusion, as the latter is currently used for global variables (such as `EXTRA_CFLAGS`), as opposed to module-specific variables. Note2: Add them directly into the HDRS/SRCS/OBJS variables to avoid cluttering the existing recipes with an extra variables unnecessarily. This also allows, for example, referencing all of the object dependencies with `$<` if `$(OBJS)` is the first dependency (at least in GNU make). Note3: Since HDRS/SRCS/OBJS use simple assignment (through `:=`), the MOD variables should appear before including src/common.mk (or src/so.mk).
author: Kelvin M. Klann <kmk3.code@protonmail.com> 2022-05-07 02:46:17 -0300
committer: Kelvin M. Klann <kmk3.code@protonmail.com> 2022-11-21 17:18:53 -0300
commit: f5b1ccaad25b26a8bb383a268532f269411e512c (patch)
tree: 1dcf23a0dddf90a5e6f6d5f9216a110a3aa7495a
parent: makefiles: expand HDRS, SRCS and OBJS immediately (diff)
download: firejail-f5b1ccaad.tar.gz
firejail-f5b1ccaad.tar.zst
firejail-f5b1ccaad.zip
19 files changed, 96 insertions, 51 deletions
diff --git a/src/common.mk b/src/common.mk
index c20aaf52f..2deace4f5 100644
--- a/src/common.mk
+++ b/src/common.mk
@@ -2,9 +2,9 @@
 #
 # Note: $(ROOT)/config.mk must be included before this file.
-HDRS := $(sort $(wildcard *.h))
+HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
-SRCS := $(sort $(wildcard *.c))
+SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
-OBJS := $(SRCS:.c=.o)
+OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV)
 CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"'   -DVARDIR='"/var/lib/firejail"'
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index ae0ce39df..a7ff45176 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -1,12 +1,14 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/syscall.h
 .PHONY: all
 all: fbuilder
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 fbuilder: $(OBJS) $(ROOT)/config.mk
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
index 11d47c739..99c58b6c8 100644
--- a/src/fcopy/Makefile
+++ b/src/fcopy/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/syscall.h
+MOD_OBJS = ../lib/common.o
 .PHONY: all
 all: fcopy
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-fcopy: $(OBJS) ../lib/common.o $(ROOT)/config.mk
+fcopy: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o fcopy *.gcov *.gcda *.gcno *.plist
diff --git a/src/fids/Makefile b/src/fids/Makefile
index fc970cdd6..8bd44fa78 100644
--- a/src/fids/Makefile
+++ b/src/fids/Makefile
@@ -1,12 +1,14 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h
 .PHONY: all
 all: fids
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 fids: $(OBJS) $(ROOT)/config.mk
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
index 1e0bf7a1a..42d761fa4 100644
--- a/src/firecfg/Makefile
+++ b/src/firecfg/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h
+MOD_OBJS = ../lib/common.o ../lib/firejail_user.o
 .PHONY: all
 all: firecfg
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o $(ROOT)/config.mk
+firecfg: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/firejail_user.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o firecfg *.gcov *.gcda *.gcno *.plist
diff --git a/src/firejail/Makefile b/src/firejail/Makefile
index bb14a26fc..fcb863aaa 100644
--- a/src/firejail/Makefile
+++ b/src/firejail/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../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
+MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o
 .PHONY: all
 all: firejail
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../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
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-firejail: $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
+firejail: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o firejail *.gcov *.gcda *.gcno *.plist
diff --git a/src/firemon/Makefile b/src/firemon/Makefile
index 74c283357..eedad0a6d 100644
--- a/src/firemon/Makefile
+++ b/src/firemon/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/pid.h
+MOD_OBJS = ../lib/common.o ../lib/pid.o
 .PHONY: all
 all: firemon
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/pid.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-firemon: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk
+firemon: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o firemon *.gcov *.gcda *.gcno *.plist
diff --git a/src/fldd/Makefile b/src/fldd/Makefile
index 7cfcadada..aea7e838c 100644
--- a/src/fldd/Makefile
+++ b/src/fldd/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
+MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o
 .PHONY: all
 all: fldd
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h ../include/ldd_utils.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(ROOT)/config.mk
+fldd: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o fldd *.gcov *.gcda *.gcno *.plist
diff --git a/src/fnet/Makefile b/src/fnet/Makefile
index 9ce457a5c..3cdaf11cf 100644
--- a/src/fnet/Makefile
+++ b/src/fnet/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/libnetlink.h
+MOD_OBJS = ../lib/common.o ../lib/libnetlink.o
 .PHONY: all
 all: fnet
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/libnetlink.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o $(ROOT)/config.mk
+fnet: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/libnetlink.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o fnet *.gcov *.gcda *.gcno *.plist
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
index fbe408893..7d26ca39e 100644
--- a/src/fnetfilter/Makefile
+++ b/src/fnetfilter/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/syscall.h
+MOD_OBJS = ../lib/common.o
 .PHONY: all
 all: fnetfilter
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-fnetfilter: $(OBJS) ../lib/common.o $(ROOT)/config.mk
+fnetfilter: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o fnetfilter *.gcov *.gcda *.gcno *.plist
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index 21097c371..1bbea61d5 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
+MOD_OBJS = ../lib/common.o ../lib/errno.o
 .PHONY: all
 all: fsec-optimize
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-fsec-optimize: $(OBJS) ../lib/common.o ../lib/errno.o $(ROOT)/config.mk
+fsec-optimize: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
index cb56433f0..3ef78545f 100644
--- a/src/fsec-print/Makefile
+++ b/src/fsec-print/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
+MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
 .PHONY: all
 all: fsec-print
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-fsec-print: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
+fsec-print: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
index ed779afde..532ffb2e8 100644
--- a/src/fseccomp/Makefile
+++ b/src/fseccomp/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/syscall.h
+MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
 .PHONY: all
 all: fseccomp
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
+fseccomp: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o fseccomp *.gcov *.gcda *.gcno *.plist
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
index 169706ff2..63a117337 100644
--- a/src/fzenity/Makefile
+++ b/src/fzenity/Makefile
@@ -1,12 +1,14 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h
 .PHONY: all
 all: fzenity
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 fzenity: $(OBJS) $(ROOT)/config.mk
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
index e880c0597..a61f228c5 100644
--- a/src/jailcheck/Makefile
+++ b/src/jailcheck/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h ../include/pid.h
+MOD_OBJS = ../lib/common.o ../lib/pid.o
 .PHONY: all
 all: jailcheck
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h ../include/pid.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-jailcheck: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk
+jailcheck: $(OBJS) $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS)
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 .PHONY: clean
 clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist
diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile
index c0cab45fb..870c32891 100644
--- a/src/libpostexecseccomp/Makefile
+++ b/src/libpostexecseccomp/Makefile
@@ -1,16 +1,18 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-HDRS := $(sort $(wildcard *.h))
+MOD_HDRS = ../include/seccomp.h ../include/rundefs.h
-SRCS := $(sort $(wildcard *.c))
-OBJS := $(SRCS:.c=.o)
+HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
+SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
+OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
 LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
 .PHONY: all
 all: libpostexecseccomp.so
-%.o : %.c $(HDRS) ../include/seccomp.h ../include/rundefs.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 libpostexecseccomp.so: $(OBJS) $(ROOT)/config.mk
diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile
index bff003e8f..4e826b1aa 100644
--- a/src/libtrace/Makefile
+++ b/src/libtrace/Makefile
@@ -1,9 +1,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-HDRS := $(sort $(wildcard *.h))
+HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
-SRCS := $(sort $(wildcard *.c))
+SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
-OBJS := $(SRCS:.c=.o)
+OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
 LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile
index 97f33003e..7f74df339 100644
--- a/src/libtracelog/Makefile
+++ b/src/libtracelog/Makefile
@@ -1,16 +1,18 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-HDRS := $(sort $(wildcard *.h))
+MOD_HDRS = ../include/rundefs.h
-SRCS := $(sort $(wildcard *.c))
-OBJS := $(SRCS:.c=.o)
+HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
+SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
+OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
 LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
 .PHONY: all
 all: libtracelog.so
-%.o : %.c $(HDRS) ../include/rundefs.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 libtracelog.so: $(OBJS) $(ROOT)/config.mk
diff --git a/src/profstats/Makefile b/src/profstats/Makefile
index ef1e07cff..15198d1d2 100644
--- a/src/profstats/Makefile
+++ b/src/profstats/Makefile
@@ -1,12 +1,14 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
+MOD_HDRS = ../include/common.h
 .PHONY: all
 all: profstats
 include $(ROOT)/src/common.mk
-%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 profstats: $(OBJS) $(ROOT)/config.mk
author	Kelvin M. Klann <kmk3.code@protonmail.com>	2022-05-07 02:46:17 -0300
committer	Kelvin M. Klann <kmk3.code@protonmail.com>	2022-11-21 17:18:53 -0300
commit	f5b1ccaad25b26a8bb383a268532f269411e512c (patch)
tree	1dcf23a0dddf90a5e6f6d5f9216a110a3aa7495a
parent	makefiles: expand HDRS, SRCS and OBJS immediately (diff)
download	firejail-f5b1ccaad.tar.gz firejail-f5b1ccaad.tar.zst firejail-f5b1ccaad.zip

diff --git a/src/common.mk b/src/common.mk index c20aaf52f..2deace4f5 100644 --- a/src/common.mk +++ b/src/common.mk
@@ -2,9 +2,9 @@
2	#	2	#
3	# Note: $(ROOT)/config.mk must be included before this file.	3	# Note: $(ROOT)/config.mk must be included before this file.
4		4
5	HDRS := $(sort $(wildcard *.h))	5	HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
6	SRCS := $(sort $(wildcard *.c))	6	SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
7	OBJS := $(SRCS:.c=.o)	7	OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
8		8
9	CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV)	9	CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV)
10	CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"'	10	CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"'


diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile index ae0ce39df..a7ff45176 100644 --- a/src/fbuilder/Makefile +++ b/src/fbuilder/Makefile
@@ -1,12 +1,14 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/syscall.h
		5
4	.PHONY: all	6	.PHONY: all
5	all: fbuilder	7	all: fbuilder
6		8
7	include $(ROOT)/src/common.mk	9	include $(ROOT)/src/common.mk
8		10
9	%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk	11	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	12	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		13
12	fbuilder: $(OBJS) $(ROOT)/config.mk	14	fbuilder: $(OBJS) $(ROOT)/config.mk


diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile index 11d47c739..99c58b6c8 100644 --- a/src/fcopy/Makefile +++ b/src/fcopy/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/syscall.h
		5	MOD_OBJS = ../lib/common.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: fcopy	8	all: fcopy
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	fcopy: $(OBJS) ../lib/common.o $(ROOT)/config.mk	15	fcopy: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o fcopy .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o fcopy .gcov .gcda .gcno *.plist


diff --git a/src/fids/Makefile b/src/fids/Makefile index fc970cdd6..8bd44fa78 100644 --- a/src/fids/Makefile +++ b/src/fids/Makefile
@@ -1,12 +1,14 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h
		5
4	.PHONY: all	6	.PHONY: all
5	all: fids	7	all: fids
6		8
7	include $(ROOT)/src/common.mk	9	include $(ROOT)/src/common.mk
8		10
9	%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk	11	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	12	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		13
12	fids: $(OBJS) $(ROOT)/config.mk	14	fids: $(OBJS) $(ROOT)/config.mk


diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile index 1e0bf7a1a..42d761fa4 100644 --- a/src/firecfg/Makefile +++ b/src/firecfg/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h
		5	MOD_OBJS = ../lib/common.o ../lib/firejail_user.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: firecfg	8	all: firecfg
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o $(ROOT)/config.mk	15	firecfg: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/firejail_user.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o firecfg .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o firecfg .gcov .gcda .gcno *.plist


diff --git a/src/firejail/Makefile b/src/firejail/Makefile index bb14a26fc..fcb863aaa 100644 --- a/src/firejail/Makefile +++ b/src/firejail/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../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
		5	MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: firejail	8	all: firejail
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../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	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	firejail: $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk	15	firejail: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o firejail .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o firejail .gcov .gcda .gcno *.plist


diff --git a/src/firemon/Makefile b/src/firemon/Makefile index 74c283357..eedad0a6d 100644 --- a/src/firemon/Makefile +++ b/src/firemon/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/pid.h
		5	MOD_OBJS = ../lib/common.o ../lib/pid.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: firemon	8	all: firemon
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/pid.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	firemon: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk	15	firemon: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o firemon .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o firemon .gcov .gcda .gcno *.plist


diff --git a/src/fldd/Makefile b/src/fldd/Makefile index 7cfcadada..aea7e838c 100644 --- a/src/fldd/Makefile +++ b/src/fldd/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
		5	MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: fldd	8	all: fldd
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h ../include/ldd_utils.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(ROOT)/config.mk	15	fldd: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o fldd .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o fldd .gcov .gcda .gcno *.plist


diff --git a/src/fnet/Makefile b/src/fnet/Makefile index 9ce457a5c..3cdaf11cf 100644 --- a/src/fnet/Makefile +++ b/src/fnet/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/libnetlink.h
		5	MOD_OBJS = ../lib/common.o ../lib/libnetlink.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: fnet	8	all: fnet
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/libnetlink.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o $(ROOT)/config.mk	15	fnet: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/libnetlink.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o fnet .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o fnet .gcov .gcda .gcno *.plist


diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile index fbe408893..7d26ca39e 100644 --- a/src/fnetfilter/Makefile +++ b/src/fnetfilter/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/syscall.h
		5	MOD_OBJS = ../lib/common.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: fnetfilter	8	all: fnetfilter
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	fnetfilter: $(OBJS) ../lib/common.o $(ROOT)/config.mk	15	fnetfilter: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o fnetfilter .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o fnetfilter .gcov .gcda .gcno *.plist


diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile index 21097c371..1bbea61d5 100644 --- a/src/fsec-optimize/Makefile +++ b/src/fsec-optimize/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
		5	MOD_OBJS = ../lib/common.o ../lib/errno.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: fsec-optimize	8	all: fsec-optimize
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	fsec-optimize: $(OBJS) ../lib/common.o ../lib/errno.o $(ROOT)/config.mk	15	fsec-optimize: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o fsec-optimize .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o fsec-optimize .gcov .gcda .gcno *.plist


diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile index cb56433f0..3ef78545f 100644 --- a/src/fsec-print/Makefile +++ b/src/fsec-print/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
		5	MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: fsec-print	8	all: fsec-print
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	fsec-print: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk	15	fsec-print: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o fsec-print .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o fsec-print .gcov .gcda .gcno *.plist


diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile index ed779afde..532ffb2e8 100644 --- a/src/fseccomp/Makefile +++ b/src/fseccomp/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/syscall.h
		5	MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: fseccomp	8	all: fseccomp
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk	15	fseccomp: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o fseccomp .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o fseccomp .gcov .gcda .gcno *.plist


diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile index 169706ff2..63a117337 100644 --- a/src/fzenity/Makefile +++ b/src/fzenity/Makefile
@@ -1,12 +1,14 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h
		5
4	.PHONY: all	6	.PHONY: all
5	all: fzenity	7	all: fzenity
6		8
7	include $(ROOT)/src/common.mk	9	include $(ROOT)/src/common.mk
8		10
9	%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk	11	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	12	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		13
12	fzenity: $(OBJS) $(ROOT)/config.mk	14	fzenity: $(OBJS) $(ROOT)/config.mk


diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile index e880c0597..a61f228c5 100644 --- a/src/jailcheck/Makefile +++ b/src/jailcheck/Makefile
@@ -1,16 +1,19 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h ../include/pid.h
		5	MOD_OBJS = ../lib/common.o ../lib/pid.o
		6
4	.PHONY: all	7	.PHONY: all
5	all: jailcheck	8	all: jailcheck
6		9
7	include $(ROOT)/src/common.mk	10	include $(ROOT)/src/common.mk
8		11
9	%.o : %.c $(HDRS) ../include/common.h ../include/pid.h $(ROOT)/config.mk	12	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	13	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		14
12	jailcheck: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk	15	jailcheck: $(OBJS) $(ROOT)/config.mk
13	$(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS)	16	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
14		17
15	.PHONY: clean	18	.PHONY: clean
16	clean:; rm -fr .o jailcheck .gcov .gcda .gcno *.plist	19	clean:; rm -fr .o jailcheck .gcov .gcda .gcno *.plist


diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile index c0cab45fb..870c32891 100644 --- a/src/libpostexecseccomp/Makefile +++ b/src/libpostexecseccomp/Makefile
@@ -1,16 +1,18 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
4	HDRS := $(sort $(wildcard *.h))	4	MOD_HDRS = ../include/seccomp.h ../include/rundefs.h
5	SRCS := $(sort $(wildcard *.c))	5
6	OBJS := $(SRCS:.c=.o)	6	HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
		7	SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
		8	OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
7	CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security	9	CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
8	LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now	10	LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
9		11
10	.PHONY: all	12	.PHONY: all
11	all: libpostexecseccomp.so	13	all: libpostexecseccomp.so
12		14
13	%.o : %.c $(HDRS) ../include/seccomp.h ../include/rundefs.h $(ROOT)/config.mk	15	%.o : %.c $(HDRS) $(ROOT)/config.mk
14	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@	16	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
15		17
16	libpostexecseccomp.so: $(OBJS) $(ROOT)/config.mk	18	libpostexecseccomp.so: $(OBJS) $(ROOT)/config.mk


diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile index bff003e8f..4e826b1aa 100644 --- a/src/libtrace/Makefile +++ b/src/libtrace/Makefile
@@ -1,9 +1,9 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
4	HDRS := $(sort $(wildcard *.h))	4	HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
5	SRCS := $(sort $(wildcard *.c))	5	SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
6	OBJS := $(SRCS:.c=.o)	6	OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
7	CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security	7	CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
8	LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now	8	LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
9		9


diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile index 97f33003e..7f74df339 100644 --- a/src/libtracelog/Makefile +++ b/src/libtracelog/Makefile
@@ -1,16 +1,18 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
4	HDRS := $(sort $(wildcard *.h))	4	MOD_HDRS = ../include/rundefs.h
5	SRCS := $(sort $(wildcard *.c))	5
6	OBJS := $(SRCS:.c=.o)	6	HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
		7	SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
		8	OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
7	CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security	9	CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
8	LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now	10	LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
9		11
10	.PHONY: all	12	.PHONY: all
11	all: libtracelog.so	13	all: libtracelog.so
12		14
13	%.o : %.c $(HDRS) ../include/rundefs.h $(ROOT)/config.mk	15	%.o : %.c $(HDRS) $(ROOT)/config.mk
14	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@	16	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
15		17
16	libtracelog.so: $(OBJS) $(ROOT)/config.mk	18	libtracelog.so: $(OBJS) $(ROOT)/config.mk


diff --git a/src/profstats/Makefile b/src/profstats/Makefile index ef1e07cff..15198d1d2 100644 --- a/src/profstats/Makefile +++ b/src/profstats/Makefile
@@ -1,12 +1,14 @@
1	ROOT = ../..	1	ROOT = ../..
2	-include $(ROOT)/config.mk	2	-include $(ROOT)/config.mk
3		3
		4	MOD_HDRS = ../include/common.h
		5
4	.PHONY: all	6	.PHONY: all
5	all: profstats	7	all: profstats
6		8
7	include $(ROOT)/src/common.mk	9	include $(ROOT)/src/common.mk
8		10
9	%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk	11	%.o : %.c $(HDRS) $(ROOT)/config.mk
10	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@	12	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
11		13
12	profstats: $(OBJS) $(ROOT)/config.mk	14	profstats: $(OBJS) $(ROOT)/config.mk