A
lgorithmique
N
umérique
D
istribuée
Private GIT Repository
projects
/
loba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add statistics about convergence (see parameter -%).
[loba.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 8030fa06f8bd136cfbfdfde7ee2f86297d8a24de..59afd305661ef32ebad623058992b63083ef433e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,17
+1,22
@@
-
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
DEBUG_FLAGS += -g
#DEBUG_FLAGS += -pg
CHECK_FLAGS += -Wall -Wextra
+CC := gcc
CXX := g++
CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
CPPFLAGS += $(CHECK_FLAGS)
CXX := g++
CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
CPPFLAGS += $(CHECK_FLAGS)
-#CXXFLAGS += -std=c++0x
+#CFLAGS += -std=c99
+#CFLAGS += -fgnu89-inline # workaround simgrid bug
+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
@@
-21,7
+26,8
@@
LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
LDLIBS := -lsimgrid
MAKEDEPEND.FLAGS = $(CPPFLAGS) -MM -MG -MF $@ $<
LDLIBS := -lsimgrid
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 \
@@
-29,48
+35,59
@@
SRC.loba := main.cpp \
deployment.cpp \
hostdata.cpp \
$(wildcard loba_*.cpp) \
deployment.cpp \
hostdata.cpp \
$(wildcard loba_*.cpp) \
+ messages.cpp \
misc.cpp \
misc.cpp \
+ msg_thread.cpp \
neighbor.cpp \
options.cpp \
process.cpp \
version.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)
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)
-.PHONY: all
clean realclean
+.PHONY: all
full clean realclean $(FLAVOURED_LOBA)
-all: $(TARGETS)
+all: $(DEFAULT_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]*
clean:
$(RM) core core.[0-9]* vgcore.[0-9]*
- $(RM) misc_autogen.h
$(RM) localversion
$(RM) $(OBJ)
$(RM) $(DEP)
$(RM) $(TARGETS)
realclean: clean
$(RM) localversion
$(RM) $(OBJ)
$(RM) $(DEP)
$(RM) $(TARGETS)
realclean: clean
+ $(RM) $(FLAVOURED_LOBA)
$(RM) *~
$(RM) *~
-%.d: %.cpp ; $(MAKEDEPEND.CXX)
+.%.d: %.c ; $(MAKEDEPEND.C)
+
+.%.d: %.cpp ; $(MAKEDEPEND.CXX)
-misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
- grep -C1 '# *define *CLOG' $< \
- | sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
+$(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)))
version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
-ifneq ($(MAKECMDGOALS),clean)
- ifneq ($(MAKECMDGOALS),realclean)
- $(shell ./setlocalversion)
- -include $(DEP)
- endif
+ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)
+ $(shell ./setlocalversion)
+ -include $(DEP)
endif
.SECONDEXPANSION:
endif
.SECONDEXPANSION: