Merge pull request #5866 from kmk3/build-organize-make-vars

build: organize and standardize make vars and targets

21 files changed, 104 insertions, 84 deletions

diff --git a/config.mk.in b/config.mk.in
index 6ee541507..f3c1f658c 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -22,35 +22,56 @@ docdir=@docdir@
 mandir=@mandir@
 sysconfdir=@sysconfdir@
 
-HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
+# Misc flags
 BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
-HAVE_SUID=@HAVE_SUID@
+HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
+HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
+HAVE_GCOV=@HAVE_GCOV@
 HAVE_MAN=@HAVE_MAN@
 
+# MANFLAGS
+HAVE_APPARMOR=@HAVE_APPARMOR@
 HAVE_CHROOT=@HAVE_CHROOT@
-HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
-HAVE_NETWORK=@HAVE_NETWORK@
-HAVE_USERNS=@HAVE_USERNS@
-HAVE_X11=@HAVE_X11@
+HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
 HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@
+HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
+HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
 HAVE_GLOBALCFG=@HAVE_GLOBALCFG@
-HAVE_APPARMOR=@HAVE_APPARMOR@
+HAVE_IDS=@HAVE_IDS@
+HAVE_LTS=@HAVE_LTS@
+HAVE_NETWORK=@HAVE_NETWORK@
+HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
+HAVE_OUTPUT=@HAVE_OUTPUT@
 HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
-HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
 HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
 HAVE_PRIVATE_LIB=@HAVE_PRIVATE_LIB@
-HAVE_IDS=@HAVE_IDS@
-HAVE_GCOV=@HAVE_GCOV@
 HAVE_SELINUX=@HAVE_SELINUX@
 HAVE_SUID=@HAVE_SUID@
-HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
+HAVE_USERNS=@HAVE_USERNS@
 HAVE_USERTMPFS=@HAVE_USERTMPFS@
-HAVE_OUTPUT=@HAVE_OUTPUT@
-HAVE_LTS=@HAVE_LTS@
-HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
-HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
+HAVE_X11=@HAVE_X11@
 
-MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_PRIVATE_LIB) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES)
+MANFLAGS = \
+        $(HAVE_APPARMOR) \
+        $(HAVE_CHROOT) \
+        $(HAVE_DBUSPROXY) \
+        $(HAVE_FILE_TRANSFER) \
+        $(HAVE_FIRETUNNEL) \
+        $(HAVE_FORCE_NONEWPRIVS) \
+        $(HAVE_GLOBALCFG) \
+        $(HAVE_IDS) \
+        $(HAVE_LTS) \
+        $(HAVE_NETWORK) \
+        $(HAVE_ONLY_SYSCFG_PROFILES) \
+        $(HAVE_OUTPUT) \
+        $(HAVE_OVERLAYFS) \
+        $(HAVE_PRIVATE_HOME) \
+        $(HAVE_PRIVATE_LIB) \
+        $(HAVE_SELINUX) \
+        $(HAVE_SUID) \
+        $(HAVE_USERNS) \
+        $(HAVE_USERTMPFS) \
+        $(HAVE_X11)
 
 # User variables - should not be modified in the code (as they are reserved for
 # the user building the package); see the following for details:
@@ -60,7 +81,29 @@ CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
 
 # Project variables
-LIBS=@LIBS@
+EXTRA_CFLAGS  =@EXTRA_CFLAGS@
+COMMON_CFLAGS = \
+        -ggdb -O2 -DVERSION='"$(VERSION)"' \
+        -Wall -Wextra $(HAVE_FATAL_WARNINGS) \
+        -Wformat -Wformat-security \
+        -fstack-protector-all -D_FORTIFY_SOURCE=2 \
+        -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \
+        -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \
+        -DVARDIR='"/var/lib/firejail"' \
+
+PROG_CFLAGS = \
+        $(COMMON_CFLAGS) \
+        $(HAVE_GCOV) $(MANFLAGS) \
+        $(EXTRA_CFLAGS) \
+        -fPIE
+
+SO_CFLAGS = \
+        $(COMMON_CFLAGS) \
+        -fPIC
+
+EXTRA_LDFLAGS =@EXTRA_LDFLAGS@
+PROG_LDFLAGS  = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS)
+SO_LDFLAGS    = -Wl,-z,relro -Wl,-z,now -fPIC
+LIBS =@LIBS@
 
-EXTRA_CFLAGS +=@EXTRA_CFLAGS@
-EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
+CLEANFILES = *.o *.gcov *.gcda *.gcno *.plist
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
-MOD_OBJS = ../lib/common.o
+EXTRA_HDRS = ../include/common.h ../include/syscall.h
+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
-MOD_OBJS = ../lib/common.o ../lib/pid.o
+EXTRA_HDRS = ../include/common.h ../include/pid.h
+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
-MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o
+EXTRA_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
+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
-MOD_OBJS = ../lib/common.o ../lib/libnetlink.o
+EXTRA_HDRS = ../include/common.h ../include/libnetlink.h
+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
-MOD_OBJS = ../lib/common.o
+EXTRA_HDRS = ../include/common.h ../include/syscall.h
+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
-MOD_OBJS = ../lib/common.o ../lib/errno.o
+EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
+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
-MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
+EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
+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
-MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
+EXTRA_HDRS = ../include/common.h ../include/syscall.h
+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
-MOD_OBJS = ../lib/common.o ../lib/pid.o
+EXTRA_HDRS = ../include/common.h ../include/pid.h
+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 e4473184f..70b3629b2 100644
--- a/src/prog.mk
+++ b/src/prog.mk
@@ -3,25 +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_SRCS, MOD_OBJS, TOCLEAN and TODISTCLEAN.
+# define EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES.
 
-HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
-SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
-OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
-
-PROG_CFLAGS = \
-        -ggdb -O2 -DVERSION='"$(VERSION)"' \
-        -Wall -Wextra $(HAVE_FATAL_WARNINGS) \
-        -Wformat -Wformat-security \
-        -fstack-protector-all -D_FORTIFY_SOURCE=2 \
-        -fPIE \
-        -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \
-        -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \
-        -DVARDIR='"/var/lib/firejail"' \
-        $(HAVE_GCOV) $(MANFLAGS) \
-        $(EXTRA_CFLAGS)
-
-PROG_LDFLAGS = -pie -fPIE -Wl,-z,relro -Wl,-z,now $(EXTRA_LDFLAGS)
+HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
+SRCS := $(sort $(wildcard *.c))
+OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 
 .PHONY: all
 all: $(TARGET)
@@ -33,7 +19,7 @@ $(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 .PHONY: clean
-clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist $(TOCLEAN)
+clean:; rm -fr $(PROG) $(CLEANFILES)
 
 .PHONY: distclean
-distclean: clean; rm -fr $(TODISTCLEAN)
+distclean: clean
diff --git a/src/so.mk b/src/so.mk
index e464a7bff..dadffc52f 100644
--- a/src/so.mk
+++ b/src/so.mk
@@ -3,20 +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_SRCS, MOD_OBJS, TOCLEAN and TODISTCLEAN.
+# EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES.
 
-HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
-SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
-OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
-
-SO_CFLAGS = \
-        -ggdb -O2 -DVERSION='"$(VERSION)"' \
-        -Wall -Wextra $(HAVE_FATAL_WARNINGS) \
-        -Wformat -Wformat-security \
-        -fstack-protector-all -D_FORTIFY_SOURCE=2 \
-        -fPIC
-
-SO_LDFLAGS = -pie -fPIE -Wl,-z,relro -Wl,-z,now
+HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
+SRCS := $(sort $(wildcard *.c))
+OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 
 .PHONY: all
 all: $(TARGET)
@@ -25,10 +16,10 @@ all: $(TARGET)
         $(CC) $(SO_CFLAGS) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
 $(SO): $(OBJS) $(ROOT)/config.mk
-        $(CC) $(SO_LDFLAGS) -shared -fPIC -z relro $(LDFLAGS) -o $@ $(OBJS) -ldl
+        $(CC) $(SO_LDFLAGS) -shared $(LDFLAGS) -o $@ $(OBJS) -ldl
 
 .PHONY: clean
-clean:; rm -fr $(OBJS) $(SO) *.plist $(TOCLEAN)
+clean:; rm -fr $(SO) $(CLEANFILES)
 
 .PHONY: distclean
-distclean: clean; rm -fr $(TODISTCLEAN)
+distclean: clean