Description: Adding hardening build flags
Author: Massimo Manghi <mxmanghi@apache.org>
Last-Update: 2015-01-17
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: libsoldout-1.3/GNUmakefile
===================================================================
--- libsoldout-1.3.orig/GNUmakefile
+++ libsoldout-1.3/GNUmakefile
@@ -15,8 +15,10 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 DEPDIR=depends
-CFLAGS=-c -g -O3 -Wall -Werror -fPIC
-LDFLAGS=-g -O3 -Wall -Werror
+#CFLAGS=-c -g -O3 -Wall -Werror -fPIC
+CFLAGS+=$(shell dpkg-buildflags --get CFLAGS) -c -Wall -Werror -fPIC
+#LDFLAGS=-g -O3 -Wall -Werror
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wall -Werror
 CC=gcc
 
 all:		libsoldout.so mkd2html mkd2latex mkd2man
@@ -30,25 +32,25 @@ libsoldout.so:	libsoldout.so.1
 	ln -s $^ $@
 
 libsoldout.so.1: markdown.o array.o buffer.o renderers.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(CPPFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 
 # executables
 
 mkd2html:	mkd2html.o libsoldout.so
-	$(CC) $(LDFLAGS) $^ -o $@
+	$(CC) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
 
 mkd2latex:	mkd2latex.o libsoldout.so
-	$(CC) $(LDFLAGS) $^ -o $@
+	$(CC) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
 
 mkd2man:	mkd2man.o libsoldout.so
-	$(CC) $(LDFLAGS) $^ -o $@
+	$(CC) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
 
 
 # housekeeping
 
 benchmark:	benchmark.o libsoldout.so
-	$(CC) $(LDFLAGS) $^ -o $@
+	$(CC) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
 
 clean:
 	rm -f *.o
@@ -66,10 +68,10 @@ include $(wildcard $(DEPDIR)/*.d)
 
 %.o:	%.c
 	@mkdir -p $(DEPDIR)
-	@$(CC) -MM $< > $(DEPDIR)/$*.d
-	$(CC) $(CFLAGS) -o $@ $<
+	@$(CC) $(CPPFLAGS) -MM $< > $(DEPDIR)/$*.d
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 %.o:	%.m
 	@mkdir -p $(DEPDIR)
-	@$(CC) -MM $< > depends/$*.d
-	$(CC) $(CFLAGS) -o $@ $<
+	@$(CC) $(CPPFLAGS) -MM $< > depends/$*.d
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $<
