Rewrite macro ESSE() and get rid of misc::str_nil.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 8a6bff430f18e8d85ecdee2bd9ad1e7787ae5961..f142b37f9a5cb264d081d135237dc2510802ce14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ 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


@@ -51,7 +52,14 @@ FLAVOURED_LOBA := loba-dev loba-stable
 TARGETS := $(DEFAULT_TARGETS)  \
           simple_async
 
 TARGETS := $(DEFAULT_TARGETS)  \
           simple_async
 

-.PHONY: all full clean realclean $(FLAVOURED_LOBA)
+XML_FILES =                                            \
+       Dep.xml  Plat.xml                               \
+       platform.xml deployment.xml simple_async.xml    \
+       cluster1000.xml
+
+XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
+
+.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)

 
 all: $(DEFAULT_TARGETS)
 
 
 all: $(DEFAULT_TARGETS)
 


@@ -60,11 +68,12 @@ full:
                echo $(MAKE) "$$target";        \
                $(MAKE) "$$target";             \
        done
                echo $(MAKE) "$$target";        \
                $(MAKE) "$$target";             \
        done

-       $(MAKE) $(DEFAULT_TARGETS)
+       $(MAKE) xml $(DEFAULT_TARGETS)
+
+xml: $(XML_DEV_FILES)

 
 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*
 
 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*

-       $(RM) misc_autogen.h

        $(RM) localversion
        $(RM) $(OBJ)
        $(RM) $(DEP)
        $(RM) localversion
        $(RM) $(OBJ)
        $(RM) $(DEP)


@@ -72,20 +81,20 @@ clean:
 
 realclean: clean
        $(RM) $(FLAVOURED_LOBA)
 
 realclean: clean
        $(RM) $(FLAVOURED_LOBA)

+       $(RM) $(XML_DEV_FILES)

        $(RM) *~
 
 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 
        $(RM) *~
 
 %.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
        mv -f -- loba $@
        $(MAKE) clean
 
 $(FLAVOURED_LOBA):
        $(MAKE) clean
        $(MAKE) SIMGRID_INSTALL_DIR=./simgrid-$(patsubst loba-%,%,$@) loba
        mv -f -- loba $@
        $(MAKE) clean
 

-misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
-       grep -C1 '# *define *CLOG' $< \
-       | sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
-

 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
 ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
 ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)