From df68de61fdca1ad55a2dd9b8c7e4eb88f60c45f0 Mon Sep 17 00:00:00 2001
From: JDierkse <j.dierkse@madeo.nl>
Date: Thu, 16 Mar 2023 12:09:13 +0100
Subject: [PATCH] Add CompileFlags Target

---
 Makefile                    | 22 +++++++++++++++++-----
 Makefile.conf.armv6-jessie  |  2 +-
 Makefile.conf.armv6-stretch |  2 +-
 Makefile.conf.armv8-alpine  |  2 +-
 Makefile.conf.armv8-jessie  |  2 +-
 Makefile.conf.armv8-stretch |  2 +-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index b8e6deb..b9bdda2 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ $(foreach library,$(LIBRARIES),$(eval $(call add_library,$(library))))
 define build_target_arch
 	$(eval $@_DATETIME := $(DATETIME))
 	@echo -n " [LD] $(1)\n"
-	@$(PREFIX) $(CC) -o $(1) $(2) $(LFLAGS) $(CFLAGS) $(POSTFIX)
+	@$(PREFIX) $(CC) -o $(1) $(2) $(LFLAGS) $(CPUFLAGS) $(CFLAGS) $(POSTFIX)
 	@if [ -d "$(DEBUGDIR)" ]; then \
 		$(OBJCOPY) --only-keep-debug $(1) $(DEBUGDIR)/$(1)-$($@_DATETIME).debug; \
 		$(STRIP) $(SFLAGS) $(1); \
@@ -179,7 +179,7 @@ endif
 		done; \
 		true; \
 		echo -n " [MM] $@\n"; \
-		$(PREFIX) $(CC) $(CFLAGS) $< -MM -MT $(@:.d.$(ARCH)=.o.$(ARCH)) >$@ $(POSTFIX); \
+		$(PREFIX) $(CC) $(CPUFLAGS) $(CFLAGS) $< -MM -MT $(@:.d.$(ARCH)=.o.$(ARCH)) >$@ $(POSTFIX); \
 	fi
 
 %.o.$(ARCH): %.cpp
@@ -190,7 +190,7 @@ endif
 	done; \
 	true
 	@echo -n " [CC] $@\n"
-	@$(PREFIX) $(CC) -c $(CFLAGS) $< -o $@ $(POSTFIX)
+	@$(PREFIX) $(CC) -c $(CPUFLAGS) $(CFLAGS) $< -o $@ $(POSTFIX)
 
 %.d.$(ARCH): %.cc
 	@if [ "$(ARCH)" != "any" ]; then \
@@ -201,7 +201,7 @@ endif
 		done; \
 		true; \
 		echo -n " [MM] $@\n"; \
-		$(PREFIX) $(CC) $(CFLAGS) $< -MM -MT $(@:.d.$(ARCH)=.o.$(ARCH)) >$@ $(POSTFIX); \
+		$(PREFIX) $(CC) $(CPUFLAGS) $(CFLAGS) $< -MM -MT $(@:.d.$(ARCH)=.o.$(ARCH)) >$@ $(POSTFIX); \
 	fi
 
 %.o.$(ARCH): %.cc
@@ -212,7 +212,7 @@ endif
 	done; \
 	true
 	@echo -n " [CC] $@\n"
-	@$(PREFIX) $(CC) -c $(CFLAGS) $< -o $@ $(POSTFIX)
+	@$(PREFIX) $(CC) -c $(CPUFLAGS) $(CFLAGS) $< -o $@ $(POSTFIX)
 
 $(ARNAME): $(SUBDIRS) $(LOCALOBJECTS)
 	@depth=$(MAKELEVEL); \
@@ -336,6 +336,18 @@ $(ARCH):
 		fi \
 	fi
 
+# ---------- Flags Rule ----------
+
+.PHONY: compile_flags.txt
+compile_flags.txt:
+	@echo -n " [TXT] $@\n"
+	$(shell echo "-xc++ $(CFLAGS)" | sed 's/ /\n/g' > $(ROOTPATH)/$@)
+
+.PHONY: flags
+flags: compile_flags.txt
+
+TARGETS += flags
+
 # ---------- All Rule ----------
 
 .PHONY: all
diff --git a/Makefile.conf.armv6-jessie b/Makefile.conf.armv6-jessie
index 1102cb8..ecbf8e9 100644
--- a/Makefile.conf.armv6-jessie
+++ b/Makefile.conf.armv6-jessie
@@ -3,7 +3,7 @@
 #
 
 ARCH := armv6-jessie
-CFLAGS += -marm -march=armv6
+CPUFLAGS += -marm -march=armv6
 
 ARCHBASEDIR := $(BUILDSUPPORTDIR)/Raspbian-jessie
 
diff --git a/Makefile.conf.armv6-stretch b/Makefile.conf.armv6-stretch
index c63cfea..7354d14 100644
--- a/Makefile.conf.armv6-stretch
+++ b/Makefile.conf.armv6-stretch
@@ -3,7 +3,7 @@
 #
 
 ARCH := armv6-stretch
-CFLAGS += -marm -march=armv6
+CPUFLAGS += -marm -march=armv6
 
 ARCHBASEDIR := $(BUILDSUPPORTDIR)/Raspbian-stretch
 
diff --git a/Makefile.conf.armv8-alpine b/Makefile.conf.armv8-alpine
index a01dc3f..eb66fc2 100644
--- a/Makefile.conf.armv8-alpine
+++ b/Makefile.conf.armv8-alpine
@@ -3,7 +3,7 @@
 #
 
 ARCH := armv8-alpine
-CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
+CPUFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
 
 ARCHBASEDIR := $(BUILDSUPPORTDIR)/alpine
 
diff --git a/Makefile.conf.armv8-jessie b/Makefile.conf.armv8-jessie
index bd0bb5a..86cfd2d 100644
--- a/Makefile.conf.armv8-jessie
+++ b/Makefile.conf.armv8-jessie
@@ -3,7 +3,7 @@
 #
 
 ARCH := armv8-jessie
-CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
+CPUFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
 
 ARCHBASEDIR := $(BUILDSUPPORTDIR)/Raspbian-jessie
 
diff --git a/Makefile.conf.armv8-stretch b/Makefile.conf.armv8-stretch
index 7fb47ac..20e821a 100644
--- a/Makefile.conf.armv8-stretch
+++ b/Makefile.conf.armv8-stretch
@@ -3,7 +3,7 @@
 #
 
 ARCH := armv8-stretch
-CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
+CPUFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
 
 ARCHBASEDIR := $(BUILDSUPPORTDIR)/Raspbian-stretch