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

diff --git a/Makefile b/Makefile
index ff9ad97..3b5b35a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-SIMGRID_INSTALL_DIR ?= ./simgrid-stable
-#SIMGRID_INSTALL_DIR ?= ./simgrid-dev
+SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-stable
+#SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-dev
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
@@ -34,7 +34,9 @@ SRC.loba := main.cpp		\
 	deployment.cpp		\
 	hostdata.cpp		\
 	$(wildcard loba_*.cpp)	\
+	messages.cpp		\
 	misc.cpp		\
+	msg_thread.cpp		\
 	neighbor.cpp		\
 	options.cpp		\
 	process.cpp		\
@@ -44,7 +46,7 @@ SRC.simple_async := simple_async.cpp
 
 SRC := $(SRC.loba) $(SRC.simple_async)
 OBJ := $(SRC:%.cpp=%.o)
-DEP := $(SRC:%.cpp=%.d)
+DEP := $(SRC:%.cpp=.%.d)
 
 DEFAULT_TARGETS := loba
 FLAVOURED_LOBA := loba-dev loba-stable
@@ -54,7 +56,7 @@ TARGETS := $(DEFAULT_TARGETS)	\
 XML_FILES =						\
 	Dep.xml  Plat.xml				\
 	platform.xml deployment.xml simple_async.xml	\
-	cluster1000.xml
+	cluster1000.xml machines1000.xml
 
 XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
 
@@ -73,7 +75,6 @@ xml: $(XML_DEV_FILES)
 
 clean:
 	$(RM) core core.[0-9]* vgcore.[0-9]*
-	$(RM) misc_autogen.h
 	$(RM) localversion
 	$(RM) $(OBJ)
 	$(RM) $(DEP)
@@ -84,7 +85,7 @@ realclean: clean
 	$(RM) $(XML_DEV_FILES)
 	$(RM) *~
 
-%.d: %.cpp ; $(MAKEDEPEND.CXX)
+.%.d: %.cpp ; $(MAKEDEPEND.CXX)
 
 %_dev.xml: %.xml
 	sed '/DOCTYPE/s,simgrid.dtd,http://simgrid.gforge.inria.fr/&,' $< > $@
@@ -95,10 +96,6 @@ $(FLAVOURED_LOBA):
 	mv -f -- loba $@
 	$(MAKE) clean
 
-misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
-	grep '# *define *\(XBT_\)\?CLOG.*_XBT_LOGV' $< \
-	| sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
-
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
 ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)