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).

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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fbuilder
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/syscall.h
 
 .PHONY: all
-all: fbuilder
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fbuilder: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fbuilder *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fcopy
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/syscall.h
 MOD_OBJS = ../lib/common.o
 
 .PHONY: all
-all: fcopy
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fcopy: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fcopy *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fids
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h
 
 .PHONY: all
-all: fids
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fids: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fids *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = firecfg
+TARGET = $(PROG)
+
 MOD_HDRS = \
 ../include/common.h \
 ../include/euid_common.h \
@@ -11,18 +14,18 @@ MOD_HDRS = \
 MOD_OBJS = ../lib/common.o ../lib/firejail_user.o
 
 .PHONY: all
-all: firecfg
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-firecfg: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o firecfg *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = firejail
+TARGET = $(PROG)
+
 MOD_HDRS = \
 ../include/rundefs.h \
 ../include/common.h \
@@ -20,18 +23,18 @@ MOD_OBJS = \
 ../lib/syscall.o
 
 .PHONY: all
-all: firejail
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-firejail: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o firejail *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = firemon
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/pid.h
 MOD_OBJS = ../lib/common.o ../lib/pid.o
 
 .PHONY: all
-all: firemon
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-firemon: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o firemon *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fldd
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
 MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o
 
 .PHONY: all
-all: fldd
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fldd: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fldd *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fnet
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/libnetlink.h
 MOD_OBJS = ../lib/common.o ../lib/libnetlink.o
 
 .PHONY: all
-all: fnet
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnet: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fnet *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fnetfilter
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/syscall.h
 MOD_OBJS = ../lib/common.o
 
 .PHONY: all
-all: fnetfilter
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnetfilter: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fnetfilter *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fnettrace-dns
+TARGET = $(PROG)
+
 .PHONY: all
-all: fnettrace-dns
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnettrace-dns: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fnettrace-dns *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fnettrace-icmp
+TARGET = $(PROG)
+
 .PHONY: all
-all: fnettrace-icmp
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnettrace-icmp: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fnettrace-icmp *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fnettrace-sni
+TARGET = $(PROG)
+
 .PHONY: all
-all: fnettrace-sni
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnettrace-sni: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fnettrace-sni *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fnettrace
+TARGET = $(PROG)
+
 .PHONY: all
-all: fnettrace
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnettrace: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fnettrace *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fsec-optimize
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
 MOD_OBJS = ../lib/common.o ../lib/errno.o
 
 .PHONY: all
-all: fsec-optimize
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fsec-optimize: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fsec-print
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
 MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
 
 .PHONY: all
-all: fsec-print
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fsec-print: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fseccomp
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/syscall.h
 MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
 
 .PHONY: all
-all: fseccomp
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fseccomp: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fseccomp *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = ftee
+TARGET = $(PROG)
+
 .PHONY: all
-all: ftee
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-ftee: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o ftee *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fzenity
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h
 
 .PHONY: all
-all: fzenity
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fzenity: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fzenity *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = jailcheck
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/pid.h
 MOD_OBJS = ../lib/common.o ../lib/pid.o
 
 .PHONY: all
-all: jailcheck
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-jailcheck: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+TARGET = lib
+
 .PHONY: all
-all: lib
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
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 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = profstats
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h
 
 .PHONY: all
-all: profstats
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-profstats: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o profstats *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean