Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 8d621cfd authored by Mathieu Giraud's avatar Mathieu Giraud

Makefiles: replace the remaining g++ with $(CXX)

parent d29c81d6
......@@ -72,7 +72,7 @@ cleanspaced:
$(ALIGN_CGI): cgi/align.o $(LIBCORE)
mkdir -p $(CGIDIR)
$(MAKE) -C core OPTIM="$(OPTIM)"
$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(CXXFLAGS)
$(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(CXXFLAGS)
###
debug:
......@@ -82,7 +82,7 @@ debug:
$(VIDJIL): $(BINDIR)%: %.o $(LIBCORE)
$(MAKE) -C core OPTIM="$(OPTIM)"
$(MAKE) -C lib OPTIM="$(OPTIM)"
$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(CXXFLAGS)
$(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(CXXFLAGS)
###
# Subdirectories
......@@ -110,7 +110,7 @@ cleanall: cleancoverage
$(MAKE) -C tests cleanall
forcedep:
g++ $(CXXFLAGS) -M $(MAINCORE) > dep.mk
$(CXX) $(CXXFLAGS) -M $(MAINCORE) > dep.mk
$(MAKE) -C core forcedep
$(MAKE) -C lib forcedep
......@@ -119,7 +119,7 @@ FORCE:
DEP=$(wildcard dep.mk)
ifeq (${DEP},)
$(shell g++ -M $(MAINCORE) > dep.mk)
$(shell $(CXX) -M $(MAINCORE) > dep.mk)
endif
include dep.mk
......@@ -19,11 +19,11 @@ cleancoverage:
rm -f *.gcda *.gcno *.gcov
forcedep:
g++ $(CXXFLAGS) -M $(SRCCORE) > dep.mk
$(CXX) $(CXXFLAGS) -M $(SRCCORE) > dep.mk
DEP=$(wildcard dep.mk)
ifeq (${DEP},)
$(shell g++ -M $(SRCCORE) > dep.mk)
$(shell $(CXX) -M $(SRCCORE) > dep.mk)
endif
include dep.mk
......@@ -19,11 +19,11 @@ cleancoverage:
rm -f *.gcda *.gcno *.gcov
forcedep:
g++ $(CXXFLAGS) -M $(SRCCORE) > dep.mk
$(CXX) $(CXXFLAGS) -M $(SRCCORE) > dep.mk
DEP=$(wildcard dep.mk)
ifeq (${DEP},)
$(shell g++ -M $(SRCCORE) > dep.mk)
$(shell $(CXX) -M $(SRCCORE) > dep.mk)
endif
include dep.mk
......@@ -63,7 +63,7 @@ valgrind_tests: vidjil tests
$(VALGRIND) ./tests
$(EXEC): % : %.o $(LIB)
$(CC) -o $@ $< $(LIB) $(LDLIBS) $(LDFLAGS) $(CXXFLAGS)
$(CXX) -o $@ $< $(LIB) $(LDLIBS) $(LDFLAGS) $(CXXFLAGS)
../core.a: core
......@@ -76,7 +76,7 @@ core:
$(MAKE) -C ../core
%.o: %.cpp $(OTHER_SRC)
$(CC) -o $@ $(INCLUDE) -c $< $(CXXFLAGS)
$(CXX) -o $@ $(INCLUDE) -c $< $(CXXFLAGS)
clean:
rm -f *.o $(EXEC)
......@@ -89,14 +89,14 @@ cleantests:
cleanall: clean cleancoverage cleantests
forcedep:
g++ $(INCLUDE) -M $(SRC) > dep.mk
$(CXX) $(INCLUDE) -M $(SRC) > dep.mk
force:
DEP=$(wildcard dep.mk)
ifeq (${DEP},)
$(shell g++ $(INCLUDE) -M $(SRC) > dep.mk)
$(shell $(CXX) $(INCLUDE) -M $(SRC) > dep.mk)
endif
include dep.mk
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment