Merge pull request #5219 from kmk3/build-reduce-config-files

build: reduce autoconf input files from 32 to 2

27 files changed, 55 insertions, 81 deletions

diff --git a/src/bash_completion/Makefile.in b/src/bash_completion/Makefile
index 69f35e7ae..e787a7b92 100644
--- a/src/bash_completion/Makefile.in
+++ b/src/bash_completion/Makefile
@@ -2,9 +2,9 @@
 all: firejail.bash_completion
 
 ROOT = ../..
-include $(ROOT)/config.mk
+-include $(ROOT)/config.mk
 
-firejail.bash_completion: firejail.bash_completion.in
+firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk
         gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp
         sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@
         rm $@.tmp
@@ -15,4 +15,3 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/common.mk.in b/src/common.mk
index 2b87c33f0..07b5e373d 100644
--- a/src/common.mk.in
+++ b/src/common.mk
@@ -2,7 +2,7 @@
 #
 # Note: "ROOT" must be defined before including this file.
 
-include $(ROOT)/config.mk
+-include $(ROOT)/config.mk
 
 H_FILE_LIST       = $(sort $(wildcard *.h))
 C_FILE_LIST       = $(sort $(wildcard *.c))
diff --git a/src/fbuilder/Makefile.in b/src/fbuilder/Makefile
index 060f97493..da0403c6e 100644
--- a/src/fbuilder/Makefile.in
+++ b/src/fbuilder/Makefile
@@ -4,10 +4,10 @@ all: fbuilder
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fbuilder: $(OBJS)
+fbuilder: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fbuilder *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fcopy/Makefile.in b/src/fcopy/Makefile
index a2a4172a9..ae128df9b 100644
--- a/src/fcopy/Makefile.in
+++ b/src/fcopy/Makefile
@@ -4,10 +4,10 @@ all: fcopy
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fcopy: $(OBJS) ../lib/common.o
+fcopy: $(OBJS) ../lib/common.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fcopy *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fids/Makefile.in b/src/fids/Makefile
index 8aac55419..e57c56b5b 100644
--- a/src/fids/Makefile.in
+++ b/src/fids/Makefile
@@ -4,11 +4,11 @@ all: fids
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 #fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o
-fids: $(OBJS)
+fids: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -16,4 +16,3 @@ clean:; rm -fr *.o fids *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/firecfg/Makefile.in b/src/firecfg/Makefile
index d112cc40a..3b0daed71 100644
--- a/src/firecfg/Makefile.in
+++ b/src/firecfg/Makefile
@@ -4,10 +4,10 @@ all: firecfg
 ROOT = ../..
 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
+%.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
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o
+firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/firejail_user.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firecfg *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile
index 0dec3da98..23444107f 100644
--- a/src/firejail/Makefile.in
+++ b/src/firejail/Makefile
@@ -4,10 +4,10 @@ all: firejail
 ROOT = ../..
 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
+%.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
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o
+firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firejail *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile
index 6ac0cfff1..b2d2f4d14 100644
--- a/src/firemon/Makefile.in
+++ b/src/firemon/Makefile
@@ -4,10 +4,10 @@ all: firemon
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-firemon: $(OBJS) ../lib/common.o ../lib/pid.o
+firemon: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firemon *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fldd/Makefile.in b/src/fldd/Makefile
index f3842cbee..d9a70529b 100644
--- a/src/fldd/Makefile.in
+++ b/src/fldd/Makefile
@@ -4,10 +4,10 @@ all: fldd
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h
+%.o : %.c $(H_FILE_LIST) ../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
+fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fldd *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fnet/Makefile.in b/src/fnet/Makefile
index 3d70e50bf..36e95522f 100644
--- a/src/fnet/Makefile.in
+++ b/src/fnet/Makefile
@@ -4,10 +4,10 @@ all: fnet
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o
+fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/libnetlink.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnet *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fnetfilter/Makefile.in b/src/fnetfilter/Makefile
index 32b4bbada..758561b9e 100644
--- a/src/fnetfilter/Makefile.in
+++ b/src/fnetfilter/Makefile
@@ -4,10 +4,10 @@ all: fnetfilter
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnetfilter: $(OBJS) ../lib/common.o
+fnetfilter: $(OBJS) ../lib/common.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnetfilter *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fnettrace-dns/Makefile.in b/src/fnettrace-dns/Makefile
index 7cafe6907..101abd4d4 100644
--- a/src/fnettrace-dns/Makefile.in
+++ b/src/fnettrace-dns/Makefile
@@ -4,10 +4,10 @@ all: fnettrace-dns
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST)
+%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnettrace-dns: $(OBJS)
+fnettrace-dns: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace-dns *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fnettrace-sni/Makefile.in b/src/fnettrace-sni/Makefile
index 9349d06f8..da7c1ca4e 100644
--- a/src/fnettrace-sni/Makefile.in
+++ b/src/fnettrace-sni/Makefile
@@ -4,10 +4,10 @@ all: fnettrace-sni
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST)
+%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnettrace-sni: $(OBJS)
+fnettrace-sni: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace-sni *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fnettrace/Makefile.in b/src/fnettrace/Makefile
index a7b93194a..f41a4d36d 100644
--- a/src/fnettrace/Makefile.in
+++ b/src/fnettrace/Makefile
@@ -4,10 +4,10 @@ all: fnettrace
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST)
+%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fnettrace: $(OBJS)
+fnettrace: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fsec-optimize/Makefile.in b/src/fsec-optimize/Makefile
index cfd876953..1aa49d34b 100644
--- a/src/fsec-optimize/Makefile.in
+++ b/src/fsec-optimize/Makefile
@@ -4,10 +4,10 @@ all: fsec-optimize
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h
+%.o : %.c $(H_FILE_LIST) ../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/libnetlink.o
+fsec-optimize: $(OBJS) ../lib/common.o ../lib/libnetlink.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fsec-print/Makefile.in b/src/fsec-print/Makefile
index d07c42405..b076c0588 100644
--- a/src/fsec-print/Makefile.in
+++ b/src/fsec-print/Makefile
@@ -4,10 +4,10 @@ all: fsec-print
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h
+%.o : %.c $(H_FILE_LIST) ../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/libnetlink.o ../lib/errno.o ../lib/syscall.o
+fsec-print: $(OBJS) ../lib/common.o ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fseccomp/Makefile.in b/src/fseccomp/Makefile
index 140a56ab0..9bf4c050b 100644
--- a/src/fseccomp/Makefile.in
+++ b/src/fseccomp/Makefile
@@ -4,10 +4,10 @@ all: fseccomp
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
+%.o : %.c $(H_FILE_LIST) ../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
+fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fseccomp *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile
index f9ad78de2..535d7ff63 100644
--- a/src/ftee/Makefile.in
+++ b/src/ftee/Makefile
@@ -4,10 +4,10 @@ all: ftee
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST)
+%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-ftee: $(OBJS)
+ftee: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o ftee *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/fzenity/Makefile.in b/src/fzenity/Makefile
index 6b7ce0874..0358dd3e9 100644
--- a/src/fzenity/Makefile.in
+++ b/src/fzenity/Makefile
@@ -4,10 +4,10 @@ all: fzenity
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fzenity: $(OBJS)
+fzenity: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fzenity *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/jailcheck/Makefile.in b/src/jailcheck/Makefile
index cf619ad1e..52feb86e6 100644
--- a/src/jailcheck/Makefile.in
+++ b/src/jailcheck/Makefile
@@ -4,10 +4,10 @@ all: jailcheck
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-jailcheck: $(OBJS)
+jailcheck: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS)  ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/lib/Makefile.in b/src/lib/Makefile
index 330a47892..d9bc63ef7 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile
@@ -4,7 +4,7 @@ include $(ROOT)/src/common.mk
 .PHONY: all
 all: $(OBJS)
 
-%.o : %.c $(H_FILE_LIST)
+%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 .PHONY: clean
@@ -12,4 +12,3 @@ clean:; rm -fr $(OBJS) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/libpostexecseccomp/Makefile.in b/src/libpostexecseccomp/Makefile
index 6f354757c..5386af58b 100644
--- a/src/libpostexecseccomp/Makefile.in
+++ b/src/libpostexecseccomp/Makefile
@@ -1,5 +1,5 @@
 ROOT = ../..
-include $(ROOT)/config.mk
+-include $(ROOT)/config.mk
 
 H_FILE_LIST       = $(sort $(wildcard *.h))
 C_FILE_LIST       = $(sort $(wildcard *.c))
@@ -11,10 +11,10 @@ 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
+%.o : %.c $(H_FILE_LIST) ../include/seccomp.h ../include/rundefs.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-libpostexecseccomp.so: $(OBJS)
+libpostexecseccomp.so: $(OBJS) $(ROOT)/config.mk
         $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl
 
 .PHONY: clean
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libpostexecseccomp.so *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/libtrace/Makefile.in b/src/libtrace/Makefile
index ced036865..6f28b3442 100644
--- a/src/libtrace/Makefile.in
+++ b/src/libtrace/Makefile
@@ -1,5 +1,5 @@
 ROOT = ../..
-include $(ROOT)/config.mk
+-include $(ROOT)/config.mk
 
 H_FILE_LIST       = $(sort $(wildcard *.h))
 C_FILE_LIST       = $(sort $(wildcard *.c))
@@ -11,10 +11,10 @@ LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
 .PHONY: all
 all: libtrace.so
 
-%.o : %.c $(H_FILE_LIST)
+%.o : %.c $(H_FILE_LIST) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-libtrace.so: $(OBJS)
+libtrace.so: $(OBJS) $(ROOT)/config.mk
         $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl
 
 .PHONY: clean
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libtrace.so *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/libtracelog/Makefile.in b/src/libtracelog/Makefile
index 52d4bcb08..c5d9c131d 100644
--- a/src/libtracelog/Makefile.in
+++ b/src/libtracelog/Makefile
@@ -1,5 +1,5 @@
 ROOT = ../..
-include $(ROOT)/config.mk
+-include $(ROOT)/config.mk
 
 H_FILE_LIST       = $(sort $(wildcard *.h))
 C_FILE_LIST       = $(sort $(wildcard *.c))
@@ -11,10 +11,10 @@ LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now
 .PHONY: all
 all: libtracelog.so
 
-%.o : %.c $(H_FILE_LIST) ../include/rundefs.h
+%.o : %.c $(H_FILE_LIST) ../include/rundefs.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-libtracelog.so: $(OBJS)
+libtracelog.so: $(OBJS) $(ROOT)/config.mk
         $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl
 
 .PHONY: clean
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libtracelog.so *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/man/Makefile.in b/src/man/Makefile
index a63f9d28e..283822d1f 100644
--- a/src/man/Makefile.in
+++ b/src/man/Makefile
@@ -2,9 +2,9 @@
 all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man
 
 ROOT = ../..
-include $(ROOT)/config.mk
+-include $(ROOT)/config.mk
 
-%.man: %.txt
+%.man: %.txt $(ROOT)/config.mk
         gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@
 
 .PHONY: clean
@@ -12,4 +12,3 @@ clean:; rm -fr *.man
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/profstats/Makefile.in b/src/profstats/Makefile
index 394f30fda..0274aead2 100644
--- a/src/profstats/Makefile.in
+++ b/src/profstats/Makefile
@@ -4,10 +4,10 @@ all: profstats
 ROOT = ../..
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(H_FILE_LIST) ../include/common.h
+%.o : %.c $(H_FILE_LIST) ../include/common.h $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-profstats: $(OBJS)
+profstats: $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
@@ -15,4 +15,3 @@ clean:; rm -fr *.o profstats *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile
diff --git a/src/zsh_completion/Makefile.in b/src/zsh_completion/Makefile
index fceab1d00..d7bc1038a 100644
--- a/src/zsh_completion/Makefile.in
+++ b/src/zsh_completion/Makefile
@@ -2,9 +2,9 @@
 all: _firejail
 
 ROOT = ../..
-include $(ROOT)/config.mk
+-include $(ROOT)/config.mk
 
-_firejail: _firejail.in
+_firejail: _firejail.in $(ROOT)/config.mk
         gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp
         sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@
         rm $@.tmp
@@ -15,4 +15,3 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-        rm -fr Makefile