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

diff --git a/Makefile b/Makefile
index a80f025..3b5b35a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,21 @@
-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
 #DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
 
+CC := gcc
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
+#CFLAGS += -std=c99
+#CFLAGS += -fgnu89-inline      # workaround simgrid bug
+CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
+
 #CXXFLAGS += -std=c++0x
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
@@ -29,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		\
@@ -39,24 +46,35 @@ 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
 TARGETS := $(DEFAULT_TARGETS)	\
 	   simple_async
 
-.PHONY: all full clean realclean $(FLAVOURED_LOBA)
+XML_FILES =						\
+	Dep.xml  Plat.xml				\
+	platform.xml deployment.xml simple_async.xml	\
+	cluster1000.xml machines1000.xml
+
+XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
+
+.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)
 
 all: $(DEFAULT_TARGETS)
 
 full:
-	$(MAKE) $(FLAVOURED_LOBA)
-	$(MAKE) $(TARGETS)
+	@for target in $(FLAVOURED_LOBA); do	\
+		echo $(MAKE) "$$target";	\
+		$(MAKE) "$$target";		\
+	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)
@@ -64,9 +82,13 @@ clean:
 
 realclean: clean
 	$(RM) $(FLAVOURED_LOBA)
+	$(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/&,' $< > $@
 
 $(FLAVOURED_LOBA):
 	$(MAKE) clean
@@ -74,10 +96,6 @@ $(FLAVOURED_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)),)