Permalink
Browse files

Fixed compilation, CXX used instead of CC.

  • Loading branch information...
danfis committed Feb 17, 2013
1 parent d42f947 commit 7763d6fdf44816885cd45de45db4a7a2828976b5
Showing with 13 additions and 13 deletions.
  1. +1 −1 Makefile.include
  2. +3 −3 src/Makefile
  3. +2 −2 src/diff/Makefile
  4. +2 −2 src/parser/Makefile
  5. +2 −2 src/qt/Makefile
  6. +3 −3 tests/Makefile
View
@@ -1,4 +1,4 @@
CC ?= g++
CXX ?= g++
MOC ?= moc
POD2MAN ?= pod2man
View
@@ -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:
View
@@ -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)
View
@@ -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)
View
@@ -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
View
@@ -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 ""

0 comments on commit 7763d6f

Please sign in to comment.