From a5d46a67e3f6a87df48a71292d613672b605d438 Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Thu, 16 Jul 2020 20:28:46 +0200
Subject: moved CFLAGS to PROJECT_CFLAGS so OpenWrt won't overwrite it

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 990357538..cafb21243 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 CC = gcc
-CFLAGS += -Wall -Wextra $(EXTRA_CFLAGS)
+PROJECT_CFLAGS += -Wall -Wextra $(EXTRA_CFLAGS)
 LIBS += -pthread -lpcap -lm
 
 ifneq ($(CUSTOM_LIBNDPI),)
 LIBS += '$(CUSTOM_LIBNDPI)'
-CFLAGS += '-I$(shell dirname $(CUSTOM_LIBNDPI))/../include'
+PROJECT_CFLAGS += '-I$(shell dirname $(CUSTOM_LIBNDPI))/../include'
 ifeq ($(findstring $*.so, $(CUSTOM_LIBNDPI)),.so)
-CFLAGS += -Wl,-rpath='$(shell dirname $(CUSTOM_LIBNDPI))'
+PROJECT_CFLAGS += -Wl,-rpath='$(shell dirname $(CUSTOM_LIBNDPI))'
 endif
 else
 CUSTOM_LIBNDPI = no
@@ -14,20 +14,20 @@ LIBS += -lndpi
 endif
 
 ifeq ($(ENABLE_DEBUG),yes)
-CFLAGS += -O0 -g3 -fno-omit-frame-pointer
+PROJECT_CFLAGS += -O0 -g3 -fno-omit-frame-pointer
 else
 ENABLE_DEBUG = no
 endif
 
 ifeq ($(ENABLE_SANITIZER),yes)
-CFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=enum -fsanitize=leak
+PROJECT_CFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=enum -fsanitize=leak
 LIBS += -lasan -lubsan
 else
 ENABLE_SANITIZER = no
 endif
 
 ifeq ($(ENABLE_SANITIZER_THREAD),yes)
-CFLAGS += -fsanitize=undefined -fsanitize=enum -fsanitize=thread
+PROJECT_CFLAGS += -fsanitize=undefined -fsanitize=enum -fsanitize=thread
 LIBS += -lubsan
 else
 ENABLE_SANITIZER_THREAD = no
@@ -36,7 +36,7 @@ endif
 RM = rm -f
 
 nDPId: help nDPId.c
-	$(CC) $(CFLAGS) nDPId.c -o $@ $(LDFLAGS) $(LIBS)
+	$(CC) $(PROJECT_CFLAGS) $(CFLAGS) nDPId.c -o $@ $(LDFLAGS) $(LIBS)
 
 clean:
 	$(RM) nDPId
@@ -44,6 +44,7 @@ clean:
 help:
 	@echo 'CC               = $(CC)'
 	@echo 'CFLAGS           = $(CFLAGS)'
+	@echo 'PROJECT_CFLAGS	= $(PROJECT_CFLAGS)'
 	@echo 'LIBS             = $(LIBS)'
 	@echo 'CUSTOM_LIBNDPI   = $(CUSTOM_LIBNDPI)'
 	@echo 'ENABLE_DEBUG     = $(ENABLE_DEBUG)'
-- 
cgit v1.2.3