Description: Hardening
Subject: hardening
From: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
---
 makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/makefile
+++ b/makefile
@@ -7,13 +7,13 @@
 KMC_TOOLS_DIR = kmc_tools
 
 CC 	= g++
-CFLAGS	= -Wall -O3 -m64 -static -fopenmp -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11 
-CLINK	= -lm -static -fopenmp -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11 
+CFLAGS	= -Wall -O3 -m64 -static -fopenmp -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
+CLINK	= -lm -static -fopenmp -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
 
 KMC_TOOLS_CFLAGS	= -Wall -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14
 KMC_TOOLS_CLINK	= -lm -static -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14
 
-DISABLE_ASMLIB = true 
+DISABLE_ASMLIB = true
 
 KMC_OBJS = \
 $(KMC_MAIN_DIR)/kmer_counter.o \
@@ -33,7 +33,7 @@
 KMC_DUMP_OBJS = \
 $(KMC_DUMP_DIR)/nc_utils.o \
 $(KMC_API_DIR)/mmer.o \
-$(KMC_DUMP_DIR)/kmc_dump.o 
+$(KMC_DUMP_DIR)/kmc_dump.o
 
 KMC_API_OBJS = \
 $(KMC_API_DIR)/mmer.o \
@@ -56,23 +56,23 @@
 KMC_TOOLS_CFLAGS += -DDISABLE_ASMLIB
 
 $(KMC_OBJS) $(KMC_DUMP_OBJS) $(KMC_API_OBJS): %.o: %.cpp
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 $(KMC_TOOLS_OBJS): %.o: %.cpp
-	$(CC) $(KMC_TOOLS_CFLAGS) -c $< -o $@
+	$(CC) $(CPPFLAGS) $(KMC_TOOLS_CFLAGS) -c $< -o $@
+
 
-	
 kmc: $(KMC_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
-	$(CC) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
+	$(CC) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
 kmc_dump: $(KMC_DUMP_OBJS) $(KMC_API_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
-	$(CC) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
-	
+	$(CC) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
+
 kmc_tools: $(KMC_TOOLS_OBJS) $(KMC_API_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
-	$(CC) $(KMC_TOOLS_CLINK) -o $(KMC_BIN_DIR)/$@ $^ 
-	
+	$(CC) $(LDFLAGS) $(KMC_TOOLS_CLINK) -o $(KMC_BIN_DIR)/$@ $^
+
 clean:
 	-rm $(KMC_MAIN_DIR)/*.o
 	-rm $(KMC_API_DIR)/*.o
