diff options
-rw-r--r-- | config.mk.in | 2 | ||||
-rw-r--r-- | src/etc-cleanup/Makefile | 5 | ||||
-rw-r--r-- | src/fbuilder/Makefile | 5 | ||||
-rw-r--r-- | src/fcopy/Makefile | 5 | ||||
-rw-r--r-- | src/fids/Makefile | 5 | ||||
-rw-r--r-- | src/firecfg/Makefile | 5 | ||||
-rw-r--r-- | src/firejail/Makefile | 5 | ||||
-rw-r--r-- | src/firemon/Makefile | 5 | ||||
-rw-r--r-- | src/fldd/Makefile | 5 | ||||
-rw-r--r-- | src/fnet/Makefile | 5 | ||||
-rw-r--r-- | src/fnetfilter/Makefile | 5 | ||||
-rw-r--r-- | src/fnetlock/Makefile | 5 | ||||
-rw-r--r-- | src/fnettrace-dns/Makefile | 5 | ||||
-rw-r--r-- | src/fnettrace-icmp/Makefile | 5 | ||||
-rw-r--r-- | src/fnettrace-sni/Makefile | 5 | ||||
-rw-r--r-- | src/fnettrace/Makefile | 9 | ||||
-rw-r--r-- | src/fsec-optimize/Makefile | 5 | ||||
-rw-r--r-- | src/fsec-print/Makefile | 5 | ||||
-rw-r--r-- | src/fseccomp/Makefile | 5 | ||||
-rw-r--r-- | src/ftee/Makefile | 5 | ||||
-rw-r--r-- | src/fzenity/Makefile | 5 | ||||
-rw-r--r-- | src/include/common.h | 4 | ||||
-rw-r--r-- | src/jailcheck/Makefile | 5 | ||||
-rw-r--r-- | src/lib/Makefile | 3 | ||||
-rw-r--r-- | src/libpostexecseccomp/Makefile | 5 | ||||
-rw-r--r-- | src/libtrace/Makefile | 5 | ||||
-rw-r--r-- | src/libtracelog/Makefile | 5 | ||||
-rw-r--r-- | src/profstats/Makefile | 5 | ||||
-rw-r--r-- | src/prog.mk | 4 | ||||
-rw-r--r-- | src/so.mk | 4 |
30 files changed, 86 insertions, 60 deletions
diff --git a/config.mk.in b/config.mk.in index 403d78e37..63d7fb981 100644 --- a/config.mk.in +++ b/config.mk.in | |||
@@ -82,7 +82,7 @@ LDFLAGS=@LDFLAGS@ | |||
82 | # Project variables | 82 | # Project variables |
83 | EXTRA_CFLAGS =@EXTRA_CFLAGS@ | 83 | EXTRA_CFLAGS =@EXTRA_CFLAGS@ |
84 | COMMON_CFLAGS = \ | 84 | COMMON_CFLAGS = \ |
85 | -ggdb -O2 -DVERSION='"$(VERSION)"' -DMOD_DIR='"$(MOD_DIR)"' \ | 85 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ |
86 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ | 86 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ |
87 | -Wformat -Wformat-security \ | 87 | -Wformat -Wformat-security \ |
88 | -fstack-protector-all -D_FORTIFY_SOURCE=2 \ | 88 | -fstack-protector-all -D_FORTIFY_SOURCE=2 \ |
diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile index 296ed41d8..23121c521 100644 --- a/src/etc-cleanup/Makefile +++ b/src/etc-cleanup/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/etc-cleanup | 5 | MOD = etc-cleanup |
6 | PROG = etc-cleanup | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/etc_groups.h | 10 | EXTRA_HDRS = ../include/etc_groups.h |
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile index 1f6a28780..f0e374a52 100644 --- a/src/fbuilder/Makefile +++ b/src/fbuilder/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fbuilder | 5 | MOD = fbuilder |
6 | PROG = fbuilder | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/syscall.h | 10 | EXTRA_HDRS = ../include/common.h ../include/syscall.h |
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile index f82d3a073..a9f706eb8 100644 --- a/src/fcopy/Makefile +++ b/src/fcopy/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fcopy | 5 | MOD = fcopy |
6 | PROG = fcopy | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/syscall.h | 10 | EXTRA_HDRS = ../include/common.h ../include/syscall.h |
diff --git a/src/fids/Makefile b/src/fids/Makefile index c03740e3d..7bdbe0590 100644 --- a/src/fids/Makefile +++ b/src/fids/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fids | 5 | MOD = fids |
6 | PROG = fids | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h | 10 | EXTRA_HDRS = ../include/common.h |
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile index 322ce3e3f..cc7a27c52 100644 --- a/src/firecfg/Makefile +++ b/src/firecfg/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/firecfg | 5 | MOD = firecfg |
6 | PROG = firecfg | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = \ | 10 | EXTRA_HDRS = \ |
diff --git a/src/firejail/Makefile b/src/firejail/Makefile index a817b1757..1c4b1b5c2 100644 --- a/src/firejail/Makefile +++ b/src/firejail/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/firejail | 5 | MOD = firejail |
6 | PROG = firejail | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = \ | 10 | EXTRA_HDRS = \ |
diff --git a/src/firemon/Makefile b/src/firemon/Makefile index 649bad0af..0e39f8b01 100644 --- a/src/firemon/Makefile +++ b/src/firemon/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/firemon | 5 | MOD = firemon |
6 | PROG = firemon | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/pid.h | 10 | EXTRA_HDRS = ../include/common.h ../include/pid.h |
diff --git a/src/fldd/Makefile b/src/fldd/Makefile index 00173d18e..246cbc183 100644 --- a/src/fldd/Makefile +++ b/src/fldd/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fldd | 5 | MOD = fldd |
6 | PROG = fldd | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h | 10 | EXTRA_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h |
diff --git a/src/fnet/Makefile b/src/fnet/Makefile index 04a200951..c98326dc4 100644 --- a/src/fnet/Makefile +++ b/src/fnet/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fnet | 5 | MOD = fnet |
6 | PROG = fnet | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/libnetlink.h | 10 | EXTRA_HDRS = ../include/common.h ../include/libnetlink.h |
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile index d38185fb1..c8992c3d6 100644 --- a/src/fnetfilter/Makefile +++ b/src/fnetfilter/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fnetfilter | 5 | MOD = fnetfilter |
6 | PROG = fnetfilter | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/syscall.h | 10 | EXTRA_HDRS = ../include/common.h ../include/syscall.h |
diff --git a/src/fnetlock/Makefile b/src/fnetlock/Makefile index 789df06ac..386b32082 100644 --- a/src/fnetlock/Makefile +++ b/src/fnetlock/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fnetlock | 5 | MOD = fnetlock |
6 | PROG = fnetlock | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | include $(ROOT)/src/prog.mk | 10 | include $(ROOT)/src/prog.mk |
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile index fb1054261..e7180de3f 100644 --- a/src/fnettrace-dns/Makefile +++ b/src/fnettrace-dns/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fnettrace-dns | 5 | MOD = fnettrace-dns |
6 | PROG = fnettrace-dns | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | include $(ROOT)/src/prog.mk | 10 | include $(ROOT)/src/prog.mk |
diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile index 4791e0b9f..d449fbe76 100644 --- a/src/fnettrace-icmp/Makefile +++ b/src/fnettrace-icmp/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fnettrace-icmp | 5 | MOD = fnettrace-icmp |
6 | PROG = fnettrace-icmp | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | include $(ROOT)/src/prog.mk | 10 | include $(ROOT)/src/prog.mk |
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile index 09a444db0..80af5e914 100644 --- a/src/fnettrace-sni/Makefile +++ b/src/fnettrace-sni/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fnettrace-sni | 5 | MOD = fnettrace-sni |
6 | PROG = fnettrace-sni | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | include $(ROOT)/src/prog.mk | 10 | include $(ROOT)/src/prog.mk |
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile index 68a4cbdc0..2ad296d1d 100644 --- a/src/fnettrace/Makefile +++ b/src/fnettrace/Makefile | |||
@@ -2,12 +2,13 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fnettrace | 5 | MOD = fnettrace |
6 | PROG = fnettrace | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | include $(ROOT)/src/prog.mk | 10 | include $(ROOT)/src/prog.mk |
10 | 11 | ||
11 | all: $(TARGET) static-ip-map | 12 | all: $(TARGET) static-ip-map |
12 | static-ip-map: static-ip-map.txt fnettrace | 13 | static-ip-map: static-ip-map.txt $(PROG) |
13 | ./fnettrace --squash-map=static-ip-map.txt > static-ip-map | 14 | ./$(PROG) --squash-map=static-ip-map.txt > static-ip-map |
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile index 12ac5f1a9..caead9d54 100644 --- a/src/fsec-optimize/Makefile +++ b/src/fsec-optimize/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fsec-optimize | 5 | MOD = fsec-optimize |
6 | PROG = fsec-optimize | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h | 10 | EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h |
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile index a506c1106..43cc42fed 100644 --- a/src/fsec-print/Makefile +++ b/src/fsec-print/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fsec-print | 5 | MOD = fsec-print |
6 | PROG = fsec-print | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h | 10 | EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h |
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile index a7d88eb83..89b12f629 100644 --- a/src/fseccomp/Makefile +++ b/src/fseccomp/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fseccomp | 5 | MOD = fseccomp |
6 | PROG = fseccomp | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/syscall.h | 10 | EXTRA_HDRS = ../include/common.h ../include/syscall.h |
diff --git a/src/ftee/Makefile b/src/ftee/Makefile index 1b1cdec43..f4d95de4a 100644 --- a/src/ftee/Makefile +++ b/src/ftee/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/ftee | 5 | MOD = ftee |
6 | PROG = ftee | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | include $(ROOT)/src/prog.mk | 10 | include $(ROOT)/src/prog.mk |
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile index cb80ec0bc..3c1aa0574 100644 --- a/src/fzenity/Makefile +++ b/src/fzenity/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/fzenity | 5 | MOD = fzenity |
6 | PROG = fzenity | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h | 10 | EXTRA_HDRS = ../include/common.h |
diff --git a/src/include/common.h b/src/include/common.h index c9ec7b729..5f09fe3e2 100644 --- a/src/include/common.h +++ b/src/include/common.h | |||
@@ -41,8 +41,8 @@ | |||
41 | 41 | ||
42 | #define errExit(msg) do { \ | 42 | #define errExit(msg) do { \ |
43 | char msgout[500]; \ | 43 | char msgout[500]; \ |
44 | snprintf(msgout, 500, "Error %s/%s:%d %s(): %s", \ | 44 | snprintf(msgout, 500, "Error %s:%d: %s: %s", \ |
45 | MOD_DIR, __FILE__, __LINE__, __func__, msg); \ | 45 | __FILE__, __LINE__, __func__, msg); \ |
46 | perror(msgout); \ | 46 | perror(msgout); \ |
47 | exit(1); \ | 47 | exit(1); \ |
48 | } while (0) | 48 | } while (0) |
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile index 0b57861c6..1823ee9d0 100644 --- a/src/jailcheck/Makefile +++ b/src/jailcheck/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/jailcheck | 5 | MOD = jailcheck |
6 | PROG = jailcheck | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h ../include/pid.h | 10 | EXTRA_HDRS = ../include/common.h ../include/pid.h |
diff --git a/src/lib/Makefile b/src/lib/Makefile index 9cf8abe36..4b2303e52 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile | |||
@@ -2,7 +2,8 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/lib | 5 | MOD = lib |
6 | MOD_DIR = $(ROOT)/src/$(MOD) | ||
6 | TARGET = lib | 7 | TARGET = lib |
7 | 8 | ||
8 | include $(ROOT)/src/prog.mk | 9 | include $(ROOT)/src/prog.mk |
diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile index c9e25d066..f66fdd0d7 100644 --- a/src/libpostexecseccomp/Makefile +++ b/src/libpostexecseccomp/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/libpostexecseccomp | 5 | MOD = libpostexecseccomp |
6 | SO = libpostexecseccomp.so | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | SO = $(MOD_DIR)/$(MOD).so | ||
7 | TARGET = $(SO) | 8 | TARGET = $(SO) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/seccomp.h ../include/rundefs.h | 10 | EXTRA_HDRS = ../include/seccomp.h ../include/rundefs.h |
diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile index 337529361..3493d1786 100644 --- a/src/libtrace/Makefile +++ b/src/libtrace/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/libtrace | 5 | MOD = libtrace |
6 | SO = libtrace.so | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | SO = $(MOD_DIR)/$(MOD).so | ||
7 | TARGET = $(SO) | 8 | TARGET = $(SO) |
8 | 9 | ||
9 | include $(ROOT)/src/so.mk | 10 | include $(ROOT)/src/so.mk |
diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile index 3e9d9e3e3..a83726167 100644 --- a/src/libtracelog/Makefile +++ b/src/libtracelog/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/libtracelog | 5 | MOD = libtracelog |
6 | SO = libtracelog.so | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | SO = $(MOD_DIR)/$(MOD).so | ||
7 | TARGET = $(SO) | 8 | TARGET = $(SO) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/rundefs.h | 10 | EXTRA_HDRS = ../include/rundefs.h |
diff --git a/src/profstats/Makefile b/src/profstats/Makefile index aa947401e..8f33ce1de 100644 --- a/src/profstats/Makefile +++ b/src/profstats/Makefile | |||
@@ -2,8 +2,9 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | MOD_DIR = src/profstats | 5 | MOD = profstats |
6 | PROG = profstats | 6 | MOD_DIR = $(ROOT)/src/$(MOD) |
7 | PROG = $(MOD_DIR)/$(MOD) | ||
7 | TARGET = $(PROG) | 8 | TARGET = $(PROG) |
8 | 9 | ||
9 | EXTRA_HDRS = ../include/common.h | 10 | EXTRA_HDRS = ../include/common.h |
diff --git a/src/prog.mk b/src/prog.mk index 426961c29..87e1806a8 100644 --- a/src/prog.mk +++ b/src/prog.mk | |||
@@ -5,8 +5,8 @@ | |||
5 | # The includer should probably define PROG and TARGET and may also want to | 5 | # The includer should probably define PROG and TARGET and may also want to |
6 | # define EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. | 6 | # define EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. |
7 | 7 | ||
8 | HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) | 8 | HDRS := $(sort $(wildcard $(MOD_DIR)/*.h)) $(EXTRA_HDRS) |
9 | SRCS := $(sort $(wildcard *.c)) | 9 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) |
10 | OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) | 10 | OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) |
11 | 11 | ||
12 | .PHONY: all | 12 | .PHONY: all |
@@ -5,8 +5,8 @@ | |||
5 | # The includer should probably define SO and TARGET and may also want to define | 5 | # The includer should probably define SO and TARGET and may also want to define |
6 | # EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. | 6 | # EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. |
7 | 7 | ||
8 | HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) | 8 | HDRS := $(sort $(wildcard $(MOD_DIR)/*.h)) $(EXTRA_HDRS) |
9 | SRCS := $(sort $(wildcard *.c)) | 9 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) |
10 | OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) | 10 | OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) |
11 | 11 | ||
12 | .PHONY: all | 12 | .PHONY: all |