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
Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba
[loba.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index a4ccf170f78059dc61db066acae0dfc79099e334..5b0d491b840b1293a4a0501b44d0bf4d0539a6b7 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
-
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
@@
-16,7
+16,7
@@
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
CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
@@
-26,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 \
@@
-34,31
+35,23
@@
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)
DEFAULT_TARGETS := loba
FLAVOURED_LOBA := loba-dev loba-stable
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
+TARGETS := $(DEFAULT_TARGETS)
-XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
-
-.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)
all: $(DEFAULT_TARGETS)
all: $(DEFAULT_TARGETS)
@@
-69,8
+62,6
@@
full:
done
$(MAKE) xml $(DEFAULT_TARGETS)
done
$(MAKE) xml $(DEFAULT_TARGETS)
-xml: $(XML_DEV_FILES)
-
clean:
$(RM) core core.[0-9]* vgcore.[0-9]*
$(RM) localversion
clean:
$(RM) core core.[0-9]* vgcore.[0-9]*
$(RM) localversion
@@
-83,14
+74,13
@@
realclean: clean
$(RM) $(XML_DEV_FILES)
$(RM) *~
$(RM) $(XML_DEV_FILES)
$(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
- $(MAKE) SIMGRID_INSTALL_DIR=
.
/simgrid-$(patsubst loba-%,%,$@) loba
+ $(MAKE) SIMGRID_INSTALL_DIR=
$(PWD)
/simgrid-$(patsubst loba-%,%,$@) loba
mv -f -- loba $@
$(MAKE) clean
mv -f -- loba $@
$(MAKE) clean