diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-03 11:03:54 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-11-21 17:22:50 -0300 |
commit | 5db2186358c86e6d4e0593228ca389840105ce30 (patch) | |
tree | e651e933f18569720c77bb2472ae2ef9f2fc43fe | |
parent | makefiles: deduplicate main target name into new PROG var (diff) | |
download | firejail-5db2186358c86e6d4e0593228ca389840105ce30.tar.gz firejail-5db2186358c86e6d4e0593228ca389840105ce30.tar.zst firejail-5db2186358c86e6d4e0593228ca389840105ce30.zip |
makefiles: deduplicate many makefiles into common.mk
The makefiles that both build C programs and include src/common.mk are
nearly identical, save for the main target name and for any extra
headers and objects that they might use.
So move all of their (duplicated) code into src/common.mk, which (other
than the "lib" target on src/lib/Makefile) leaves only variables and the
includes of config.mk and src/common.mk in place.
-rw-r--r-- | src/common.mk | 15 | ||||
-rw-r--r-- | src/fbuilder/Makefile | 15 | ||||
-rw-r--r-- | src/fcopy/Makefile | 15 | ||||
-rw-r--r-- | src/fids/Makefile | 15 | ||||
-rw-r--r-- | src/firecfg/Makefile | 15 | ||||
-rw-r--r-- | src/firejail/Makefile | 15 | ||||
-rw-r--r-- | src/firemon/Makefile | 15 | ||||
-rw-r--r-- | src/fldd/Makefile | 15 | ||||
-rw-r--r-- | src/fnet/Makefile | 15 | ||||
-rw-r--r-- | src/fnetfilter/Makefile | 15 | ||||
-rw-r--r-- | src/fnettrace-dns/Makefile | 15 | ||||
-rw-r--r-- | src/fnettrace-icmp/Makefile | 15 | ||||
-rw-r--r-- | src/fnettrace-sni/Makefile | 15 | ||||
-rw-r--r-- | src/fnettrace/Makefile | 15 | ||||
-rw-r--r-- | src/fsec-optimize/Makefile | 15 | ||||
-rw-r--r-- | src/fsec-print/Makefile | 15 | ||||
-rw-r--r-- | src/fseccomp/Makefile | 15 | ||||
-rw-r--r-- | src/ftee/Makefile | 15 | ||||
-rw-r--r-- | src/fzenity/Makefile | 15 | ||||
-rw-r--r-- | src/jailcheck/Makefile | 15 | ||||
-rw-r--r-- | src/lib/Makefile | 12 | ||||
-rw-r--r-- | src/profstats/Makefile | 15 |
22 files changed, 15 insertions, 312 deletions
diff --git a/src/common.mk b/src/common.mk index 2deace4f5..6ec216b46 100644 --- a/src/common.mk +++ b/src/common.mk | |||
@@ -11,3 +11,18 @@ CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDI | |||
11 | CFLAGS += $(MANFLAGS) | 11 | CFLAGS += $(MANFLAGS) |
12 | CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security | 12 | CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security |
13 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | 13 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now |
14 | |||
15 | .PHONY: all | ||
16 | all: $(TARGET) | ||
17 | |||
18 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
19 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
20 | |||
21 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
22 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
23 | |||
24 | .PHONY: clean | ||
25 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
26 | |||
27 | .PHONY: distclean | ||
28 | distclean: clean | ||
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile index 5b9356da4..4a7f97a69 100644 --- a/src/fbuilder/Makefile +++ b/src/fbuilder/Makefile | |||
@@ -6,19 +6,4 @@ TARGET = $(PROG) | |||
6 | 6 | ||
7 | MOD_HDRS = ../include/common.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h |
8 | 8 | ||
9 | .PHONY: all | ||
10 | all: $(TARGET) | ||
11 | |||
12 | include $(ROOT)/src/common.mk | 9 | include $(ROOT)/src/common.mk |
13 | |||
14 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
16 | |||
17 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
18 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
19 | |||
20 | .PHONY: clean | ||
21 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
22 | |||
23 | .PHONY: distclean | ||
24 | distclean: clean | ||
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile index fe7974f9e..f7d063a1e 100644 --- a/src/fcopy/Makefile +++ b/src/fcopy/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h |
8 | MOD_OBJS = ../lib/common.o | 8 | MOD_OBJS = ../lib/common.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/fids/Makefile b/src/fids/Makefile index f31e17df6..ffc2a6c2b 100644 --- a/src/fids/Makefile +++ b/src/fids/Makefile | |||
@@ -6,19 +6,4 @@ TARGET = $(PROG) | |||
6 | 6 | ||
7 | MOD_HDRS = ../include/common.h | 7 | MOD_HDRS = ../include/common.h |
8 | 8 | ||
9 | .PHONY: all | ||
10 | all: $(TARGET) | ||
11 | |||
12 | include $(ROOT)/src/common.mk | 9 | include $(ROOT)/src/common.mk |
13 | |||
14 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
16 | |||
17 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
18 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
19 | |||
20 | .PHONY: clean | ||
21 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
22 | |||
23 | .PHONY: distclean | ||
24 | distclean: clean | ||
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile index 31e84d864..3d271d875 100644 --- a/src/firecfg/Makefile +++ b/src/firecfg/Makefile | |||
@@ -13,19 +13,4 @@ MOD_HDRS = \ | |||
13 | 13 | ||
14 | MOD_OBJS = ../lib/common.o ../lib/firejail_user.o | 14 | MOD_OBJS = ../lib/common.o ../lib/firejail_user.o |
15 | 15 | ||
16 | .PHONY: all | ||
17 | all: $(TARGET) | ||
18 | |||
19 | include $(ROOT)/src/common.mk | 16 | include $(ROOT)/src/common.mk |
20 | |||
21 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
22 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
23 | |||
24 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
25 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
26 | |||
27 | .PHONY: clean | ||
28 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
29 | |||
30 | .PHONY: distclean | ||
31 | distclean: clean | ||
diff --git a/src/firejail/Makefile b/src/firejail/Makefile index e64139f0c..1a8b82f89 100644 --- a/src/firejail/Makefile +++ b/src/firejail/Makefile | |||
@@ -22,19 +22,4 @@ MOD_OBJS = \ | |||
22 | ../lib/errno.o \ | 22 | ../lib/errno.o \ |
23 | ../lib/syscall.o | 23 | ../lib/syscall.o |
24 | 24 | ||
25 | .PHONY: all | ||
26 | all: $(TARGET) | ||
27 | |||
28 | include $(ROOT)/src/common.mk | 25 | include $(ROOT)/src/common.mk |
29 | |||
30 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
31 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
32 | |||
33 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
34 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
35 | |||
36 | .PHONY: clean | ||
37 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
38 | |||
39 | .PHONY: distclean | ||
40 | distclean: clean | ||
diff --git a/src/firemon/Makefile b/src/firemon/Makefile index 15291c40f..6887f4a39 100644 --- a/src/firemon/Makefile +++ b/src/firemon/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/pid.h | 7 | MOD_HDRS = ../include/common.h ../include/pid.h |
8 | MOD_OBJS = ../lib/common.o ../lib/pid.o | 8 | MOD_OBJS = ../lib/common.o ../lib/pid.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/fldd/Makefile b/src/fldd/Makefile index db5883b8f..18e215be6 100644 --- a/src/fldd/Makefile +++ b/src/fldd/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h |
8 | MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o | 8 | MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/fnet/Makefile b/src/fnet/Makefile index bbdd76abd..2c655cbc9 100644 --- a/src/fnet/Makefile +++ b/src/fnet/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/libnetlink.h | 7 | MOD_HDRS = ../include/common.h ../include/libnetlink.h |
8 | MOD_OBJS = ../lib/common.o ../lib/libnetlink.o | 8 | MOD_OBJS = ../lib/common.o ../lib/libnetlink.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile index 32d6e761d..37363f1fb 100644 --- a/src/fnetfilter/Makefile +++ b/src/fnetfilter/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h |
8 | MOD_OBJS = ../lib/common.o | 8 | MOD_OBJS = ../lib/common.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile index 0598bb2fe..404951cf9 100644 --- a/src/fnettrace-dns/Makefile +++ b/src/fnettrace-dns/Makefile | |||
@@ -4,19 +4,4 @@ ROOT = ../.. | |||
4 | PROG = fnettrace-dns | 4 | PROG = fnettrace-dns |
5 | TARGET = $(PROG) | 5 | TARGET = $(PROG) |
6 | 6 | ||
7 | .PHONY: all | ||
8 | all: $(TARGET) | ||
9 | |||
10 | include $(ROOT)/src/common.mk | 7 | include $(ROOT)/src/common.mk |
11 | |||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
14 | |||
15 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
17 | |||
18 | .PHONY: clean | ||
19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
20 | |||
21 | .PHONY: distclean | ||
22 | distclean: clean | ||
diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile index 9d18bbdb3..2b8e7b078 100644 --- a/src/fnettrace-icmp/Makefile +++ b/src/fnettrace-icmp/Makefile | |||
@@ -4,19 +4,4 @@ ROOT = ../.. | |||
4 | PROG = fnettrace-icmp | 4 | PROG = fnettrace-icmp |
5 | TARGET = $(PROG) | 5 | TARGET = $(PROG) |
6 | 6 | ||
7 | .PHONY: all | ||
8 | all: $(TARGET) | ||
9 | |||
10 | include $(ROOT)/src/common.mk | 7 | include $(ROOT)/src/common.mk |
11 | |||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
14 | |||
15 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
17 | |||
18 | .PHONY: clean | ||
19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
20 | |||
21 | .PHONY: distclean | ||
22 | distclean: clean | ||
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile index 07a1e7356..ea849c01b 100644 --- a/src/fnettrace-sni/Makefile +++ b/src/fnettrace-sni/Makefile | |||
@@ -4,19 +4,4 @@ ROOT = ../.. | |||
4 | PROG = fnettrace-sni | 4 | PROG = fnettrace-sni |
5 | TARGET = $(PROG) | 5 | TARGET = $(PROG) |
6 | 6 | ||
7 | .PHONY: all | ||
8 | all: $(TARGET) | ||
9 | |||
10 | include $(ROOT)/src/common.mk | 7 | include $(ROOT)/src/common.mk |
11 | |||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
14 | |||
15 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
17 | |||
18 | .PHONY: clean | ||
19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
20 | |||
21 | .PHONY: distclean | ||
22 | distclean: clean | ||
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile index 479458d27..51e4a9c91 100644 --- a/src/fnettrace/Makefile +++ b/src/fnettrace/Makefile | |||
@@ -4,19 +4,4 @@ ROOT = ../.. | |||
4 | PROG = fnettrace | 4 | PROG = fnettrace |
5 | TARGET = $(PROG) | 5 | TARGET = $(PROG) |
6 | 6 | ||
7 | .PHONY: all | ||
8 | all: $(TARGET) | ||
9 | |||
10 | include $(ROOT)/src/common.mk | 7 | include $(ROOT)/src/common.mk |
11 | |||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
14 | |||
15 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
17 | |||
18 | .PHONY: clean | ||
19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
20 | |||
21 | .PHONY: distclean | ||
22 | distclean: clean | ||
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile index 2087c5520..95dd8dc94 100644 --- a/src/fsec-optimize/Makefile +++ b/src/fsec-optimize/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h |
8 | MOD_OBJS = ../lib/common.o ../lib/errno.o | 8 | MOD_OBJS = ../lib/common.o ../lib/errno.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile index 9b13bfe7a..b7849391d 100644 --- a/src/fsec-print/Makefile +++ b/src/fsec-print/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h |
8 | MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o | 8 | MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile index b4e59be8d..048097621 100644 --- a/src/fseccomp/Makefile +++ b/src/fseccomp/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h |
8 | MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o | 8 | MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/ftee/Makefile b/src/ftee/Makefile index 59ff3b83e..91df30d76 100644 --- a/src/ftee/Makefile +++ b/src/ftee/Makefile | |||
@@ -4,19 +4,4 @@ ROOT = ../.. | |||
4 | PROG = ftee | 4 | PROG = ftee |
5 | TARGET = $(PROG) | 5 | TARGET = $(PROG) |
6 | 6 | ||
7 | .PHONY: all | ||
8 | all: $(TARGET) | ||
9 | |||
10 | include $(ROOT)/src/common.mk | 7 | include $(ROOT)/src/common.mk |
11 | |||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
14 | |||
15 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
17 | |||
18 | .PHONY: clean | ||
19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
20 | |||
21 | .PHONY: distclean | ||
22 | distclean: clean | ||
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile index 477dd60a9..d3364fa13 100644 --- a/src/fzenity/Makefile +++ b/src/fzenity/Makefile | |||
@@ -6,19 +6,4 @@ TARGET = $(PROG) | |||
6 | 6 | ||
7 | MOD_HDRS = ../include/common.h | 7 | MOD_HDRS = ../include/common.h |
8 | 8 | ||
9 | .PHONY: all | ||
10 | all: $(TARGET) | ||
11 | |||
12 | include $(ROOT)/src/common.mk | 9 | include $(ROOT)/src/common.mk |
13 | |||
14 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
16 | |||
17 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
18 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
19 | |||
20 | .PHONY: clean | ||
21 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
22 | |||
23 | .PHONY: distclean | ||
24 | distclean: clean | ||
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile index d746a1fbc..2c2f1b548 100644 --- a/src/jailcheck/Makefile +++ b/src/jailcheck/Makefile | |||
@@ -7,19 +7,4 @@ TARGET = $(PROG) | |||
7 | MOD_HDRS = ../include/common.h ../include/pid.h | 7 | MOD_HDRS = ../include/common.h ../include/pid.h |
8 | MOD_OBJS = ../lib/common.o ../lib/pid.o | 8 | MOD_OBJS = ../lib/common.o ../lib/pid.o |
9 | 9 | ||
10 | .PHONY: all | ||
11 | all: $(TARGET) | ||
12 | |||
13 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||
diff --git a/src/lib/Makefile b/src/lib/Makefile index 121aae4bd..4e44eae62 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile | |||
@@ -3,19 +3,7 @@ ROOT = ../.. | |||
3 | 3 | ||
4 | TARGET = lib | 4 | TARGET = lib |
5 | 5 | ||
6 | .PHONY: all | ||
7 | all: $(TARGET) | ||
8 | |||
9 | include $(ROOT)/src/common.mk | 6 | include $(ROOT)/src/common.mk |
10 | 7 | ||
11 | .PHONY: lib | 8 | .PHONY: lib |
12 | lib: $(OBJS) | 9 | lib: $(OBJS) |
13 | |||
14 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
16 | |||
17 | .PHONY: clean | ||
18 | clean:; rm -fr $(OBJS) *.gcov *.gcda *.gcno *.plist | ||
19 | |||
20 | .PHONY: distclean | ||
21 | distclean: clean | ||
diff --git a/src/profstats/Makefile b/src/profstats/Makefile index a59022cd8..314b7554d 100644 --- a/src/profstats/Makefile +++ b/src/profstats/Makefile | |||
@@ -6,19 +6,4 @@ TARGET = $(PROG) | |||
6 | 6 | ||
7 | MOD_HDRS = ../include/common.h | 7 | MOD_HDRS = ../include/common.h |
8 | 8 | ||
9 | .PHONY: all | ||
10 | all: $(TARGET) | ||
11 | |||
12 | include $(ROOT)/src/common.mk | 9 | include $(ROOT)/src/common.mk |
13 | |||
14 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | ||
16 | |||
17 | $(PROG): $(OBJS) $(ROOT)/config.mk | ||
18 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | ||
19 | |||
20 | .PHONY: clean | ||
21 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist | ||
22 | |||
23 | .PHONY: distclean | ||
24 | distclean: clean | ||