X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/97a4b4dbf628a627e3c2d5689be89265f56074df..afd307b9711af19f9053bad1aec0b8e60c3ea467:/Makefile

diff --git a/Makefile b/Makefile
index c5202cf..dc2d3b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,26 @@
-SIMGRID_INSTALL_DIR := ./simgrid-stable
-#SIMGRID_INSTALL_DIR := ./simgrid-dev
+SIMGRID_INSTALL_DIR ?= ./simgrid-stable
+#SIMGRID_INSTALL_DIR ?= ./simgrid-dev
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
+#DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
 
-CC := gcc
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
-CFLAGS += -std=c99
-#CFLAGS += -fgnu89-inline	# workaround simgrid bug
-CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
-
 #CXXFLAGS += -std=c++0x
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 
-LINK.o = $(CXX) $(LDFLAGS) $(TARGET_ARCH)
+LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
 LDLIBS := -lsimgrid
 
-MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MF $@ $<
-MAKEDEPEND.C = $(CC) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
 MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
 SRC.loba := main.cpp		\
@@ -63,7 +58,6 @@ clean:
 realclean: clean
 	$(RM) *~
 
-%.d: %.c ; $(MAKEDEPEND.C)
 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 
 misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h