Account for elapsed (wall clock) time too.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 2af8ebaafadb70507251b284ffac75470ddf5701..751418c49ef18bfe4bba1765e539b292022af971 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-stable
-#SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-dev
+#SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-stable
+SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-dev

 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g


@@ -50,14 +50,7 @@ DEFAULT_TARGETS := loba
 FLAVOURED_LOBA := loba-dev loba-stable
 TARGETS := $(DEFAULT_TARGETS)
 
 FLAVOURED_LOBA := loba-dev loba-stable
 TARGETS := $(DEFAULT_TARGETS)
 

-XML_FILES =                                            \
-       Dep.xml  Plat.xml                               \
-       platform.xml deployment.xml                     \
-       cluster1000.xml machines1000.xml
-
-XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
-
-.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)

 
 all: $(DEFAULT_TARGETS)
 
 
 all: $(DEFAULT_TARGETS)
 


@@ -68,8 +61,6 @@ full:
        done
        $(MAKE) xml $(DEFAULT_TARGETS)
 
        done
        $(MAKE) xml $(DEFAULT_TARGETS)
 

-xml: $(XML_DEV_FILES)
-

 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*
        $(RM) localversion
 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*
        $(RM) localversion


@@ -84,9 +75,6 @@ realclean: clean
 
 .%.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
        $(MAKE) SIMGRID_INSTALL_DIR=$(PWD)/simgrid-$(patsubst loba-%,%,$@) loba
 $(FLAVOURED_LOBA):
        $(MAKE) clean
        $(MAKE) SIMGRID_INSTALL_DIR=$(PWD)/simgrid-$(patsubst loba-%,%,$@) loba