X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/c771a55e40d2a41d607a0da1b67cd1f7d546ccc8..4b258b0acb4f4f43d99a3eba7fd38ba40460b96d:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 0f52ab6..2ab9e7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-SIMGRID_INSTALL_DIR := ./simgrid-3.5-install
-#SIMGRID_INSTALL_DIR := ../simgrid-git-install
+SIMGRID_INSTALL_DIR := ./simgrid-stable
+#SIMGRID_INSTALL_DIR := ./simgrid-dev
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
@@ -12,9 +12,10 @@ CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
 CFLAGS += -std=c99
-CFLAGS += -fgnu89-inline	# workaround simgrid bug
+#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
@@ -33,7 +34,9 @@ SETLOCALVERSION := ./setlocalversion
 SRC.loba := main.cpp		\
 	communicator.cpp	\
 	cost_func.cpp		\
+	deployment.cpp		\
 	hostdata.cpp		\
+	$(wildcard loba_*.cpp)	\
 	misc.cpp		\
 	neighbor.cpp		\
 	options.cpp		\
@@ -50,7 +53,7 @@ TARGETS := loba simple_async
 
 $(shell $(SETLOCALVERSION))
 
-.PHONY: all depend clean
+.PHONY: all clean realclean
 
 all: $(TARGETS)
 
@@ -69,7 +72,11 @@ realclean: clean
 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),realclean)
 -include $(DEP)
+endif
+endif
 
 .SECONDEXPANSION:
 $(TARGETS): $$(patsubst %.cpp,%.o,$$(SRC.$$@))