Fixing missing bin in lib_graphd, starting to address CC versus CXX f…

…or issue GH-3, added dependency for treed library on MADNESS due to container usage in bigint

Makefile

@@ -38,12 +38,12 @@ graph:
 	$(MAKE) ;\
 	$(CD) ..;)
 
-tree:
+tree: deps
 	@($(CD) $(TREE);\
 	$(MAKE) ;\
 	$(CD) ..;)
 
-ptree:
+ptree: 
 	@($(CD) $(PTREE);\
 	$(MAKE) ;\
 	$(CD) ..;)
@@ -134,7 +134,7 @@ clean:
 		$(MAKE) clean;\
 		$(CD) ..; \
 	done );
-	find . -name '*~' | xargs rm -f
+	find . -name '*~' -print0 | xargs -0 rm -f
 
 cleandeps: cleanmad
 

lib_branchd/Makefile

@@ -1,5 +1,5 @@
-CC=g++
-CCC=gcc
+CXX=g++
+CXXC=gcc
 CFLAGS= -Wall -O3 -DHAS_GOBLIN -g 
 VALGRIND_FLAGS= -O0 -g
 PFLAGS= -O3 -pg
@@ -78,15 +78,15 @@ OBJS=$(SRCS:.cpp=.o)
 all: #$(OBJS)
 	$(error	This code is deprecated, and incompatible with the current lib_graphd. It was written using a previous version of the graph decomposition library. Most functionality should be re-attainable, but new GraphEOUtil classes, etc need to be incorporated into the code) 
 	gcc ./src/pathfinder.c ./src/paths.c -I./inc -o bin/pathfinder
-	$(CC) $(CFLAGS) $(INC_DIR) $(BDTEST_SRC) $(OBJS) -L$(ARPACK_LIBDIR) -L$(GOBLIN_DIR) $(LIB_DIR) $(LIBS) -lgoblin -larpack_x86_64 -lgfortran   -o $(BDTEST_EXE)
-	$(CC) $(CFLAGS) $(INC_DIR) $(GEN_BD_SPLIT_SRC) $(OBJS) -L$(ARPACK_LIBDIR) -L$(GOBLIN_DIR) $(LIB_DIR) $(LIBS) -lgoblin -larpack_x86_64 -lgfortran  -o $(GEN_BD_SPLIT_EXE)
-	$(CC) $(CFLAGS) $(INC_DIR) $(GEN_BD_SPAWN_SRC) $(OBJS) -L$(ARPACK_LIBDIR) -L$(GOBLIN_DIR) $(LIB_DIR) $(LIBS) -lgoblin -larpack_x86_64 -lgfortran  -o $(GEN_BD_SPAWN_EXE)
+	$(CXX) $(CFLAGS) $(INC_DIR) $(BDTEST_SRC) $(OBJS) -L$(ARPACK_LIBDIR) -L$(GOBLIN_DIR) $(LIB_DIR) $(LIBS) -lgoblin -larpack_x86_64 -lgfortran   -o $(BDTEST_EXE)
+	$(CXX) $(CFLAGS) $(INC_DIR) $(GEN_BD_SPLIT_SRC) $(OBJS) -L$(ARPACK_LIBDIR) -L$(GOBLIN_DIR) $(LIB_DIR) $(LIBS) -lgoblin -larpack_x86_64 -lgfortran  -o $(GEN_BD_SPLIT_EXE)
+	$(CXX) $(CFLAGS) $(INC_DIR) $(GEN_BD_SPAWN_SRC) $(OBJS) -L$(ARPACK_LIBDIR) -L$(GOBLIN_DIR) $(LIB_DIR) $(LIBS) -lgoblin -larpack_x86_64 -lgfortran  -o $(GEN_BD_SPAWN_EXE)
 
 
 .cpp.o  :
-	$(CC) -c $(CFLAGS) $(INC_DIR) $< -o $@
+	$(CXX) -c $(CFLAGS) $(INC_DIR) $< -o $@
 .c.o	:	
-	$(CCC) -c $(CFLAGS) $(INC_DIR) $< -o $@
+	$(CXXC) -c $(CFLAGS) $(INC_DIR) $< -o $@
 
 docs: $(DOXYFILE)
 	doxygen $(DOXYFILE)

lib_graphd/src/Makefile

@@ -37,11 +37,12 @@ endif
 
 all: $(INDDGO_LIB)/$(LIBNAME)  $(GVIZ)
 
+#This is a problem if they're not using gcc 
 %.o: $(METIS_PROG_DIR)/%.c
-	gcc $(INCLUDES) $(CFLAGS) -U__GNUC__ -c $< 
+	$(CC) $(INCLUDES) $(CFLAGS) -U__GNUC__ -c $< 
 
 .cpp.o:
-	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $< 	
+	$(CXX) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $< 	
 
 $(INDDGO_LIB)/$(LIBNAME): $(OBJ) $(POBJ)
 	ar -rv $(INDDGO_LIB)/$(LIBNAME) $^
@@ -52,7 +53,7 @@ locallib: $(INDDGO_LIB)/$(LIBNAME)
 
 
 $(GVIZ): gviz.cpp
-	$(CC) -I../inc $(CFLAGS) $< -o $@ $(INCLUDES) $(LIBS) -L$(INDDGO_LIB) -lgraphd
+	$(CXX) -I../inc $(CFLAGS) $< -o $@ $(INCLUDES) $(LIBS) -L$(INDDGO_LIB) -lgraphd
 
 clean:
 	rm -f *.o \#* PI* ${EXECUTABLES} core *~ $(OBJ) $(OUT) $(INDDGO_LIB)/$(LIBNAME) ../lib/$(LIBNAME) $(GVIZ)

lib_graphd/test/Makefile

@@ -22,7 +22,7 @@ include ../../make.inc
 
 #-----Macros---------------------------------
 # set up compiler and options
-#CC = g++
+#CXX = g++
 #-----------------------------------------------------------------------------
 # To build the test library
 
@@ -55,67 +55,67 @@ ifeq ($(HAS_GTEST), 1)
 all : ${EXECUTABLES}
 
 .cpp.o:
-	$(CC) $(INCLUDES) $(CFLAGS) -c $<
+	$(CXX) $(INCLUDES) $(CFLAGS) -c $<
 
 testDimacsReader: DIMACSReaderTest.o 
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testGraphReader: GraphReaderTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testGraphCreatorFile: GraphCreatorFileTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testGraphReaderWriterFactory: GraphReaderWriterFactoryTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testGraph: GraphTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 testWeightedGraph: WeightedGraphTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testMutableGraph: MutableGraphTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testWeightedMutableGraph: WeightedMutableGraphTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testAdjMatrixGraphWriter: AdjMatrixGraphWriterTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testAdjMatrixGraphReader: AdjMatrixGraphReaderTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testDIMACSGraphWriter: DIMACSGraphWriterTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testGraphVizGraphWriter: GraphVizGraphWriterTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testGraphProperty: GraphPropertyTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testGraphUtil: GraphUtilTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testGraphEOUtil: GraphEOUtilTest.o
-	${CC} ${LFLAGS} -o bin/$@ $< $(LIBGRAPHDECOMP) $(PARMETISOBJ)  ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@ $< $(LIBGRAPHDECOMP) $(PARMETISOBJ)  ${INCLUDES} $(LIB) $(LIBDIR)
 
 testMetisGraphWriter: MetisGraphWriterTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testMetisGraphReader: MetisGraphReaderTest.o
-	${CC} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@   $(LIBGRAPHDECOMP) $< ${INCLUDES} $(LIB) $(LIBDIR)
 
 testParMetis: ParmetisTest.o 
-	${CC} ${LFLAGS} -o bin/$@ $^ $(LIBGRAPHDECOMP) $(PARMETISOBJ) ${INCLUDES} $(LIB) $(LIBDIR)
+	${CXX} ${LFLAGS} -o bin/$@ $^ $(LIBGRAPHDECOMP) $(PARMETISOBJ) ${INCLUDES} $(LIB) $(LIBDIR)
 #---- no change below this line--------------------------------------------------
 
 gtest-all.o: ${GTEST_DIR}/src/gtest-all.cc
-	$(CC) -c $< $(CXXFLAGS)	
+	$(CXX) -c $< $(CXXFLAGS)	
 
 gtest_main.o: ${GTEST_DIR}/src/gtest_main.cc
-	$(CC) -c $< $(CXXFLAGS)	
+	$(CXX) -c $< $(CXXFLAGS)	
 
 $(LIBGTEST): gtest-all.o gtest_main.o
 	ar -rv ../lib/$(LIBGTEST) $^

lib_ptreed/Makefile

@@ -14,7 +14,7 @@ OBJS = $(SRCS:.cpp=.o)
 all: $(INDDGO_LIB)/$(PTD_LIB_NAME)
 
 .cpp.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR)  $< -o $@
+	$(CXX) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR)  $< -o $@
 
 $(INDDGO_LIB)/$(PTD_LIB_NAME): $(OBJS) 
 	$(AR) $(ARFLAGS) $@ $(OBJS) 

lib_treed/Makefile

@@ -22,7 +22,7 @@ OBJS=$(SRCS:.cpp=.o)
 all: $(INDDGO_LIB)/$(TD_LIB_NAME)
 
 .cpp.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR)  $< -o $@
+	$(CXX) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR)  $< -o $@
 
 # The "normal" TD library
 $(INDDGO_LIB)/$(TD_LIB_NAME): $(OBJS) $(PARMETISOBJ)
@@ -34,13 +34,13 @@ locallib: $(INDDGO_LIB)/$(TD_LIB_NAME)
 
 # The profiled library
 td_profiled: $(OBJS) $(PARMETISOBJ)
-	$(CC) -c $(PFLAGS) $(INC_DIR) $(LIB_DIR) $(SRCS)
+	$(CXX) -c $(PFLAGS) $(INC_DIR) $(LIB_DIR) $(SRCS)
 	$(AR) $(ARFLAGS) $(TD_PROF_LIB) $(OBJS) $(PARMETISOBJ)
 	ranlib $(TD_PROF_LIB)
 
 # The valgrind-prepared library
 td_valgrind: $(OBJS) $(PARMETISOBJ)
-	$(CC) -c $(VALGRIND_FLAGS) $(INC_DIR) $(LIB_DIR) $(SRCS)
+	$(CXX) -c $(VALGRIND_FLAGS) $(INC_DIR) $(LIB_DIR) $(SRCS)
 	$(AR) $(ARFLAGS) $(TD_VALGRIND_LIB) $(OBJS) $(PARMETISOBJ)
 	ranlib $(TD_VALGRIND_LIB)
 

lib_treed/test/Makefile

@@ -20,7 +20,7 @@
 include ../../make.inc
 #-----Macros---------------------------------
 # set up compiler and options
-#CC = g++
+#CXX = g++
 #-----------------------------------------------------------------------------
 # To build the test library
 
@@ -42,21 +42,21 @@ SRC=TDTreeTest.cpp $(WIS)/src/weighted_ind_set.cpp
 all : ${EXECUTABLES}
 
 %.o : $(WIS)/src/%.cpp 
-	$(CC) $(INC_DIR) $(CFLAGS) -c $<
+	$(CXX) $(INC_DIR) $(CFLAGS) -c $<
 
 .cpp.o:
-	$(CC) $(INC_DIR) $(CFLAGS) -c $<
+	$(CXX) $(INC_DIR) $(CFLAGS) -c $<
 
 testTDTree: TDTreeTest.o $(WIS)/src/weighted_ind_set.o
-	${CC} ${LFLAGS} -o bin/$@ $^ ${INC_DIR} $(LIBS) $(LIB_DIR)
+	${CXX} ${LFLAGS} -o bin/$@ $^ ${INC_DIR} $(LIBS) $(LIB_DIR)
 
 #---- no change below this line--------------------------------------------------
 CXXFLAGS = $(INC_DIR) -O3
 gtest-all.o: ${GTEST_DIR}/src/gtest-all.cc
-	$(CC) -c $< $(CXXFLAGS)	
+	$(CXX) -c $< $(CXXFLAGS)	
 
 gtest_main.o: ${GTEST_DIR}/src/gtest_main.cc
-	$(CC) -c $< $(CXXFLAGS)	
+	$(CXX) -c $< $(CXXFLAGS)	
 
 $(LIBGTEST): gtest-all.o gtest_main.o
 	ar -rv ./lib/$(LIBGTEST) $^

make.inc.parallel

@@ -64,7 +64,8 @@ GTEST_DIR=
 # Compilers, Flags and System Tools
 #
 
-CC     = g++
+CC	= gcc
+CXX     = g++
 CFLAGS = -O3
 CPPFLAGS = -std=c++0x 
 LDFLAGS = 
@@ -74,17 +75,17 @@ CFLAGS := $(CFLAGS) -D__LOG_ENABLE__
 endif
 
 ifeq ($(HAS_MADNESS),1)
-CC     = mpicxx
+CXX     = mpicxx
 CFLAGS := $(CFLAGS) -D__MADNESS__ -std=c++0x -Wno-strict-aliasing -Wno-deprecated -ffast-math -march=native
 endif
 
 ifeq ($(IS_PARALLEL),1)
-CC     = mpicxx
+CXX     = mpicxx
 CFLAGS := $(CFLAGS) -D__PARALLEL__ -D__OPENMP__ -fopenmp
 endif
 
 ifeq ($(HAS_PARMETIS),1)
-CC     = mpicxx
+CXX     = mpicxx
 endif
 
 FC      = gfortran

make.inc.serial

@@ -65,7 +65,8 @@ GTEST_DIR=
 # Compilers, Flags and System Tools
 #
 
-CC     = g++
+CC	= gcc
+CXX     = g++
 CFLAGS = -O3
 CPPFLAGS = -std=c++0x 
 LDFLAGS = 
@@ -75,17 +76,17 @@ CFLAGS := $(CFLAGS) -D__LOG_ENABLE__
 endif
 
 ifeq ($(HAS_MADNESS),1)
-CC     = mpicxx
+CXX     = mpicxx
 CFLAGS := $(CFLAGS) -D__MADNESS__ -std=c++0x -Wno-strict-aliasing -Wno-deprecated -ffast-math -march=native
 endif
 
 ifeq ($(IS_PARALLEL),1)
-CC     = mpicxx
+CXX     = mpicxx
 CFLAGS := $(CFLAGS) -D__PARALLEL__ -D__OPENMP__ -fopenmp
 endif
 
 ifeq ($(HAS_PARMETIS),1)
-CC     = mpicxx
+CXX     = mpicxx
 endif
 
 FC      = gfortran

max_wis/Makefile

@@ -57,27 +57,27 @@ endif
 all: $(ALL)
 
 .cpp.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR) $< -o $@
+	$(CXX) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR) $< -o $@
 
 # Binaries
 
 $(WEIGHTED_IND_SET_EXE): $(SHAREDOBJ) 
-	$(CC) $(CFLAGS) $(WEIGHTED_IND_SET_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -o $(WEIGHTED_IND_SET_EXE)
+	$(CXX) $(CFLAGS) $(WEIGHTED_IND_SET_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -o $(WEIGHTED_IND_SET_EXE)
 
 val_wis: $(SHAREDOBJ)  #depends on valgrind TD library having been prepared 
-	$(CC) $(VALGRIND_FLAGS) $(WEIGHTED_IND_SET_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) -lvaltd -lm -lgd $(LIBS) -o $(VAL_WEIGHTED_IND_SET_EXE)
+	$(CXX) $(VALGRIND_FLAGS) $(WEIGHTED_IND_SET_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) -lvaltd -lm -lgd $(LIBS) -o $(VAL_WEIGHTED_IND_SET_EXE)
 
 $(MAD_WIS_EXE): $(SHAREDOBJ) $(MAD_WIS_SRC)
-	$(CC) $(CFLAGS) $(MAD_WIS_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -lptreed -o $(MAD_WIS_EXE)
+	$(CXX) $(CFLAGS) $(MAD_WIS_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -lptreed -o $(MAD_WIS_EXE)
 
 parmetiseo:
-	$(CC) $(CFLAGS) $(PARMETIS_EO_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -o $(PARMETIS_EO_EXE)
+	$(CXX) $(CFLAGS) $(PARMETIS_EO_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -o $(PARMETIS_EO_EXE)
 
 pgavril: $(SHAREDOBJ)
-	$(CC) $(CFLAGS) $(PGAVRIL_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -lptreed -o $(PGAVRIL_EXE)
+	$(CXX) $(CFLAGS) $(PGAVRIL_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -lptreed -o $(PGAVRIL_EXE)
 
 parallel_wis: $(SHAREDOBJ)
-	$(CC) $(CFLAGS) $(PARALLEL_WIS_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -o $(PARALLEL_WIS_EXE)
+	$(CXX) $(CFLAGS) $(PARALLEL_WIS_SRC) $(SHAREDOBJ) $(INC_DIR) $(LIB_DIR) $(LIBS) -o $(PARALLEL_WIS_EXE)
 clean:
 	-rm -rf $(OBJS)
 	-rm -rf $(EXES)

util/Makefile

@@ -13,10 +13,10 @@ PKT_EXE = $(INDDGO_BIN)/gen_pkt
 all: $(PKT_EXE)
 
 .cpp.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR)  $< -o $@
+	$(CXX) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR)  $< -o $@
 
 $(PKT_EXE): $(PKT_OBJ) 
-	$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(INC_DIR) $(LIB_DIR) $(LIBS) -o $@ 
+	$(CXX) $(CPPFLAGS) $(CFLAGS) $^ $(INC_DIR) $(LIB_DIR) $(LIBS) -o $@ 
 
 clean: 
-	-rm -rf $(PKT_OBJ)
+	-rm -rf $(PKT_OBJ) $(PKT_EXE)

viz/Makefile

@@ -14,10 +14,10 @@ VIZ_OBJ=$(VIZ_SRC:.cpp=.o)
 all: $(VIZ_EXE)
 
 .cpp.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR)  $< -o $@
+	$(CXX) $(CPPFLAGS) $(CFLAGS) -c $(INC_DIR)  $< -o $@
 
 $(VIZ_EXE): $(VIZ_OBJ)
-	$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(INC_DIR) $(LIB_DIR) $(LIBS) -o $(VIZ_EXE)
+	$(CXX) $(CPPFLAGS) $(CFLAGS) $^ $(INC_DIR) $(LIB_DIR) $(LIBS) -o $(VIZ_EXE)
 
 clean: 
 	-rm -rf $(VIZ_OBJ)