Use two empty lines to separate data sets.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index f142b37f9a5cb264d081d135237dc2510802ce14..45246af158b5c6d8a48d2c295847e409629deb27 100644 (file)
--- 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
@@ -10,7 +10,6 @@ CC := gcc
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
-CPPFLAGS += -D XBT_LOG_OLD_STYLE
 CPPFLAGS += $(CHECK_FLAGS)
 
 #CFLAGS += -std=c99
@@ -35,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             \
@@ -45,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
@@ -55,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)
 
@@ -84,14 +85,14 @@ 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/&,' $< > $@
 
 $(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