X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/9dc2c85bc1ed02f05598db7a816552c65501cf47..23e431b77490d82e8b0db765965618180359c8cc:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 9de6a19..f7e2171 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-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
+OPTIM_FLAGS += -pipe -O3
 DEBUG_FLAGS += -g
 #DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
@@ -42,25 +42,15 @@ SRC.loba := main.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)
 
 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 machines1000.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)
 
@@ -71,8 +61,6 @@ full:
 	done
 	$(MAKE) xml $(DEFAULT_TARGETS)
 
-xml: $(XML_DEV_FILES)
-
 clean:
 	$(RM) core core.[0-9]* vgcore.[0-9]*
 	$(RM) localversion
@@ -87,12 +75,9 @@ realclean: clean
 
 .%.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=./simgrid-$(patsubst loba-%,%,$@) loba
+	$(MAKE) SIMGRID_INSTALL_DIR=$(PWD)/simgrid-$(patsubst loba-%,%,$@) loba
 	mv -f -- loba $@
 	$(MAKE) clean