build: rename MOD vars to EXTRA vars

To make them less confusing, as they are extra dependencies, not files that are specific to the module. Commands used to search and replace: $ git grep -IFlz -e 'MOD_HDRS' -e 'MOD_OBJS' -- src | xargs -0 -I '{}' sh -c "printf '%s\n' \"\$(sed \ -e 's/MOD_HDRS/EXTRA_HDRS/g' \ -e 's/MOD_OBJS/EXTRA_OBJS/g' '{}')\" >'{}'" Added on commit f5b1ccaad ("makefiles: move extra deps into new MOD vars", 2022-05-07) / PR #5478.
author: Kelvin M. Klann <kmk3.code@protonmail.com> 2023-06-16 23:55:50 -0300
committer: Kelvin M. Klann <kmk3.code@protonmail.com> 2023-06-24 12:00:55 -0300
commit: 5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3 (patch)
tree: 83c0b5d8ba046b4de15e38829c6454b65937c7fe
parent: build: remove MOD_SRCS variable (diff)
download: firejail-5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3.tar.gz
firejail-5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3.tar.zst
firejail-5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3.zip
20 files changed, 35 insertions, 35 deletions
diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile
index c8a12476e..c3c482bdb 100644
--- a/src/etc-cleanup/Makefile
+++ b/src/etc-cleanup/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
 PROG = etc-cleanup
 TARGET = $(PROG)
-MOD_HDRS = ../include/etc_groups.h
+EXTRA_HDRS = ../include/etc_groups.h
 include $(ROOT)/src/prog.mk
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index 7595f0775..634bf725f 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
 PROG = fbuilder
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/syscall.h
+EXTRA_HDRS = ../include/common.h ../include/syscall.h
 include $(ROOT)/src/prog.mk
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
index e2956fdd1..a3c4abe9d 100644
--- a/src/fcopy/Makefile
+++ b/src/fcopy/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = fcopy
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/syscall.h
+EXTRA_HDRS = ../include/common.h ../include/syscall.h
-MOD_OBJS = ../lib/common.o
+EXTRA_OBJS = ../lib/common.o
 include $(ROOT)/src/prog.mk
diff --git a/src/fids/Makefile b/src/fids/Makefile
index 901cbb470..76388a03d 100644
--- a/src/fids/Makefile
+++ b/src/fids/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
 PROG = fids
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h
+EXTRA_HDRS = ../include/common.h
 include $(ROOT)/src/prog.mk
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
index 59b713f1b..de4639ab6 100644
--- a/src/firecfg/Makefile
+++ b/src/firecfg/Makefile
@@ -5,13 +5,13 @@ ROOT = ../..
 PROG = firecfg
 TARGET = $(PROG)
-MOD_HDRS = \
+EXTRA_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
+EXTRA_OBJS = ../lib/common.o ../lib/firejail_user.o
 include $(ROOT)/src/prog.mk
diff --git a/src/firejail/Makefile b/src/firejail/Makefile
index 53bccf843..d3a4b4f81 100644
--- a/src/firejail/Makefile
+++ b/src/firejail/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = firejail
 TARGET = $(PROG)
-MOD_HDRS = \
+EXTRA_HDRS = \
 ../include/rundefs.h \
 ../include/common.h \
 ../include/ldd_utils.h \
@@ -18,7 +18,7 @@ MOD_HDRS = \
 ../include/etc_groups.h
-MOD_OBJS = \
+EXTRA_OBJS = \
 ../lib/common.o \
 ../lib/ldd_utils.o \
 ../lib/firejail_user.o \
diff --git a/src/firemon/Makefile b/src/firemon/Makefile
index e0059aee5..09387f3eb 100644
--- a/src/firemon/Makefile
+++ b/src/firemon/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = firemon
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/pid.h
+EXTRA_HDRS = ../include/common.h ../include/pid.h
-MOD_OBJS = ../lib/common.o ../lib/pid.o
+EXTRA_OBJS = ../lib/common.o ../lib/pid.o
 include $(ROOT)/src/prog.mk
diff --git a/src/fldd/Makefile b/src/fldd/Makefile
index 86693a76c..7fec70a33 100644
--- a/src/fldd/Makefile
+++ b/src/fldd/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = fldd
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
+EXTRA_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
-MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o
+EXTRA_OBJS = ../lib/common.o ../lib/ldd_utils.o
 include $(ROOT)/src/prog.mk
diff --git a/src/fnet/Makefile b/src/fnet/Makefile
index 8efc6d26b..50bfdfffd 100644
--- a/src/fnet/Makefile
+++ b/src/fnet/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = fnet
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/libnetlink.h
+EXTRA_HDRS = ../include/common.h ../include/libnetlink.h
-MOD_OBJS = ../lib/common.o ../lib/libnetlink.o
+EXTRA_OBJS = ../lib/common.o ../lib/libnetlink.o
 include $(ROOT)/src/prog.mk
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
index 2be8311ae..156af3ed0 100644
--- a/src/fnetfilter/Makefile
+++ b/src/fnetfilter/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = fnetfilter
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/syscall.h
+EXTRA_HDRS = ../include/common.h ../include/syscall.h
-MOD_OBJS = ../lib/common.o
+EXTRA_OBJS = ../lib/common.o
 include $(ROOT)/src/prog.mk
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index 4941f13b1..5a14726a0 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = fsec-optimize
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
+EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
-MOD_OBJS = ../lib/common.o ../lib/errno.o
+EXTRA_OBJS = ../lib/common.o ../lib/errno.o
 include $(ROOT)/src/prog.mk
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
index 78e87a93f..d55167796 100644
--- a/src/fsec-print/Makefile
+++ b/src/fsec-print/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = fsec-print
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
+EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
-MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
+EXTRA_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
 include $(ROOT)/src/prog.mk
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
index 461179f4d..f8c35d41f 100644
--- a/src/fseccomp/Makefile
+++ b/src/fseccomp/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = fseccomp
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/syscall.h
+EXTRA_HDRS = ../include/common.h ../include/syscall.h
-MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
+EXTRA_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
 include $(ROOT)/src/prog.mk
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
index a17a9252f..148babbe8 100644
--- a/src/fzenity/Makefile
+++ b/src/fzenity/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
 PROG = fzenity
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h
+EXTRA_HDRS = ../include/common.h
 include $(ROOT)/src/prog.mk
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
index 23cd9c1a9..3b0b83412 100644
--- a/src/jailcheck/Makefile
+++ b/src/jailcheck/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
 PROG = jailcheck
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h ../include/pid.h
+EXTRA_HDRS = ../include/common.h ../include/pid.h
-MOD_OBJS = ../lib/common.o ../lib/pid.o
+EXTRA_OBJS = ../lib/common.o ../lib/pid.o
 include $(ROOT)/src/prog.mk
diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile
index dfd8eb318..c5ec14672 100644
--- a/src/libpostexecseccomp/Makefile
+++ b/src/libpostexecseccomp/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
 SO = libpostexecseccomp.so
 TARGET = $(SO)
-MOD_HDRS = ../include/seccomp.h ../include/rundefs.h
+EXTRA_HDRS = ../include/seccomp.h ../include/rundefs.h
 include $(ROOT)/src/so.mk
diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile
index ac48264df..2b43ce131 100644
--- a/src/libtracelog/Makefile
+++ b/src/libtracelog/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
 SO = libtracelog.so
 TARGET = $(SO)
-MOD_HDRS = ../include/rundefs.h
+EXTRA_HDRS = ../include/rundefs.h
 include $(ROOT)/src/so.mk
diff --git a/src/profstats/Makefile b/src/profstats/Makefile
index b4cb1a6f7..ae88bf2fd 100644
--- a/src/profstats/Makefile
+++ b/src/profstats/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
 PROG = profstats
 TARGET = $(PROG)
-MOD_HDRS = ../include/common.h
+EXTRA_HDRS = ../include/common.h
 include $(ROOT)/src/prog.mk
diff --git a/src/prog.mk b/src/prog.mk
index ba089d39d..77ad0f65b 100644
--- a/src/prog.mk
+++ b/src/prog.mk
@@ -3,11 +3,11 @@
 # Note: $(ROOT)/config.mk must be included before this file.
 #
 # The includer should probably define PROG and TARGET and may also want to
-# define MOD_HDRS, MOD_OBJS, TOCLEAN and TODISTCLEAN.
+# define EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN.
-HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
+HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
 SRCS := $(sort $(wildcard *.c))
-OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
+OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 PROG_CFLAGS = \
        -ggdb -O2 -DVERSION='"$(VERSION)"' \
diff --git a/src/so.mk b/src/so.mk
index 0ba406c85..446bf1100 100644
--- a/src/so.mk
+++ b/src/so.mk
@@ -3,11 +3,11 @@
 # Note: $(ROOT)/config.mk must be included before this file.
 #
 # The includer should probably define SO and TARGET and may also want to define
-# MOD_HDRS, MOD_OBJS, TOCLEAN and TODISTCLEAN.
+# EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN.
-HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
+HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
 SRCS := $(sort $(wildcard *.c))
-OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
+OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 SO_CFLAGS = \
        -ggdb -O2 -DVERSION='"$(VERSION)"' \
author	Kelvin M. Klann <kmk3.code@protonmail.com>	2023-06-16 23:55:50 -0300
committer	Kelvin M. Klann <kmk3.code@protonmail.com>	2023-06-24 12:00:55 -0300
commit	5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3 (patch)
tree	83c0b5d8ba046b4de15e38829c6454b65937c7fe
parent	build: remove MOD_SRCS variable (diff)
download	firejail-5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3.tar.gz firejail-5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3.tar.zst firejail-5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3.zip

diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile index c8a12476e..c3c482bdb 100644 --- a/src/etc-cleanup/Makefile +++ b/src/etc-cleanup/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
5	PROG = etc-cleanup	5	PROG = etc-cleanup
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/etc_groups.h	8	EXTRA_HDRS = ../include/etc_groups.h
9		9
10	include $(ROOT)/src/prog.mk	10	include $(ROOT)/src/prog.mk


diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile index 7595f0775..634bf725f 100644 --- a/src/fbuilder/Makefile +++ b/src/fbuilder/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
5	PROG = fbuilder	5	PROG = fbuilder
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/syscall.h	8	EXTRA_HDRS = ../include/common.h ../include/syscall.h
9		9
10	include $(ROOT)/src/prog.mk	10	include $(ROOT)/src/prog.mk


diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile index e2956fdd1..a3c4abe9d 100644 --- a/src/fcopy/Makefile +++ b/src/fcopy/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = fcopy	5	PROG = fcopy
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/syscall.h	8	EXTRA_HDRS = ../include/common.h ../include/syscall.h
9	MOD_OBJS = ../lib/common.o	9	EXTRA_OBJS = ../lib/common.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/fids/Makefile b/src/fids/Makefile index 901cbb470..76388a03d 100644 --- a/src/fids/Makefile +++ b/src/fids/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
5	PROG = fids	5	PROG = fids
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h	8	EXTRA_HDRS = ../include/common.h
9		9
10	include $(ROOT)/src/prog.mk	10	include $(ROOT)/src/prog.mk


diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile index 59b713f1b..de4639ab6 100644 --- a/src/firecfg/Makefile +++ b/src/firecfg/Makefile
@@ -5,13 +5,13 @@ ROOT = ../..
5	PROG = firecfg	5	PROG = firecfg
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = \	8	EXTRA_HDRS = \
9	../include/common.h \	9	../include/common.h \
10	../include/euid_common.h \	10	../include/euid_common.h \
11	../include/libnetlink.h \	11	../include/libnetlink.h \
12	../include/firejail_user.h \	12	../include/firejail_user.h \
13	../include/pid.h	13	../include/pid.h
14		14
15	MOD_OBJS = ../lib/common.o ../lib/firejail_user.o	15	EXTRA_OBJS = ../lib/common.o ../lib/firejail_user.o
16		16
17	include $(ROOT)/src/prog.mk	17	include $(ROOT)/src/prog.mk


diff --git a/src/firejail/Makefile b/src/firejail/Makefile index 53bccf843..d3a4b4f81 100644 --- a/src/firejail/Makefile +++ b/src/firejail/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = firejail	5	PROG = firejail
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = \	8	EXTRA_HDRS = \
9	../include/rundefs.h \	9	../include/rundefs.h \
10	../include/common.h \	10	../include/common.h \
11	../include/ldd_utils.h \	11	../include/ldd_utils.h \
@@ -18,7 +18,7 @@ MOD_HDRS = \
18	../include/etc_groups.h	18	../include/etc_groups.h
19		19
20		20
21	MOD_OBJS = \	21	EXTRA_OBJS = \
22	../lib/common.o \	22	../lib/common.o \
23	../lib/ldd_utils.o \	23	../lib/ldd_utils.o \
24	../lib/firejail_user.o \	24	../lib/firejail_user.o \


diff --git a/src/firemon/Makefile b/src/firemon/Makefile index e0059aee5..09387f3eb 100644 --- a/src/firemon/Makefile +++ b/src/firemon/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = firemon	5	PROG = firemon
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/pid.h	8	EXTRA_HDRS = ../include/common.h ../include/pid.h
9	MOD_OBJS = ../lib/common.o ../lib/pid.o	9	EXTRA_OBJS = ../lib/common.o ../lib/pid.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/fldd/Makefile b/src/fldd/Makefile index 86693a76c..7fec70a33 100644 --- a/src/fldd/Makefile +++ b/src/fldd/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = fldd	5	PROG = fldd
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h	8	EXTRA_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
9	MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o	9	EXTRA_OBJS = ../lib/common.o ../lib/ldd_utils.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/fnet/Makefile b/src/fnet/Makefile index 8efc6d26b..50bfdfffd 100644 --- a/src/fnet/Makefile +++ b/src/fnet/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = fnet	5	PROG = fnet
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/libnetlink.h	8	EXTRA_HDRS = ../include/common.h ../include/libnetlink.h
9	MOD_OBJS = ../lib/common.o ../lib/libnetlink.o	9	EXTRA_OBJS = ../lib/common.o ../lib/libnetlink.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile index 2be8311ae..156af3ed0 100644 --- a/src/fnetfilter/Makefile +++ b/src/fnetfilter/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = fnetfilter	5	PROG = fnetfilter
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/syscall.h	8	EXTRA_HDRS = ../include/common.h ../include/syscall.h
9	MOD_OBJS = ../lib/common.o	9	EXTRA_OBJS = ../lib/common.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile index 4941f13b1..5a14726a0 100644 --- a/src/fsec-optimize/Makefile +++ b/src/fsec-optimize/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = fsec-optimize	5	PROG = fsec-optimize
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h	8	EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
9	MOD_OBJS = ../lib/common.o ../lib/errno.o	9	EXTRA_OBJS = ../lib/common.o ../lib/errno.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile index 78e87a93f..d55167796 100644 --- a/src/fsec-print/Makefile +++ b/src/fsec-print/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = fsec-print	5	PROG = fsec-print
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h	8	EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
9	MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o	9	EXTRA_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile index 461179f4d..f8c35d41f 100644 --- a/src/fseccomp/Makefile +++ b/src/fseccomp/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = fseccomp	5	PROG = fseccomp
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/syscall.h	8	EXTRA_HDRS = ../include/common.h ../include/syscall.h
9	MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o	9	EXTRA_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile index a17a9252f..148babbe8 100644 --- a/src/fzenity/Makefile +++ b/src/fzenity/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
5	PROG = fzenity	5	PROG = fzenity
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h	8	EXTRA_HDRS = ../include/common.h
9		9
10	include $(ROOT)/src/prog.mk	10	include $(ROOT)/src/prog.mk


diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile index 23cd9c1a9..3b0b83412 100644 --- a/src/jailcheck/Makefile +++ b/src/jailcheck/Makefile
@@ -5,7 +5,7 @@ ROOT = ../..
5	PROG = jailcheck	5	PROG = jailcheck
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h ../include/pid.h	8	EXTRA_HDRS = ../include/common.h ../include/pid.h
9	MOD_OBJS = ../lib/common.o ../lib/pid.o	9	EXTRA_OBJS = ../lib/common.o ../lib/pid.o
10		10
11	include $(ROOT)/src/prog.mk	11	include $(ROOT)/src/prog.mk


diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile index dfd8eb318..c5ec14672 100644 --- a/src/libpostexecseccomp/Makefile +++ b/src/libpostexecseccomp/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
5	SO = libpostexecseccomp.so	5	SO = libpostexecseccomp.so
6	TARGET = $(SO)	6	TARGET = $(SO)
7		7
8	MOD_HDRS = ../include/seccomp.h ../include/rundefs.h	8	EXTRA_HDRS = ../include/seccomp.h ../include/rundefs.h
9		9
10	include $(ROOT)/src/so.mk	10	include $(ROOT)/src/so.mk


diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile index ac48264df..2b43ce131 100644 --- a/src/libtracelog/Makefile +++ b/src/libtracelog/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
5	SO = libtracelog.so	5	SO = libtracelog.so
6	TARGET = $(SO)	6	TARGET = $(SO)
7		7
8	MOD_HDRS = ../include/rundefs.h	8	EXTRA_HDRS = ../include/rundefs.h
9		9
10	include $(ROOT)/src/so.mk	10	include $(ROOT)/src/so.mk


diff --git a/src/profstats/Makefile b/src/profstats/Makefile index b4cb1a6f7..ae88bf2fd 100644 --- a/src/profstats/Makefile +++ b/src/profstats/Makefile
@@ -5,6 +5,6 @@ ROOT = ../..
5	PROG = profstats	5	PROG = profstats
6	TARGET = $(PROG)	6	TARGET = $(PROG)
7		7
8	MOD_HDRS = ../include/common.h	8	EXTRA_HDRS = ../include/common.h
9		9
10	include $(ROOT)/src/prog.mk	10	include $(ROOT)/src/prog.mk


diff --git a/src/prog.mk b/src/prog.mk index ba089d39d..77ad0f65b 100644 --- a/src/prog.mk +++ b/src/prog.mk
@@ -3,11 +3,11 @@
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	# 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 MOD_HDRS, MOD_OBJS, TOCLEAN and TODISTCLEAN.	6	# define EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN.
7		7
8	HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)	8	HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
9	SRCS := $(sort $(wildcard *.c))	9	SRCS := $(sort $(wildcard *.c))
10	OBJS := $(SRCS:.c=.o) $(MOD_OBJS)	10	OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
11		11
12	PROG_CFLAGS = \	12	PROG_CFLAGS = \
13	-ggdb -O2 -DVERSION='"$(VERSION)"' \	13	-ggdb -O2 -DVERSION='"$(VERSION)"' \


diff --git a/src/so.mk b/src/so.mk index 0ba406c85..446bf1100 100644 --- a/src/so.mk +++ b/src/so.mk
@@ -3,11 +3,11 @@
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	# 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	# MOD_HDRS, MOD_OBJS, TOCLEAN and TODISTCLEAN.	6	# EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN.
7		7
8	HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)	8	HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
9	SRCS := $(sort $(wildcard *.c))	9	SRCS := $(sort $(wildcard *.c))
10	OBJS := $(SRCS:.c=.o) $(MOD_OBJS)	10	OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
11		11
12	SO_CFLAGS = \	12	SO_CFLAGS = \
13	-ggdb -O2 -DVERSION='"$(VERSION)"' \	13	-ggdb -O2 -DVERSION='"$(VERSION)"' \