63a55125598d99f88184730980751df9edf75fe0 markd Sun Sep 10 23:38:32 2023 -0700 used of non-standard make variables for C++ causes difficulty compiling in some environments diff --git src/optimalLeaf/makefile src/optimalLeaf/makefile index 38a28b2..0e82cb2 100644 --- src/optimalLeaf/makefile +++ src/optimalLeaf/makefile @@ -1,53 +1,53 @@ kentSrc = .. include ../inc/localEnvironment.mk include ../inc/common.mk #*********************************************************************** # File : makefile #************************************************************************ -CC= g++ +CXX= g++ SRC= Tree.cc Leaf.cc readFile.cc SimMat.cc bestArr.cc O= Tree.o Leaf.o readFile.o SimMat.o bestArr.o -CFLAGS= -g +CXXFLAGS= -g #all: ${OBJ} # ${CC} ${CFLAGS} ${OBJ} -lm -o arrange # ../lib/$(MACHTYPE)/optimalLeaf.a: $(O) $(MACHTYPE) ar rcus ../lib/$(MACHTYPE)/optimalLeaf.a $(O) $(MACHTYPE): mkdir $(MACHTYPE) Leaf.o : Leaf.cc Leaf.hh - ${CC} -c ${CFLAGS} Leaf.cc + ${CXX} -c ${CXXFLAGS} Leaf.cc Tree.o : Tree.cc Tree.hh Leaf.hh - ${CC} -c ${CFLAGS} Tree.cc + ${CXX} -c ${CXXFLAGS} Tree.cc readFile.o : readFile.cc readFile.hh - ${CC} -c ${CFLAGS} readFile.cc + ${CXX} -c ${CXXFLAGS} readFile.cc SimMat.o : SimMat.cc SimMat.hh readFile.hh - ${CC} -c ${CFLAGS} SimMat.cc + ${CXX} -c ${CXXFLAGS} SimMat.cc bestArr.o : bestArr.cc Tree.hh SimMat.hh - ${CC} -c ${CFLAGS} bestArr.cc + ${CXX} -c ${CXXFLAGS} bestArr.cc #*********************************************************************** # EOF #********************************************************************** # DO NOT DELETE