From: Stephen Kitt <skitt@debian.org>
Date: Tue, 21 Oct 2014 18:31:24 +0000 (+0100)
Subject: Take externally-defined flags into account
X-Git-Tag: archive/raspbian/3.6-1+rpi1~1^2^2^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=36822b677cbe6fc7903fbeac0b15a78746e6edd4;p=lgogdownloader.git

Take externally-defined flags into account


Gbp-Pq: Name honour-flags.patch
---

diff --git a/Makefile b/Makefile
index 18c7845..87f2239 100644
--- 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