Author: Apollon Oikonomopoulos <apoikos@debian.org>
Description: Use hardened LDFLAGS and CPPFLAGS

Forwarded: no
Last-Update: 2014-05-13
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -55,14 +55,15 @@
 
 TGTD_DEP = $(TGTD_OBJS:.o=.d)
 
-LDFLAGS = -Wl,-E,-rpath=$(libdir)
+TGTD_LDFLAGS = $(LDFLAGS)
+TGTD_LDFLAGS += -Wl,-E,-rpath=$(libdir)
 
 .PHONY:all
 all: $(PROGRAMS) $(MODULES)
 
 tgtd: $(TGTD_OBJS)
 	echo $(CC) $^ -o $@ $(LIBS)
-	$(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
+	$(CC) $^ -o $@ $(TGTD_LDFLAGS) $(LIBS)
 
 -include $(TGTD_DEP)
 
@@ -70,7 +71,7 @@
 TGTADM_DEP = $(TGTADM_OBJS:.o=.d)
 
 tgtadm: $(TGTADM_OBJS)
-	$(CC) $^ -o $@
+	$(CC) $^ -o $@ $(LDFLAGS)
 
 -include $(TGTADM_DEP)
 
@@ -78,22 +79,25 @@
 TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
 
 tgtimg: $(TGTIMG_OBJS)
-	$(CC) $^ -o $@
+	$(CC) $^ -o $@ $(LDFLAGS)
 
 -include $(TGTIMG_DEP)
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) $*.c -o $*.o
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $*.c -o $*.o
 	@$(CC) -MM $(CFLAGS) -MF $*.d -MT $*.o $*.c
 
 %.so: %.c
-	$(CC) -shared $(CFLAGS) $*.c -o $*.so
+	$(CC) $(CPPFLAGS) -shared $(CFLAGS) $*.c -o $*.so
 
 bs_rbd.so: bs_rbd.c
-	$(CC) -shared $(CFLAGS) bs_rbd.c -o bs_rbd.so -lrados -lrbd
+	$(CC) $(CPPFLAGS) -shared $(CFLAGS) bs_rbd.c -o bs_rbd.so \
+		-lrados -lrbd $(LDFLAGS)
 
 bs_glfs.so: bs_glfs.c
-	$(CC) -I/usr/include/glusterfs/api -shared $(CFLAGS) bs_glfs.c -o bs_glfs.so -lgfapi
+	$(CC) $(CPPFLAGS) -I/usr/include/glusterfs/api \
+		-shared $(CFLAGS) bs_glfs.c -o bs_glfs.so \
+		-lgfapi $(LDFLAGS)
 
 .PHONY: install
 install: $(PROGRAMS) $(MODULES)