Separate ctrl and data communications.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index f142b37f9a5cb264d081d135237dc2510802ce14..6afc248ee1398a6577e66790d02f64c63641e76f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ CC := gcc
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include

-CPPFLAGS += -D XBT_LOG_OLD_STYLE

 CPPFLAGS += $(CHECK_FLAGS)
 
 #CFLAGS += -std=c99
 CPPFLAGS += $(CHECK_FLAGS)
 
 #CFLAGS += -std=c99


@@ -35,7 +34,9 @@ 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             \
        neighbor.cpp            \
        options.cpp             \
        process.cpp             \


@@ -55,7 +56,7 @@ TARGETS := $(DEFAULT_TARGETS) \
 XML_FILES =                                            \
        Dep.xml  Plat.xml                               \
        platform.xml deployment.xml simple_async.xml    \
 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)
 
 
 XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)