From 29153409ed1ca86261f5d1084a0503e3291f3628 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 30 Jan 2014 15:43:29 +0000 Subject: Updated Makefile, I used g++ instead of ${CXX} in several places. --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 160e6c4..ff80fb2 100644 --- a/Makefile +++ b/Makefile @@ -64,42 +64,42 @@ tools: ${TOOLS} ${TOOLS}: %: src/tools/%.cpp libbu++.a $(filter-out viewcsv bin2cpp,${TOOLS}): - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ viewcsv: - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lncurses + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lncurses bin2cpp: - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 -lz -llzma + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 -lz -llzma myriad: - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread ${OBJECTS}: %.o: %.cpp - g++ -ggdb -W -Wall -I. ${CXXFLAGS} $< -c -o $@ + ${CXX} -ggdb -W -Wall -I. ${CXXFLAGS} $< -c -o $@ $(patsubst %,src/%.cpp,${UNITS}): %.cpp: %.unit mkunit ./mkunit $< $@ ${UNITS}: %: src/%.cpp - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ ${TESTS}: %: src/%.cpp $(filter-out tests/bzip2 tests/deflate tests/lzma,${TESTS}): - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ tests/bzip2: - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 tests/deflate: - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lz + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lz tests/lzma: - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -llzma + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -llzma tests/threadid: - g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread + ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread libbu++.a: bu ${HEADERS} ${OBJECTS} ar -r libbu++.a ${OBJECTS} -- cgit v1.2.3