From 7763d6fdf44816885cd45de45db4a7a2828976b5 Mon Sep 17 00:00:00 2001 From: Daniel Fiser Date: Sun, 17 Feb 2013 15:42:49 +0100 Subject: [PATCH] Fixed compilation, CXX used instead of CC. --- Makefile.include | 2 +- src/Makefile | 6 +++--- src/diff/Makefile | 4 ++-- src/parser/Makefile | 4 ++-- src/qt/Makefile | 4 ++-- tests/Makefile | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.include b/Makefile.include index c1f8e12..2ab2c79 100644 --- a/Makefile.include +++ b/Makefile.include @@ -1,4 +1,4 @@ -CC ?= g++ +CXX ?= g++ MOC ?= moc POD2MAN ?= pod2man diff --git a/src/Makefile b/src/Makefile index 6ba5db8..fad51ad 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,12 +17,12 @@ qshowdiff: $(OBJS) $(MAKE) -C diff $(MAKE) -C parser $(MAKE) -C qt - $(CC) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) + $(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) %.o: %.cpp %.hpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< %.o: %.cpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< clean: diff --git a/src/diff/Makefile b/src/diff/Makefile index a6e29f7..d791f29 100644 --- a/src/diff/Makefile +++ b/src/diff/Makefile @@ -13,9 +13,9 @@ libdiff.a: $(OBJS) ranlib $@ %.o: %.cpp %.hpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< %.o: %.cpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< clean: rm -f $(TARGETS) diff --git a/src/parser/Makefile b/src/parser/Makefile index fd514b7..a29c609 100644 --- a/src/parser/Makefile +++ b/src/parser/Makefile @@ -17,9 +17,9 @@ choose_parser.cpp: $(PARSERS) touch choose_parser.cpp %.o: %.cpp %.hpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< %.o: %.cpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< clean: rm -f $(TARGETS) diff --git a/src/qt/Makefile b/src/qt/Makefile index ecadf10..1244ec0 100644 --- a/src/qt/Makefile +++ b/src/qt/Makefile @@ -13,9 +13,9 @@ libqt.a: $(OBJS) ranlib $@ %.o: %.cpp %.hpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< %.o: %.cpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< diff_view.cpp: diff_view.moc diff_view.moc: diff_view.hpp diff --git a/tests/Makefile b/tests/Makefile index 7495aa6..8bf9e65 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -10,12 +10,12 @@ CHECK_REG=../../cu/check-regressions all: test test: $(OBJS) - $(CC) $(CXXCFLAGS) -o $@ main.cpp $^ $(LDFLAGS) + $(CXX) $(CXXCFLAGS) -o $@ main.cpp $^ $(LDFLAGS) %.o: %.cpp %.hpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< %.o: %.cpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(CXXFLAGS) -c -o $@ $< check: all @echo ""