build: standardize common CFLAGS

Changes:

* Deduplicate common CFLAGS into a new COMMON_CFLAGS variable
* Move some definitions from PROG_CFLAGS into COMMON_CFLAGS

1 files changed, 5 insertions, 5 deletions

diff --git a/config.mk.in b/config.mk.in
index b32431ad7..89d401dfd 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -82,7 +82,7 @@ LDFLAGS=@LDFLAGS@
 
 # Project variables
 EXTRA_CFLAGS +=@EXTRA_CFLAGS@
-PROG_CFLAGS = \
+COMMON_CFLAGS = \
         -ggdb -O2 -DVERSION='"$(VERSION)"' \
         -Wall -Wextra $(HAVE_FATAL_WARNINGS) \
         -Wformat -Wformat-security \
@@ -90,15 +90,15 @@ PROG_CFLAGS = \
         -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 = \
-        -ggdb -O2 -DVERSION='"$(VERSION)"' \
-        -Wall -Wextra $(HAVE_FATAL_WARNINGS) \
-        -Wformat -Wformat-security \
-        -fstack-protector-all -D_FORTIFY_SOURCE=2 \
+        $(COMMON_CFLAGS) \
         -fPIC
 
 EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@