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

diff --git a/Makefile b/Makefile
index 2760531..751418c 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,31 +34,23 @@ SRC.loba := main.cpp		\
 	deployment.cpp		\
 	hostdata.cpp		\
 	$(wildcard loba_*.cpp)	\
+	messages.cpp		\
 	misc.cpp		\
+	msg_thread.cpp		\
 	neighbor.cpp		\
 	options.cpp		\
 	process.cpp		\
 	version.cpp
 
-SRC.simple_async := simple_async.cpp
-
-SRC := $(SRC.loba) $(SRC.simple_async)
+SRC := $(SRC.loba)
 OBJ := $(SRC:%.cpp=%.o)
-DEP := $(SRC:%.cpp=%.d)
+DEP := $(SRC:%.cpp=.%.d)
 
 DEFAULT_TARGETS := loba
 FLAVOURED_LOBA := loba-dev loba-stable
-TARGETS := $(DEFAULT_TARGETS)	\
-	   simple_async
-
-XML_FILES =						\
-	Dep.xml  Plat.xml				\
-	platform.xml deployment.xml simple_async.xml	\
-	cluster1000.xml
-
-XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
+TARGETS := $(DEFAULT_TARGETS)
 
-.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)
 
 all: $(DEFAULT_TARGETS)
 
@@ -69,11 +61,8 @@ full:
 	done
 	$(MAKE) xml $(DEFAULT_TARGETS)
 
-xml: $(XML_DEV_FILES)
-
 clean:
 	$(RM) core core.[0-9]* vgcore.[0-9]*
-	$(RM) misc_autogen.h
 	$(RM) localversion
 	$(RM) $(OBJ)
 	$(RM) $(DEP)
@@ -84,21 +73,14 @@ realclean: clean
 	$(RM) $(XML_DEV_FILES)
 	$(RM) *~
 
-%.d: %.cpp ; $(MAKEDEPEND.CXX)
-
-%_dev.xml: %.xml
-	sed '/DOCTYPE/s,simgrid.dtd,http://simgrid.gforge.inria.fr/&,' $< > $@
+.%.d: %.cpp ; $(MAKEDEPEND.CXX)
 
 $(FLAVOURED_LOBA):
 	$(MAKE) clean
-	$(MAKE) SIMGRID_INSTALL_DIR=./simgrid-$(patsubst loba-%,%,$@) loba
+	$(MAKE) SIMGRID_INSTALL_DIR=$(PWD)/simgrid-$(patsubst loba-%,%,$@) loba
 	mv -f -- loba $@
 	$(MAKE) clean
 
-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)))
 
 ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)