25 files changed, 36 insertions, 36 deletions

diff --git a/src/common.mk b/src/common.mk
index 30ba2b494..07082e183 100644
--- a/src/common.mk
+++ b/src/common.mk
@@ -2,9 +2,9 @@
 #
 # Note: $(ROOT)/config.mk must be included before this file.
 
-H_FILE_LIST       = $(sort $(wildcard *.h))
-C_FILE_LIST       = $(sort $(wildcard *.c))
-OBJS = $(C_FILE_LIST:.c=.o)
+HDRS = $(sort $(wildcard *.h))
+SRCS = $(sort $(wildcard *.c))
+OBJS = $(SRCS:.c=.o)
 
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV)
 CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"'   -DVARDIR='"/var/lib/firejail"'
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index 92e207e61..ae0ce39df 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -6,7 +6,7 @@ all: fbuilder
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fbuilder: $(OBJS) $(ROOT)/config.mk
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
index a4c4a293c..11d47c739 100644
--- a/src/fcopy/Makefile
+++ b/src/fcopy/Makefile
@@ -6,7 +6,7 @@ all: fcopy
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fcopy: $(OBJS) ../lib/common.o $(ROOT)/config.mk
diff --git a/src/fids/Makefile b/src/fids/Makefile
index 8da9fd40f..fc970cdd6 100644
--- a/src/fids/Makefile
+++ b/src/fids/Makefile
@@ -6,7 +6,7 @@ all: fids
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fids: $(OBJS) $(ROOT)/config.mk
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
index f40d96ebe..1e0bf7a1a 100644
--- a/src/firecfg/Makefile
+++ b/src/firecfg/Makefile
@@ -6,7 +6,7 @@ all: firecfg
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o $(ROOT)/config.mk
diff --git a/src/firejail/Makefile b/src/firejail/Makefile
index 885ab7b10..bb14a26fc 100644
--- a/src/firejail/Makefile
+++ b/src/firejail/Makefile
@@ -6,7 +6,7 @@ all: firejail
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/rundefs.h ../include/common.h ../include/ldd_utils.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall_i386.h ../include/syscall_x86_64.h ../include/firejail_user.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/rundefs.h ../include/common.h ../include/ldd_utils.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall_i386.h ../include/syscall_x86_64.h ../include/firejail_user.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 firejail: $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
diff --git a/src/firemon/Makefile b/src/firemon/Makefile
index 19828a2da..74c283357 100644
--- a/src/firemon/Makefile
+++ b/src/firemon/Makefile
@@ -6,7 +6,7 @@ all: firemon
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/pid.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 firemon: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk
diff --git a/src/fldd/Makefile b/src/fldd/Makefile
index 899efb597..7cfcadada 100644
--- a/src/fldd/Makefile
+++ b/src/fldd/Makefile
@@ -6,7 +6,7 @@ all: fldd
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h ../include/ldd_utils.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(ROOT)/config.mk
diff --git a/src/fnet/Makefile b/src/fnet/Makefile
index 249cd8501..9ce457a5c 100644
--- a/src/fnet/Makefile
+++ b/src/fnet/Makefile
@@ -6,7 +6,7 @@ all: fnet
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/libnetlink.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o $(ROOT)/config.mk
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
index 5c7cf4733..fbe408893 100644
--- a/src/fnetfilter/Makefile
+++ b/src/fnetfilter/Makefile
@@ -6,7 +6,7 @@ all: fnetfilter
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fnetfilter: $(OBJS) ../lib/common.o $(ROOT)/config.mk
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile
index f3417dc69..38bb0eb79 100644
--- a/src/fnettrace-dns/Makefile
+++ b/src/fnettrace-dns/Makefile
@@ -6,7 +6,7 @@ all: fnettrace-dns
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fnettrace-dns: $(OBJS) $(ROOT)/config.mk
diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile
index 3f5443a34..a3e9a5642 100644
--- a/src/fnettrace-icmp/Makefile
+++ b/src/fnettrace-icmp/Makefile
@@ -6,7 +6,7 @@ all: fnettrace-icmp
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fnettrace-icmp: $(OBJS) $(ROOT)/config.mk
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile
index 3510e73f1..7e3634cb6 100644
--- a/src/fnettrace-sni/Makefile
+++ b/src/fnettrace-sni/Makefile
@@ -6,7 +6,7 @@ all: fnettrace-sni
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fnettrace-sni: $(OBJS) $(ROOT)/config.mk
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile
index 6c4e27f01..eefeadce8 100644
--- a/src/fnettrace/Makefile
+++ b/src/fnettrace/Makefile
@@ -6,7 +6,7 @@ all: fnettrace
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fnettrace: $(OBJS) $(ROOT)/config.mk
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index 7cc2441a3..21097c371 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -6,7 +6,7 @@ all: fsec-optimize
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fsec-optimize: $(OBJS) ../lib/common.o ../lib/errno.o $(ROOT)/config.mk
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
index a83dcca3d..cb56433f0 100644
--- a/src/fsec-print/Makefile
+++ b/src/fsec-print/Makefile
@@ -6,7 +6,7 @@ all: fsec-print
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fsec-print: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
index 9517df8ef..ed779afde 100644
--- a/src/fseccomp/Makefile
+++ b/src/fseccomp/Makefile
@@ -6,7 +6,7 @@ all: fseccomp
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
diff --git a/src/ftee/Makefile b/src/ftee/Makefile
index d2177cb3d..05c71d961 100644
--- a/src/ftee/Makefile
+++ b/src/ftee/Makefile
@@ -6,7 +6,7 @@ all: ftee
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 ftee: $(OBJS) $(ROOT)/config.mk
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
index b9f57fee5..169706ff2 100644
--- a/src/fzenity/Makefile
+++ b/src/fzenity/Makefile
@@ -6,7 +6,7 @@ all: fzenity
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 fzenity: $(OBJS) $(ROOT)/config.mk
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
index f6d5b0f85..e880c0597 100644
--- a/src/jailcheck/Makefile
+++ b/src/jailcheck/Makefile
@@ -6,7 +6,7 @@ all: jailcheck
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h ../include/pid.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 jailcheck: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk
diff --git a/src/lib/Makefile b/src/lib/Makefile
index d9b500409..ff1cfcf74 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -9,7 +9,7 @@ include $(ROOT)/src/common.mk
 .PHONY: lib
 lib: $(OBJS)
 
-%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 .PHONY: clean
diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile
index 42b96c0e6..284e0973b 100644
--- a/src/libpostexecseccomp/Makefile
+++ b/src/libpostexecseccomp/Makefile
@@ -1,16 +1,16 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
-H_FILE_LIST       = $(sort $(wildcard *.h))
-C_FILE_LIST       = $(sort $(wildcard *.c))
-OBJS = $(C_FILE_LIST:.c=.o)
+HDRS = $(sort $(wildcard *.h))
+SRCS = $(sort $(wildcard *.c))
+OBJS = $(SRCS:.c=.o)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
 LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
 
 .PHONY: all
 all: libpostexecseccomp.so
 
-%.o : %.c $(H_FILE_LIST) ../include/seccomp.h ../include/rundefs.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/seccomp.h ../include/rundefs.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
 libpostexecseccomp.so: $(OBJS) $(ROOT)/config.mk
diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile
index 283fbfccb..60edfc22d 100644
--- a/src/libtrace/Makefile
+++ b/src/libtrace/Makefile
@@ -1,16 +1,16 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
-H_FILE_LIST       = $(sort $(wildcard *.h))
-C_FILE_LIST       = $(sort $(wildcard *.c))
-OBJS = $(C_FILE_LIST:.c=.o)
+HDRS = $(sort $(wildcard *.h))
+SRCS = $(sort $(wildcard *.c))
+OBJS = $(SRCS:.c=.o)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
 LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
 
 .PHONY: all
 all: libtrace.so
 
-%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
 libtrace.so: $(OBJS) $(ROOT)/config.mk
diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile
index 55ea9b71a..540d2a367 100644
--- a/src/libtracelog/Makefile
+++ b/src/libtracelog/Makefile
@@ -1,16 +1,16 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
-H_FILE_LIST       = $(sort $(wildcard *.h))
-C_FILE_LIST       = $(sort $(wildcard *.c))
-OBJS = $(C_FILE_LIST:.c=.o)
+HDRS = $(sort $(wildcard *.h))
+SRCS = $(sort $(wildcard *.c))
+OBJS = $(SRCS:.c=.o)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
 LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
 
 .PHONY: all
 all: libtracelog.so
 
-%.o : %.c $(H_FILE_LIST) ../include/rundefs.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/rundefs.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
 libtracelog.so: $(OBJS) $(ROOT)/config.mk
diff --git a/src/profstats/Makefile b/src/profstats/Makefile
index e7c302186..ef1e07cff 100644
--- a/src/profstats/Makefile
+++ b/src/profstats/Makefile
@@ -6,7 +6,7 @@ all: profstats
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 profstats: $(OBJS) $(ROOT)/config.mk