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

diff --git a/Makefile b/Makefile
index 8f484f1..d206ab4 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
@@ -23,16 +24,17 @@ LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 LINK.o = $(CXX) $(LDFLAGS) $(TARGET_ARCH)
 LDLIBS := -lsimgrid
 
-MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MF $@ $<
+MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
 MAKEDEPEND.C = $(CC) $(MAKEDEPEND.FLAGS)
 MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
-LOCALVERSION := localversion
-SETLOCALVERSION := ./setlocalversion
-
 SRC.loba := main.cpp		\
 	communicator.cpp	\
 	cost_func.cpp		\
+	deployment.cpp		\
+	hostdata.cpp		\
+	$(wildcard loba_*.cpp)	\
+	misc.cpp		\
 	neighbor.cpp		\
 	options.cpp		\
 	process.cpp		\
@@ -46,15 +48,14 @@ DEP := $(SRC:%.cpp=%.d)
 
 TARGETS := loba simple_async
 
-$(shell $(SETLOCALVERSION))
-
-.PHONY: all depend clean
+.PHONY: all clean realclean
 
 all: $(TARGETS)
 
 clean:
 	$(RM) core core.[0-9]* vgcore.[0-9]*
-	$(RM) $(LOCALVERSION)
+	$(RM) misc_autogen.h
+	$(RM) localversion
 	$(RM) $(OBJ)
 	$(RM) $(DEP)
 	$(RM) $(TARGETS)
@@ -65,9 +66,18 @@ realclean: clean
 %.d: %.c ; $(MAKEDEPEND.C)
 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 
+misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
+	grep -C1 '# *define *CLOG' $< \
+	| sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
+
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
--include $(DEP)
+ifneq ($(MAKECMDGOALS),clean)
+  ifneq ($(MAKECMDGOALS),realclean)
+    $(shell ./setlocalversion)
+    -include $(DEP)
+  endif
+endif
 
 .SECONDEXPANSION:
 $(TARGETS): $$(patsubst %.cpp,%.o,$$(SRC.$$@))