Description: use hardening build flags
 One of the release goals for the next stable Debian release is
 to have as many packages use security hardening build flags as
 possible. This patch enables them as recommended by
 http://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags
Author: Raoul Gunnar Borenius <borenius@dfn.de>
Forwarded: yes, sent private email to upstream authors
Last-Update: 2012-03-27
Reviewed-by: Simon Ruderich <simon@ruderich.org>
--- a/mgen/makefiles/Makefile.common
+++ b/mgen/makefiles/Makefile.common
@@ -14,6 +14,7 @@
 INCLUDES = $(SYSTEM_INCLUDES) -I$(UNIX) -I$(INCLUDE) -I$(PROTOLIB)/include
 
 CFLAGS = -g -DPROTO_DEBUG -D_RAPR_JOURNAL -DHAVE_GPS -DUNIX -Wall -Wcast-align -pedantic -fPIC $(SYSTEM_HAVES) $(INCLUDES)
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 
 #CFLAGS = -g -fno-inline -D_HAVE_PCAP -DPROTO_DEBUG -DHAVE_GPS -DUNIX -Wall -Wcast-align -pedantic  -fPIC $(SYSTEM_HAVES) $(INCLUDES) 
 
--- a/mgen/makefiles/Makefile.freebsd
+++ b/mgen/makefiles/Makefile.freebsd
@@ -7,6 +7,7 @@
 #
 SYSTEM_INCLUDES =  
 SYSTEM_LDFLAGS = -Wl,--as-needed
+SYSTEM_LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 SYSTEM_LIBS = -pthread
 ####SYSTEM_LIBS = -lc_r
 
--- a/mgen/makefiles/Makefile.linux
+++ b/mgen/makefiles/Makefile.linux
@@ -8,6 +8,7 @@
 SYSTEM_INCLUDES = -I/usr/X11R6/include 
 SYSTEM_LDFLAGS = -L/usr/X11R6/lib 
 SYSTEM_LDFLAGS += -Wl,--as-needed
+SYSTEM_LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 SYSTEM_LIBS = -ldl -lpthread
 
 # 2) System specific capabilities
--- a/mgen/protolib/makefiles/Makefile.freebsd
+++ b/mgen/protolib/makefiles/Makefile.freebsd
@@ -6,7 +6,7 @@
 #    (Where to find X11 libraries, etc)
 #
 SYSTEM_INCLUDES =  
-SYSTEM_LDFLAGS =  
+SYSTEM_LDFLAGS =   $(shell dpkg-buildflags --get LDFLAGS)
 SYSTEM_LIBS = -pthread
 ##SYSTEM_LIBS = -lc_r
 
--- a/mgen/protolib/makefiles/Makefile.linux
+++ b/mgen/protolib/makefiles/Makefile.linux
@@ -6,7 +6,7 @@
 # System specific additional libraries, include paths, etc
 #
 SYSTEM_INCLUDES = 
-SYSTEM_LDFLAGS =
+SYSTEM_LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 SYSTEM_LIBS = -ldl -lrt
 
 # 6) System specific capabilities
--- a/mgen/protolib/makefiles/Makefile.common
+++ b/mgen/protolib/makefiles/Makefile.common
@@ -16,6 +16,7 @@
 INCLUDES = $(TCL_INCL_PATH) $(SYSTEM_INCLUDES) -I../include
 
 CFLAGS = -g -DPROTO_DEBUG -DUNIX -D_FILE_OFFSET_BITS=64 -O $(SYSTEM_CFLAGS) -fPIC $(SYSTEM_HAVES) $(INCLUDES)
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 
 LDFLAGS = $(SYSTEM_LDFLAGS)
 
