Spell sig_atomic_t as std::sig_atomic_t.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 45246af158b5c6d8a48d2c295847e409629deb27..f7e2171d39aec3725b783015e9df3c56e5762d42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-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
+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,9 +75,6 @@ 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=$(PWD)/simgrid-$(patsubst loba-%,%,$@) loba