X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/c86e5ff42db3495538c8b48cb7ea0943a13702b7..31b4c42308e732920cf7ffbabaaf72fc1e5642e3:/Makefile diff --git a/Makefile b/Makefile index ce4b7c4..3b5b35a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -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 DEBUG_FLAGS += -g @@ -34,7 +34,9 @@ SRC.loba := main.cpp \ deployment.cpp \ hostdata.cpp \ $(wildcard loba_*.cpp) \ + messages.cpp \ misc.cpp \ + msg_thread.cpp \ neighbor.cpp \ options.cpp \ process.cpp \ @@ -44,7 +46,7 @@ SRC.simple_async := simple_async.cpp SRC := $(SRC.loba) $(SRC.simple_async) OBJ := $(SRC:%.cpp=%.o) -DEP := $(SRC:%.cpp=%.d) +DEP := $(SRC:%.cpp=.%.d) DEFAULT_TARGETS := loba FLAVOURED_LOBA := loba-dev loba-stable @@ -54,7 +56,7 @@ TARGETS := $(DEFAULT_TARGETS) \ XML_FILES = \ Dep.xml Plat.xml \ platform.xml deployment.xml simple_async.xml \ - cluster1000.xml + cluster1000.xml machines1000.xml XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml) @@ -83,7 +85,7 @@ realclean: clean $(RM) $(XML_DEV_FILES) $(RM) *~ -%.d: %.cpp ; $(MAKEDEPEND.CXX) +.%.d: %.cpp ; $(MAKEDEPEND.CXX) %_dev.xml: %.xml sed '/DOCTYPE/s,simgrid.dtd,http://simgrid.gforge.inria.fr/&,' $< > $@