xbt_cond_timedwait has changed and doesn't throw exception anymore.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 0653492a4f039767de8d0dce83be1e008b8db2e7..a30e931cf5d83af473a8a89ea497e82bf490ba45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
-SIMGRID_INSTALL_DIR := ./simgrid-3.5-install
+#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
 
 CC := gcc
@@ -10,60 +12,83 @@ CXX := g++
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
-CFLAGS += -std=c99
-CFLAGS += -fgnu89-inline       # workaround simgrid bug
+#CFLAGS += -std=c99
+#CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
+CXXFLAGS += -std=c++11
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 
-LINK.o = $(CXX) $(LDFLAGS) $(TARGET_ARCH)
-LDLIBS := -lsimgrid
+LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
+LDLIBS := -lsimgrid -lrt
 
-MAKEDEPEND.C = $(CC) $(CPPFLAGS) -MM -MF $@ $<
-MAKEDEPEND.CXX = $(CXX) $(CPPFLAGS) -MM -MF $@ $<
-
-LOCALVERSION := localversion
-SETLOCALVERSION := ./setlocalversion
+MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
+MAKEDEPEND.C = $(CC) $(CFLAGS) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.CXX = $(CXX) $(CXXFLAGS) $(MAKEDEPEND.FLAGS)
 
 SRC.loba := main.cpp           \
        communicator.cpp        \
-       parameters.cpp          \
+       cost_func.cpp           \
+       deployment.cpp          \
+       hostdata.cpp            \
+       $(wildcard loba_*.cpp)  \
+       messages.cpp            \
+       misc.cpp                \
+       msg_thread.cpp          \
+       neighbor.cpp            \
+       options.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)
+DEP := $(SRC:%.cpp=.%.d)
 
-TARGETS := loba simple_async
+DEFAULT_TARGETS := loba
+FLAVOURED_LOBA := loba-dev loba-stable
+TARGETS := $(DEFAULT_TARGETS)
 
-$(shell $(SETLOCALVERSION))
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)
 
-.PHONY: all depend clean
+all: $(DEFAULT_TARGETS)
 
-all: $(TARGETS)
+full:
+       @for target in $(FLAVOURED_LOBA); do    \
+               echo $(MAKE) "$$target";        \
+               $(MAKE) "$$target";             \
+       done
+       $(MAKE) $(DEFAULT_TARGETS)
 
 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*
-       $(RM) $(LOCALVERSION)
+       $(RM) localversion
        $(RM) $(OBJ)
        $(RM) $(DEP)
        $(RM) $(TARGETS)
 
 realclean: clean
+       $(RM) $(FLAVOURED_LOBA)
        $(RM) *~
 
-%.d: %.c ; $(MAKEDEPEND.C)
-%.d: %.cpp ; $(MAKEDEPEND.CXX)
+.%.d: %.c ; $(MAKEDEPEND.C)
+
+.%.d: %.cpp ; $(MAKEDEPEND.CXX)
+
+$(FLAVOURED_LOBA):
+       $(MAKE) clean
+       $(MAKE) SIMGRID_INSTALL_DIR=$(PWD)/simgrid-$(patsubst loba-%,%,$@) loba
+       mv -f -- loba $@
+       $(MAKE) clean
 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
--include $(DEP)
+ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)
+  $(shell ./setlocalversion)
+  -include $(DEP)
+endif
 
 .SECONDEXPANSION:
 $(TARGETS): $$(patsubst %.cpp,%.o,$$(SRC.$$@))