Make opt::exit_on_convergence an unsigned int.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 45246af158b5c6d8a48d2c295847e409629deb27..7ec6c5ded684d55e2da6cad41d148014d5f28ffb 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
 DEBUG_FLAGS += -g
 #DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra


@@ -16,17 +16,18 @@ CPPFLAGS += $(CHECK_FLAGS)
 #CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 #CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 

-#CXXFLAGS += -std=c++0x
+CXXFLAGS += -std=c++0x

 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 
 LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 
 LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)

-LDLIBS := -lsimgrid
+LDLIBS := -lsimgrid -lrt

 
 MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
 
 MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<

-MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.C = $(CC) $(CFLAGS) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.CXX = $(CXX) $(CXXFLAGS) $(MAKEDEPEND.FLAGS)

 
 SRC.loba := main.cpp           \
        communicator.cpp        \
 
 SRC.loba := main.cpp           \
        communicator.cpp        \


@@ -42,25 +43,15 @@ SRC.loba := main.cpp                \
        process.cpp             \
        version.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
 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)
 
 
 all: $(DEFAULT_TARGETS)
 


@@ -69,9 +60,7 @@ full:
                echo $(MAKE) "$$target";        \
                $(MAKE) "$$target";             \
        done
                echo $(MAKE) "$$target";        \
                $(MAKE) "$$target";             \
        done

-       $(MAKE) xml $(DEFAULT_TARGETS)
-
-xml: $(XML_DEV_FILES)
+       $(MAKE) $(DEFAULT_TARGETS)

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


@@ -82,13 +71,11 @@ clean:
 
 realclean: clean
        $(RM) $(FLAVOURED_LOBA)
 
 realclean: clean
        $(RM) $(FLAVOURED_LOBA)

-       $(RM) $(XML_DEV_FILES)

        $(RM) *~
 
        $(RM) *~
 

-.%.d: %.cpp ; $(MAKEDEPEND.CXX)
+.%.d: %.c ; $(MAKEDEPEND.C)

 
 

-%_dev.xml: %.xml
-       sed '/DOCTYPE/s,simgrid.dtd,http://simgrid.gforge.inria.fr/&,' $< > $@
+.%.d: %.cpp ; $(MAKEDEPEND.CXX)

 
 $(FLAVOURED_LOBA):
        $(MAKE) clean
 
 $(FLAVOURED_LOBA):
        $(MAKE) clean