From 07716128b12346e60146404cbd5d3ec799708d1d Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Sun, 18 Jun 2023 09:48:45 -0300
Subject: build: move remaining build flags into config.mk.in

Put all definitions in the same file.
---
 config.mk.in | 24 ++++++++++++++++++++++--
 src/prog.mk  | 14 --------------
 src/so.mk    |  9 ---------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/config.mk.in b/config.mk.in
index 5cf83d9a5..b32431ad7 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -81,9 +81,29 @@ CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
 
 # Project variables
-LIBS=@LIBS@
-
 EXTRA_CFLAGS +=@EXTRA_CFLAGS@
+PROG_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"' \
+	$(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 \
+	-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@
 
 CLEANFILES = *.o *.gcov *.gcda *.gcno *.plist
diff --git a/src/prog.mk b/src/prog.mk
index 38cf714db..70b3629b2 100644
--- a/src/prog.mk
+++ b/src/prog.mk
@@ -9,20 +9,6 @@ HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
 SRCS := $(sort $(wildcard *.c))
 OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 
-PROG_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"' \
-	$(HAVE_GCOV) $(MANFLAGS) \
-	$(EXTRA_CFLAGS) \
-	-fPIE
-
-PROG_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS)
-
 .PHONY: all
 all: $(TARGET)
 
diff --git a/src/so.mk b/src/so.mk
index ec0947933..dadffc52f 100644
--- a/src/so.mk
+++ b/src/so.mk
@@ -9,15 +9,6 @@ HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
 SRCS := $(sort $(wildcard *.c))
 OBJS := $(SRCS:.c=.o) $(EXTRA_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 = -Wl,-z,relro -Wl,-z,now -fPIC
-
 .PHONY: all
 all: $(TARGET)
 
-- 
cgit v1.2.3-54-g00ecf