Make build work with latest developments on simgrid-svn.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 2b0df87c2ccef2fa39d0860bb79a0cdf4cf99a9e..ff9ad97314e8dfd51f85eca7b298cea4d1b6c924 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,6 @@ SRC.loba := main.cpp          \
        neighbor.cpp            \
        options.cpp             \
        process.cpp             \
        neighbor.cpp            \
        options.cpp             \
        process.cpp             \

-       statistics.cpp          \

        version.cpp
 
 SRC.simple_async := simple_async.cpp
        version.cpp
 
 SRC.simple_async := simple_async.cpp


@@ -97,7 +96,7 @@ $(FLAVOURED_LOBA):
        $(MAKE) clean
 
 misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
        $(MAKE) clean
 
 misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h

-       grep -C1 '# *define *CLOG' $< \
+       grep '# *define *\(XBT_\)\?CLOG.*_XBT_LOGV' $< \

        | sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
        | sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))