[gosmore] 17/20: Use CPPFLAGS & LDFLAGS set in the environment.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gosmore.

commit 645f757f54feadea15ced0101ee8c4626c95dae9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 7 13:28:56 2016 +0200

    Use CPPFLAGS & LDFLAGS set in the environment.
---
 debian/patches/hardening.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index dc25858..d5522ed 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -12,3 +12,43 @@ Author: Bas Couwenberg <sebastic at debian.org>
  WARNFLAGS= -W -Wall
  
  #"------------------------ Compiling with cegcc : ---------------------------
+@@ -53,16 +53,16 @@ all: gosmore$(EXE)
+ 
+ gosmore:	jni/gosmore.cpp jni/libgosm.cpp jni/libgosm.h jni/bboxes.c \
+ 		jni/openglespolygon.h jni/openglespolygon.cpp
+-		g++ ${CFLAGS} ${WARNFLAGS} \
++		g++ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${WARNFLAGS} \
+                   jni/gosmore.cpp jni/libgosm.cpp jni/openglespolygon.h \
+                   jni/openglespolygon.cpp -o gosmore ${EXTRA} ${XMLFLAGS} ${XMLLIBS}
+ 
+ $(ARCH)gosmore.exe:	jni/gosmore.cpp jni/libgosm.cpp gosmore.rsc jni/resource.h \
+                     jni/libgosm.h jni/ceglue.h jni/ceglue.c bboxes.c
+-		${ARCH}g++ ${CFLAGS} ${EXTRAC} -c jni/gosmore.cpp
+-		${ARCH}g++ ${CFLAGS} ${EXTRAC} -c jni/libgosm.cpp
+-		${ARCH}gcc ${CFLAGS} ${EXTRAC} -c jni/ConvertUTF.c
+-		${ARCH}gcc ${CFLAGS} ${EXTRAC} -c jni/ceglue.c
++		${ARCH}g++ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${EXTRAC} -c jni/gosmore.cpp
++		${ARCH}g++ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${EXTRAC} -c jni/libgosm.cpp
++		${ARCH}gcc ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${EXTRAC} -c jni/ConvertUTF.c
++		${ARCH}gcc ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${EXTRAC} -c jni/ceglue.c
+ 		${ARCH}g++ -static ${EXTRAL} \
+ 		  gosmore.o libgosm.o ceglue.o ConvertUTF.o gosmore.rsc $(W32LIBS)  -o $@
+ 
+@@ -76,7 +76,7 @@ translations.c: extract
+ 		wget -O - ${WIKIPAGE}/Translations |./extract >jni/translations.c
+ 
+ extract:	extract.c
+-		${CC} ${CFLAGS} ${XMLFLAGS} extract.c -o extract ${XMLLIBS}
++		${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${XMLFLAGS} extract.c -o extract ${XMLLIBS}
+ 
+ jni/bboxes.c:	density.c density.txt
+ 		gcc density.c -o density -lm
+@@ -85,7 +85,7 @@ jni/bboxes.c:	density.c density.txt
+ #   countries.osm
+ 
+ osmunda:	osmunda.cpp jni/libgosm.cpp jni/libgosm.h
+-		g++ ${CFLAGS} ${WARNFLAGS} ${XMLFLAGS} \
++		g++ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${WARNFLAGS} ${XMLFLAGS} \
+ 		  osmunda.cpp jni/libgosm.cpp -o osmunda ${XMLLIBS}
+ voices:
+ 		echo '(voice_rab_diphone)' >/tmp/voice_rab_diphone

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gosmore.git