Description: Use standard compiler environment variables
Subject: Use standard compiler environment variables- CXX for g++, not CC
 - LDFLAGS for the linker
 - CXXFLAGS not CFLAGS for C++ compilation
From: Kevin Murray <spam@kdmurray.id.au>
---
 makefile | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

Index: kmc-2.3+dfsg/makefile
===================================================================
--- kmc-2.3+dfsg.orig/makefile
+++ kmc-2.3+dfsg/makefile
@@ -6,14 +6,11 @@
 KMC_DUMP_DIR = kmc_dump
 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
-
-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
+CXX      := g++
+CXXFLAGS += -Wall -O3 -fopenmp -std=c++11
+CXXFLAGS_TOOLS := $(CXXFLAGS) -Wall -O3 -fopenmp -std=c++14
+LDFLAGS  += -lm -lz -lbz2 -fopenmp -lpthread
+CPPFLAGS += -DDISABLE_ASMLIB
 
 KMC_OBJS = \
 $(KMC_MAIN_DIR)/kmer_counter.o \
@@ -54,28 +51,26 @@
 
 KMC_LIB_OBJS = $(sort $(wildcard $(KMC_API_DIR)/*.o))
 
-CFLAGS += -DDISABLE_ASMLIB
-KMC_TOOLS_CFLAGS += -DDISABLE_ASMLIB
-
 all: kmc kmc_dump kmc_tools libkmc.a
 
 $(KMC_OBJS) $(KMC_DUMP_OBJS) $(KMC_API_OBJS): %.o: %.cpp
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
 
 $(KMC_TOOLS_OBJS): %.o: %.cpp
-	$(CC) $(CPPFLAGS) $(KMC_TOOLS_CFLAGS) -c $< -o $@
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS_TOOLS) -c $< -o $@
 
 
 kmc: $(KMC_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
-	$(CC) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
+	$(CXX) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
+
 kmc_dump: $(KMC_DUMP_OBJS) $(KMC_API_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
-	$(CC) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
+	$(CXX) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
 
 kmc_tools: $(KMC_TOOLS_OBJS) $(KMC_API_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
-	$(CC) $(LDFLAGS) $(KMC_TOOLS_CLINK) -o $(KMC_BIN_DIR)/$@ $^
+	$(CXX) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
 
 libkmc.a: $(KMC_API_OBJS)
 	ar rcs $@ $^