Improve warning message.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index a80f02591c031fd33f698180d554b7d246f10c03..2b0df87c2ccef2fa39d0860bb79a0cdf4cf99a9e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,16 @@ DEBUG_FLAGS += -g
 #DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
 
 #DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
 

+CC := gcc

 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 

+#CFLAGS += -std=c99
+#CFLAGS += -fgnu89-inline      # workaround simgrid bug
+CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
+

 #CXXFLAGS += -std=c++0x
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 #CXXFLAGS += -std=c++0x
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 


@@ -33,6 +38,7 @@ 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


@@ -46,13 +52,25 @@ 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)
 
 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]*


@@ -64,10 +82,14 @@ 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
 $(FLAVOURED_LOBA):
        $(MAKE) clean
        $(MAKE) SIMGRID_INSTALL_DIR=./simgrid-$(patsubst loba-%,%,$@) loba