Add load balancing algorithm selection facility.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 8f484f11a9f4753577a49a65b314ad8ead48dff1..2ab9e7bee0393c381fbc4a02d3e0842ea03d6608 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-SIMGRID_INSTALL_DIR := ./simgrid-3.5-install
-#SIMGRID_INSTALL_DIR := ../simgrid-git-install
+SIMGRID_INSTALL_DIR := ./simgrid-stable
+#SIMGRID_INSTALL_DIR := ./simgrid-dev

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


@@ -12,9 +12,10 @@ CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
 CFLAGS += -std=c99
 CPPFLAGS += $(CHECK_FLAGS)
 
 CFLAGS += -std=c99

-CFLAGS += -fgnu89-inline       # workaround simgrid bug
+#CFLAGS += -fgnu89-inline      # workaround simgrid bug

 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 

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

 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib


@@ -33,6 +34,10 @@ SETLOCALVERSION := ./setlocalversion
 SRC.loba := main.cpp           \
        communicator.cpp        \
        cost_func.cpp           \
 SRC.loba := main.cpp           \
        communicator.cpp        \
        cost_func.cpp           \

+       deployment.cpp          \
+       hostdata.cpp            \
+       $(wildcard loba_*.cpp)  \
+       misc.cpp                \

        neighbor.cpp            \
        options.cpp             \
        process.cpp             \
        neighbor.cpp            \
        options.cpp             \
        process.cpp             \


@@ -48,7 +53,7 @@ TARGETS := loba simple_async
 
 $(shell $(SETLOCALVERSION))
 
 
 $(shell $(SETLOCALVERSION))
 

-.PHONY: all depend clean
+.PHONY: all clean realclean

 
 all: $(TARGETS)
 
 
 all: $(TARGETS)
 


@@ -67,7 +72,11 @@ realclean: clean
 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 

+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),realclean)

 -include $(DEP)
 -include $(DEP)

+endif
+endif

 
 .SECONDEXPANSION:
 $(TARGETS): $$(patsubst %.cpp,%.o,$$(SRC.$$@))
 
 .SECONDEXPANSION:
 $(TARGETS): $$(patsubst %.cpp,%.o,$$(SRC.$$@))