Skip to content

Commit

Permalink
Fixed compilation, CXX used instead of CC.
Browse files Browse the repository at this point in the history
  • Loading branch information
danfis committed Feb 17, 2013
1 parent d42f947 commit 7763d6f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile.include
@@ -1,4 +1,4 @@
CC ?= g++ CXX ?= g++
MOC ?= moc MOC ?= moc
POD2MAN ?= pod2man POD2MAN ?= pod2man


Expand Down
6 changes: 3 additions & 3 deletions src/Makefile
Expand Up @@ -17,12 +17,12 @@ qshowdiff: $(OBJS)
$(MAKE) -C diff $(MAKE) -C diff
$(MAKE) -C parser $(MAKE) -C parser
$(MAKE) -C qt $(MAKE) -C qt
$(CC) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS)


%.o: %.cpp %.hpp %.o: %.cpp %.hpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<
%.o: %.cpp %.o: %.cpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<




clean: clean:
Expand Down
4 changes: 2 additions & 2 deletions src/diff/Makefile
Expand Up @@ -13,9 +13,9 @@ libdiff.a: $(OBJS)
ranlib $@ ranlib $@


%.o: %.cpp %.hpp %.o: %.cpp %.hpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<
%.o: %.cpp %.o: %.cpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<


clean: clean:
rm -f $(TARGETS) rm -f $(TARGETS)
Expand Down
4 changes: 2 additions & 2 deletions src/parser/Makefile
Expand Up @@ -17,9 +17,9 @@ choose_parser.cpp: $(PARSERS)
touch choose_parser.cpp touch choose_parser.cpp


%.o: %.cpp %.hpp %.o: %.cpp %.hpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<
%.o: %.cpp %.o: %.cpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<


clean: clean:
rm -f $(TARGETS) rm -f $(TARGETS)
Expand Down
4 changes: 2 additions & 2 deletions src/qt/Makefile
Expand Up @@ -13,9 +13,9 @@ libqt.a: $(OBJS)
ranlib $@ ranlib $@


%.o: %.cpp %.hpp %.o: %.cpp %.hpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<
%.o: %.cpp %.o: %.cpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<


diff_view.cpp: diff_view.moc diff_view.cpp: diff_view.moc
diff_view.moc: diff_view.hpp diff_view.moc: diff_view.hpp
Expand Down
6 changes: 3 additions & 3 deletions tests/Makefile
Expand Up @@ -10,12 +10,12 @@ CHECK_REG=../../cu/check-regressions
all: test all: test


test: $(OBJS) test: $(OBJS)
$(CC) $(CXXCFLAGS) -o $@ main.cpp $^ $(LDFLAGS) $(CXX) $(CXXCFLAGS) -o $@ main.cpp $^ $(LDFLAGS)


%.o: %.cpp %.hpp %.o: %.cpp %.hpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<
%.o: %.cpp %.o: %.cpp
$(CC) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<


check: all check: all
@echo "" @echo ""
Expand Down

0 comments on commit 7763d6f

Please sign in to comment.