Typo.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 127476b860120ad0aa371fd665a1f09ac1976c3c..6afc248ee1398a6577e66790d02f64c63641e76f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,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             \


@@ -51,17 +53,28 @@ 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 machines1000.xml
+
+XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
+
+.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)

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

-       $(MAKE) $(FLAVOURED_LOBA)
-       $(MAKE) $(TARGETS)
+       @for target in $(FLAVOURED_LOBA); do    \
+               echo $(MAKE) "$$target";        \
+               $(MAKE) "$$target";             \
+       done
+       $(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)


@@ -69,20 +82,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)),)