diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-07 02:38:08 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-11-21 17:19:00 -0300 |
commit | 48c151aa1683de94e42f4410fb9312936e030adf (patch) | |
tree | 508b7b9cecb88856a8bcc5117248e923eedc031f /src | |
parent | makefiles: line-wrap MOD_HDRS and MOD_OBJS (diff) | |
download | firejail-48c151aa1683de94e42f4410fb9312936e030adf.tar.gz firejail-48c151aa1683de94e42f4410fb9312936e030adf.tar.zst firejail-48c151aa1683de94e42f4410fb9312936e030adf.zip |
makefiles: deduplicate main target name into new PROG var
Put the main target name into a new PROG variable, put PROG into a new
TARGET variable, make "all" depend on `$(TARGET)` and replace every
other occurrence of the main target name with `$(PROG)`.
On the makefiles that build non-shared objects, to make them more
similar. With this commit, all of their targets are identical (except
for the extra "lib" target on src/lib/Makefile).
Diffstat (limited to 'src')
-rw-r--r-- | src/fbuilder/Makefile | 9 | ||||
-rw-r--r-- | src/fcopy/Makefile | 9 | ||||
-rw-r--r-- | src/fids/Makefile | 9 | ||||
-rw-r--r-- | src/firecfg/Makefile | 9 | ||||
-rw-r--r-- | src/firejail/Makefile | 9 | ||||
-rw-r--r-- | src/firemon/Makefile | 9 | ||||
-rw-r--r-- | src/fldd/Makefile | 9 | ||||
-rw-r--r-- | src/fnet/Makefile | 9 | ||||
-rw-r--r-- | src/fnetfilter/Makefile | 9 | ||||
-rw-r--r-- | src/fnettrace-dns/Makefile | 9 | ||||
-rw-r--r-- | src/fnettrace-icmp/Makefile | 9 | ||||
-rw-r--r-- | src/fnettrace-sni/Makefile | 9 | ||||
-rw-r--r-- | src/fnettrace/Makefile | 9 | ||||
-rw-r--r-- | src/fsec-optimize/Makefile | 9 | ||||
-rw-r--r-- | src/fsec-print/Makefile | 9 | ||||
-rw-r--r-- | src/fseccomp/Makefile | 9 | ||||
-rw-r--r-- | src/ftee/Makefile | 9 | ||||
-rw-r--r-- | src/fzenity/Makefile | 9 | ||||
-rw-r--r-- | src/jailcheck/Makefile | 9 | ||||
-rw-r--r-- | src/lib/Makefile | 4 | ||||
-rw-r--r-- | src/profstats/Makefile | 9 |
21 files changed, 123 insertions, 61 deletions
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile index a7ff45176..5b9356da4 100644 --- a/src/fbuilder/Makefile +++ b/src/fbuilder/Makefile | |||
@@ -1,21 +1,24 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fbuilder | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h |
5 | 8 | ||
6 | .PHONY: all | 9 | .PHONY: all |
7 | all: fbuilder | 10 | all: $(TARGET) |
8 | 11 | ||
9 | include $(ROOT)/src/common.mk | 12 | include $(ROOT)/src/common.mk |
10 | 13 | ||
11 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 14 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
12 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
13 | 16 | ||
14 | fbuilder: $(OBJS) $(ROOT)/config.mk | 17 | $(PROG): $(OBJS) $(ROOT)/config.mk |
15 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 18 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
16 | 19 | ||
17 | .PHONY: clean | 20 | .PHONY: clean |
18 | clean:; rm -fr *.o fbuilder *.gcov *.gcda *.gcno *.plist | 21 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
19 | 22 | ||
20 | .PHONY: distclean | 23 | .PHONY: distclean |
21 | distclean: clean | 24 | distclean: clean |
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile index 99c58b6c8..fe7974f9e 100644 --- a/src/fcopy/Makefile +++ b/src/fcopy/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fcopy | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h |
5 | MOD_OBJS = ../lib/common.o | 8 | MOD_OBJS = ../lib/common.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: fcopy | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | fcopy: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o fcopy *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/fids/Makefile b/src/fids/Makefile index 8bd44fa78..f31e17df6 100644 --- a/src/fids/Makefile +++ b/src/fids/Makefile | |||
@@ -1,21 +1,24 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fids | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h | 7 | MOD_HDRS = ../include/common.h |
5 | 8 | ||
6 | .PHONY: all | 9 | .PHONY: all |
7 | all: fids | 10 | all: $(TARGET) |
8 | 11 | ||
9 | include $(ROOT)/src/common.mk | 12 | include $(ROOT)/src/common.mk |
10 | 13 | ||
11 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 14 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
12 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
13 | 16 | ||
14 | fids: $(OBJS) $(ROOT)/config.mk | 17 | $(PROG): $(OBJS) $(ROOT)/config.mk |
15 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 18 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
16 | 19 | ||
17 | .PHONY: clean | 20 | .PHONY: clean |
18 | clean:; rm -fr *.o fids *.gcov *.gcda *.gcno *.plist | 21 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
19 | 22 | ||
20 | .PHONY: distclean | 23 | .PHONY: distclean |
21 | distclean: clean | 24 | distclean: clean |
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile index 2cc7495f5..31e84d864 100644 --- a/src/firecfg/Makefile +++ b/src/firecfg/Makefile | |||
@@ -1,6 +1,9 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = firecfg | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = \ | 7 | MOD_HDRS = \ |
5 | ../include/common.h \ | 8 | ../include/common.h \ |
6 | ../include/euid_common.h \ | 9 | ../include/euid_common.h \ |
@@ -11,18 +14,18 @@ MOD_HDRS = \ | |||
11 | MOD_OBJS = ../lib/common.o ../lib/firejail_user.o | 14 | MOD_OBJS = ../lib/common.o ../lib/firejail_user.o |
12 | 15 | ||
13 | .PHONY: all | 16 | .PHONY: all |
14 | all: firecfg | 17 | all: $(TARGET) |
15 | 18 | ||
16 | include $(ROOT)/src/common.mk | 19 | include $(ROOT)/src/common.mk |
17 | 20 | ||
18 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 21 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
19 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 22 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
20 | 23 | ||
21 | firecfg: $(OBJS) $(ROOT)/config.mk | 24 | $(PROG): $(OBJS) $(ROOT)/config.mk |
22 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 25 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
23 | 26 | ||
24 | .PHONY: clean | 27 | .PHONY: clean |
25 | clean:; rm -fr *.o firecfg *.gcov *.gcda *.gcno *.plist | 28 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
26 | 29 | ||
27 | .PHONY: distclean | 30 | .PHONY: distclean |
28 | distclean: clean | 31 | distclean: clean |
diff --git a/src/firejail/Makefile b/src/firejail/Makefile index d7ecab2dc..e64139f0c 100644 --- a/src/firejail/Makefile +++ b/src/firejail/Makefile | |||
@@ -1,6 +1,9 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = firejail | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = \ | 7 | MOD_HDRS = \ |
5 | ../include/rundefs.h \ | 8 | ../include/rundefs.h \ |
6 | ../include/common.h \ | 9 | ../include/common.h \ |
@@ -20,18 +23,18 @@ MOD_OBJS = \ | |||
20 | ../lib/syscall.o | 23 | ../lib/syscall.o |
21 | 24 | ||
22 | .PHONY: all | 25 | .PHONY: all |
23 | all: firejail | 26 | all: $(TARGET) |
24 | 27 | ||
25 | include $(ROOT)/src/common.mk | 28 | include $(ROOT)/src/common.mk |
26 | 29 | ||
27 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 30 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
28 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 31 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
29 | 32 | ||
30 | firejail: $(OBJS) $(ROOT)/config.mk | 33 | $(PROG): $(OBJS) $(ROOT)/config.mk |
31 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 34 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
32 | 35 | ||
33 | .PHONY: clean | 36 | .PHONY: clean |
34 | clean:; rm -fr *.o firejail *.gcov *.gcda *.gcno *.plist | 37 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
35 | 38 | ||
36 | .PHONY: distclean | 39 | .PHONY: distclean |
37 | distclean: clean | 40 | distclean: clean |
diff --git a/src/firemon/Makefile b/src/firemon/Makefile index eedad0a6d..15291c40f 100644 --- a/src/firemon/Makefile +++ b/src/firemon/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = firemon | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/pid.h | 7 | MOD_HDRS = ../include/common.h ../include/pid.h |
5 | MOD_OBJS = ../lib/common.o ../lib/pid.o | 8 | MOD_OBJS = ../lib/common.o ../lib/pid.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: firemon | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | firemon: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o firemon *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/fldd/Makefile b/src/fldd/Makefile index aea7e838c..db5883b8f 100644 --- a/src/fldd/Makefile +++ b/src/fldd/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fldd | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | 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 |
5 | MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o | 8 | MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: fldd | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | fldd: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o fldd *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/fnet/Makefile b/src/fnet/Makefile index 3cdaf11cf..bbdd76abd 100644 --- a/src/fnet/Makefile +++ b/src/fnet/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fnet | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/libnetlink.h | 7 | MOD_HDRS = ../include/common.h ../include/libnetlink.h |
5 | MOD_OBJS = ../lib/common.o ../lib/libnetlink.o | 8 | MOD_OBJS = ../lib/common.o ../lib/libnetlink.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: fnet | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | fnet: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o fnet *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile index 7d26ca39e..32d6e761d 100644 --- a/src/fnetfilter/Makefile +++ b/src/fnetfilter/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fnetfilter | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h |
5 | MOD_OBJS = ../lib/common.o | 8 | MOD_OBJS = ../lib/common.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: fnetfilter | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | fnetfilter: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o fnetfilter *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile index 38bb0eb79..0598bb2fe 100644 --- a/src/fnettrace-dns/Makefile +++ b/src/fnettrace-dns/Makefile | |||
@@ -1,19 +1,22 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fnettrace-dns | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | .PHONY: all | 7 | .PHONY: all |
5 | all: fnettrace-dns | 8 | all: $(TARGET) |
6 | 9 | ||
7 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
8 | 11 | ||
9 | %.o : %.c $(HDRS) $(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 | fnettrace-dns: $(OBJS) $(ROOT)/config.mk | 15 | $(PROG): $(OBJS) $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
14 | 17 | ||
15 | .PHONY: clean | 18 | .PHONY: clean |
16 | clean:; rm -fr *.o fnettrace-dns *.gcov *.gcda *.gcno *.plist | 19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
17 | 20 | ||
18 | .PHONY: distclean | 21 | .PHONY: distclean |
19 | distclean: clean | 22 | distclean: clean |
diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile index a3e9a5642..9d18bbdb3 100644 --- a/src/fnettrace-icmp/Makefile +++ b/src/fnettrace-icmp/Makefile | |||
@@ -1,19 +1,22 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fnettrace-icmp | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | .PHONY: all | 7 | .PHONY: all |
5 | all: fnettrace-icmp | 8 | all: $(TARGET) |
6 | 9 | ||
7 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
8 | 11 | ||
9 | %.o : %.c $(HDRS) $(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 | fnettrace-icmp: $(OBJS) $(ROOT)/config.mk | 15 | $(PROG): $(OBJS) $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
14 | 17 | ||
15 | .PHONY: clean | 18 | .PHONY: clean |
16 | clean:; rm -fr *.o fnettrace-icmp *.gcov *.gcda *.gcno *.plist | 19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
17 | 20 | ||
18 | .PHONY: distclean | 21 | .PHONY: distclean |
19 | distclean: clean | 22 | distclean: clean |
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile index 7e3634cb6..07a1e7356 100644 --- a/src/fnettrace-sni/Makefile +++ b/src/fnettrace-sni/Makefile | |||
@@ -1,19 +1,22 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fnettrace-sni | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | .PHONY: all | 7 | .PHONY: all |
5 | all: fnettrace-sni | 8 | all: $(TARGET) |
6 | 9 | ||
7 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
8 | 11 | ||
9 | %.o : %.c $(HDRS) $(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 | fnettrace-sni: $(OBJS) $(ROOT)/config.mk | 15 | $(PROG): $(OBJS) $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
14 | 17 | ||
15 | .PHONY: clean | 18 | .PHONY: clean |
16 | clean:; rm -fr *.o fnettrace-sni *.gcov *.gcda *.gcno *.plist | 19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
17 | 20 | ||
18 | .PHONY: distclean | 21 | .PHONY: distclean |
19 | distclean: clean | 22 | distclean: clean |
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile index eefeadce8..479458d27 100644 --- a/src/fnettrace/Makefile +++ b/src/fnettrace/Makefile | |||
@@ -1,19 +1,22 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fnettrace | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | .PHONY: all | 7 | .PHONY: all |
5 | all: fnettrace | 8 | all: $(TARGET) |
6 | 9 | ||
7 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
8 | 11 | ||
9 | %.o : %.c $(HDRS) $(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 | fnettrace: $(OBJS) $(ROOT)/config.mk | 15 | $(PROG): $(OBJS) $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
14 | 17 | ||
15 | .PHONY: clean | 18 | .PHONY: clean |
16 | clean:; rm -fr *.o fnettrace *.gcov *.gcda *.gcno *.plist | 19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
17 | 20 | ||
18 | .PHONY: distclean | 21 | .PHONY: distclean |
19 | distclean: clean | 22 | distclean: clean |
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile index 1bbea61d5..2087c5520 100644 --- a/src/fsec-optimize/Makefile +++ b/src/fsec-optimize/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fsec-optimize | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h |
5 | MOD_OBJS = ../lib/common.o ../lib/errno.o | 8 | MOD_OBJS = ../lib/common.o ../lib/errno.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: fsec-optimize | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | fsec-optimize: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile index 3ef78545f..9b13bfe7a 100644 --- a/src/fsec-print/Makefile +++ b/src/fsec-print/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fsec-print | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h |
5 | MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o | 8 | MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: fsec-print | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | fsec-print: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile index 532ffb2e8..b4e59be8d 100644 --- a/src/fseccomp/Makefile +++ b/src/fseccomp/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fseccomp | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/syscall.h | 7 | MOD_HDRS = ../include/common.h ../include/syscall.h |
5 | MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o | 8 | MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: fseccomp | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | fseccomp: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o fseccomp *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/ftee/Makefile b/src/ftee/Makefile index 05c71d961..59ff3b83e 100644 --- a/src/ftee/Makefile +++ b/src/ftee/Makefile | |||
@@ -1,19 +1,22 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = ftee | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | .PHONY: all | 7 | .PHONY: all |
5 | all: ftee | 8 | all: $(TARGET) |
6 | 9 | ||
7 | include $(ROOT)/src/common.mk | 10 | include $(ROOT)/src/common.mk |
8 | 11 | ||
9 | %.o : %.c $(HDRS) $(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 | ftee: $(OBJS) $(ROOT)/config.mk | 15 | $(PROG): $(OBJS) $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
14 | 17 | ||
15 | .PHONY: clean | 18 | .PHONY: clean |
16 | clean:; rm -fr *.o ftee *.gcov *.gcda *.gcno *.plist | 19 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
17 | 20 | ||
18 | .PHONY: distclean | 21 | .PHONY: distclean |
19 | distclean: clean | 22 | distclean: clean |
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile index 63a117337..477dd60a9 100644 --- a/src/fzenity/Makefile +++ b/src/fzenity/Makefile | |||
@@ -1,21 +1,24 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = fzenity | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h | 7 | MOD_HDRS = ../include/common.h |
5 | 8 | ||
6 | .PHONY: all | 9 | .PHONY: all |
7 | all: fzenity | 10 | all: $(TARGET) |
8 | 11 | ||
9 | include $(ROOT)/src/common.mk | 12 | include $(ROOT)/src/common.mk |
10 | 13 | ||
11 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 14 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
12 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
13 | 16 | ||
14 | fzenity: $(OBJS) $(ROOT)/config.mk | 17 | $(PROG): $(OBJS) $(ROOT)/config.mk |
15 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 18 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
16 | 19 | ||
17 | .PHONY: clean | 20 | .PHONY: clean |
18 | clean:; rm -fr *.o fzenity *.gcov *.gcda *.gcno *.plist | 21 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
19 | 22 | ||
20 | .PHONY: distclean | 23 | .PHONY: distclean |
21 | distclean: clean | 24 | distclean: clean |
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile index a61f228c5..d746a1fbc 100644 --- a/src/jailcheck/Makefile +++ b/src/jailcheck/Makefile | |||
@@ -1,22 +1,25 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = jailcheck | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h ../include/pid.h | 7 | MOD_HDRS = ../include/common.h ../include/pid.h |
5 | MOD_OBJS = ../lib/common.o ../lib/pid.o | 8 | MOD_OBJS = ../lib/common.o ../lib/pid.o |
6 | 9 | ||
7 | .PHONY: all | 10 | .PHONY: all |
8 | all: jailcheck | 11 | all: $(TARGET) |
9 | 12 | ||
10 | include $(ROOT)/src/common.mk | 13 | include $(ROOT)/src/common.mk |
11 | 14 | ||
12 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
13 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
14 | 17 | ||
15 | jailcheck: $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
16 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 19 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
17 | 20 | ||
18 | .PHONY: clean | 21 | .PHONY: clean |
19 | clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist | 22 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
20 | 23 | ||
21 | .PHONY: distclean | 24 | .PHONY: distclean |
22 | distclean: clean | 25 | distclean: clean |
diff --git a/src/lib/Makefile b/src/lib/Makefile index ff1cfcf74..121aae4bd 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile | |||
@@ -1,8 +1,10 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | TARGET = lib | ||
5 | |||
4 | .PHONY: all | 6 | .PHONY: all |
5 | all: lib | 7 | all: $(TARGET) |
6 | 8 | ||
7 | include $(ROOT)/src/common.mk | 9 | include $(ROOT)/src/common.mk |
8 | 10 | ||
diff --git a/src/profstats/Makefile b/src/profstats/Makefile index 15198d1d2..a59022cd8 100644 --- a/src/profstats/Makefile +++ b/src/profstats/Makefile | |||
@@ -1,21 +1,24 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | PROG = profstats | ||
5 | TARGET = $(PROG) | ||
6 | |||
4 | MOD_HDRS = ../include/common.h | 7 | MOD_HDRS = ../include/common.h |
5 | 8 | ||
6 | .PHONY: all | 9 | .PHONY: all |
7 | all: profstats | 10 | all: $(TARGET) |
8 | 11 | ||
9 | include $(ROOT)/src/common.mk | 12 | include $(ROOT)/src/common.mk |
10 | 13 | ||
11 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 14 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
12 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 15 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
13 | 16 | ||
14 | profstats: $(OBJS) $(ROOT)/config.mk | 17 | $(PROG): $(OBJS) $(ROOT)/config.mk |
15 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) | 18 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) |
16 | 19 | ||
17 | .PHONY: clean | 20 | .PHONY: clean |
18 | clean:; rm -fr *.o profstats *.gcov *.gcda *.gcno *.plist | 21 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist |
19 | 22 | ||
20 | .PHONY: distclean | 23 | .PHONY: distclean |
21 | distclean: clean | 24 | distclean: clean |