Take externally-defined flags into account

Gbp-Pq: Name honour-flags.patch

diff --git a/Makefile b/Makefile
index 18c7845a018af7aa034e9b573ab8a17f1a894430..87f22399c6d94cf6c07e5466f68b52b8e2c06743 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,11 @@ LD = g++
 WINDRES = windres
 
 INC =  -Iinclude -I/usr/include/rhash
-CFLAGS =  -std=c++11 -Wall -fexceptions -D_FILE_OFFSET_BITS=64
+CFLAGS := $(CFLAGS) -std=c++11 -Wall -fexceptions -D_FILE_OFFSET_BITS=64
 RESINC = 
 LIBDIR = 
 LIB =  -lcurl -loauth -ljsoncpp -lhtmlcxx -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options -lboost_date_time -ltinyxml -lrhash
-LDFLAGS = 
+LDFLAGS := $(LDFLAGS)
 
 VERSION = -DVERSION_STRING="\"$(shell sh version.sh)\""
 HELP2MAN = $(shell which help2man 2> /dev/null)
@@ -39,12 +39,12 @@ DEP_DEBUG =
 OUT_DEBUG = bin/Debug/lgogdownloader
 
 INC_RELEASE =  $(INC)
-CFLAGS_RELEASE =  $(CFLAGS) -O2
+CFLAGS_RELEASE =  $(CFLAGS) $(CPPFLAGS)
 RESINC_RELEASE =  $(RESINC)
 RCFLAGS_RELEASE =  $(RCFLAGS)
 LIBDIR_RELEASE =  $(LIBDIR)
 LIB_RELEASE = $(LIB)
-LDFLAGS_RELEASE =  $(LDFLAGS) -s
+LDFLAGS_RELEASE =  $(LDFLAGS)
 OBJDIR_RELEASE = obj/Release
 DEP_RELEASE = 
 OUT_RELEASE = bin/Release/lgogdownloader