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

diff --git a/Makefile b/Makefile
index 0653492..2ab9e7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-SIMGRID_INSTALL_DIR := ./simgrid-3.5-install
+SIMGRID_INSTALL_DIR := ./simgrid-stable
+#SIMGRID_INSTALL_DIR := ./simgrid-dev
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
@@ -11,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
@@ -22,15 +24,22 @@ LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 LINK.o = $(CXX) $(LDFLAGS) $(TARGET_ARCH)
 LDLIBS := -lsimgrid
 
-MAKEDEPEND.C = $(CC) $(CPPFLAGS) -MM -MF $@ $<
-MAKEDEPEND.CXX = $(CXX) $(CPPFLAGS) -MM -MF $@ $<
+MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MF $@ $<
+MAKEDEPEND.C = $(CC) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
 LOCALVERSION := localversion
 SETLOCALVERSION := ./setlocalversion
 
 SRC.loba := main.cpp		\
 	communicator.cpp	\
-	parameters.cpp		\
+	cost_func.cpp		\
+	deployment.cpp		\
+	hostdata.cpp		\
+	$(wildcard loba_*.cpp)	\
+	misc.cpp		\
+	neighbor.cpp		\
+	options.cpp		\
 	process.cpp		\
 	version.cpp
 
@@ -44,7 +53,7 @@ TARGETS := loba simple_async
 
 $(shell $(SETLOCALVERSION))
 
-.PHONY: all depend clean
+.PHONY: all clean realclean
 
 all: $(TARGETS)
 
@@ -63,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.$$@))