Minor cleanups.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 127476b860120ad0aa371fd665a1f09ac1976c3c..9de6a1912cbdf1c169387dfb7d42d68f0f85df18 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,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             \
@@ -44,24 +46,35 @@ 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
 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:
-       $(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]*
-       $(RM) misc_autogen.h
        $(RM) localversion
        $(RM) $(OBJ)
        $(RM) $(DEP)
@@ -69,9 +82,13 @@ clean:
 
 realclean: clean
        $(RM) $(FLAVOURED_LOBA)
+       $(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
@@ -79,10 +96,6 @@ $(FLAVOURED_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)),)