switch CXX

Makefile

@@ -8,8 +8,8 @@
 
 
 
-CC=g++
-GCC=gcc
+CC=gcc
+CXX=g++
 GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always)
 CFLAGS= -Wall -DVERSION=\"$(GIT_VERSION)\" -DFAST -std=c++0x
 INCLUDE=-Isrc/lib -Isrc/bamtools/include -Isrc/bamtools/src -Isrc/ -Isrc/fastahack -Isrc/Complete-Striped-Smith-Waterman-Library/src/ -Isrc/seqan/core/include/ -Isrc/seqan/extras/include
@@ -38,22 +38,22 @@ ssw_cpp.o:
 SSW = src/Complete-Striped-Smith-Waterman-Library/src/ssw_cpp.o src/Complete-Striped-Smith-Waterman-Library/src/ssw.o
 FASTAHACK = src/fastahack/Fasta.o                                                                                                                                                                           
 buildWHAMBAM: libbamtools.a FASTA.o ssw_cpp.o
-	$(CC) $(CFLAGS) src/lib/*cpp src/bin/multi-wham-testing.cpp $(INCLUDE) $(LIBS) $(FASTAHACK) $(SSW)  -o $(OUTFOLD)WHAM-BAM $(RUNTIME)
+	$(CXX) $(CFLAGS) src/lib/*cpp src/bin/multi-wham-testing.cpp $(INCLUDE) $(LIBS) $(FASTAHACK) $(SSW)  -o $(OUTFOLD)WHAM-BAM $(RUNTIME)
 buildWHAMBAMD: libbamtools.a FASTA.o ssw_cpp.o
-	$(CC) $(CFLAGS) -g -DDEBUG src/lib/*cpp src/bin/multi-wham-testing.cpp $(INCLUDE) $(LIBS) $(FASTAHACK) $(SSW) -o $(OUTFOLD)WHAM-BAM $(RUNTIME)
+	$(CXX) $(CFLAGS) -g -DDEBUG src/lib/*cpp src/bin/multi-wham-testing.cpp $(INCLUDE) $(LIBS) $(FASTAHACK) $(SSW) -o $(OUTFOLD)WHAM-BAM $(RUNTIME)
 buildWHAMDUMPER:
-	$(CC) $(CFLAGS) -g src/lib/*cpp   src/bin/multi-wham.cpp $(INCLUDE) $(LIBS) -o $(OUTFOLD)WHAM-BAM-DUMPER $(RUNTIME)
+	$(CXX) $(CFLAGS) -g src/lib/*cpp   src/bin/multi-wham.cpp $(INCLUDE) $(LIBS) -o $(OUTFOLD)WHAM-BAM-DUMPER $(RUNTIME)
 buildWHAMBAMGENE:
-	$(CC) $(CFLAGS) -g src/lib/*cpp  src/bin/multi-wham-testing-gene.cpp  $(INCLUDE) $(LIBS) -o $(OUTFOLD)WHAM-BAM-GENE $(RUNTIME)
+	$(CXX) $(CFLAGS) -g src/lib/*cpp  src/bin/multi-wham-testing-gene.cpp  $(INCLUDE) $(LIBS) -o $(OUTFOLD)WHAM-BAM-GENE $(RUNTIME)
 whamGraph:
-	$(CC) $(CFLAGS)  -O3 src/lib/*cpp src/bin/graph-er.cpp src/lib/gauss.c $(INCLUDE) $(LIBS) $(FASTAHACK) $(SSW)  -o $(OUTFOLD)WHAM-GRAPHENING $(RUNTIME)
+	$(CXX) $(CFLAGS)  -O3 src/lib/*cpp src/bin/graph-er.cpp src/lib/gauss.c $(INCLUDE) $(LIBS) $(FASTAHACK) $(SSW)  -o $(OUTFOLD)WHAM-GRAPHENING $(RUNTIME)
 graphDebug:
-	$(CC) $(CFLAGS) -g -DDEBUG src/lib/*cpp src/bin/graph-er.cpp src/lib/gauss.c $(INCLUDE) $(LIBS) $(FASTAHACK) $(SSW)  -o $(OUTFOLD)WHAM-GRAPHENING $(RUNTIME)
+	$(CXX) $(CFLAGS) -g -DDEBUG src/lib/*cpp src/bin/graph-er.cpp src/lib/gauss.c $(INCLUDE) $(LIBS) $(FASTAHACK) $(SSW)  -o $(OUTFOLD)WHAM-GRAPHENING $(RUNTIME)
 
 buildTest:
-	$(CC) -g -I/home/zkronenb/tools/gtest-1.7.0/include/ -L/home/zkronenb/tools/gtest-1.7.0/build -
+	$(CXX) -g -I/home/zkronenb/tools/gtest-1.7.0/include/ -L/home/zkronenb/tools/gtest-1.7.0/build -
 buildMerge:
-	$(CC) $(CFLAGS) $(INCLUDE) $(LIBS) src/bin/mergeIndv.cpp src/lib/split.cpp -o $(OUTFOLD)mergeIndvs
+	$(CXX) $(CFLAGS) $(INCLUDE) $(LIBS) src/bin/mergeIndv.cpp src/lib/split.cpp -o $(OUTFOLD)mergeIndvs
 
 
 clean: