Remove unused misc::address.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 8030fa06f8bd136cfbfdfde7ee2f86297d8a24de..f142b37f9a5cb264d081d135237dc2510802ce14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,22 @@
-SIMGRID_INSTALL_DIR := ./simgrid-stable
-#SIMGRID_INSTALL_DIR := ./simgrid-dev
+SIMGRID_INSTALL_DIR ?= ./simgrid-stable
+#SIMGRID_INSTALL_DIR ?= ./simgrid-dev

 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
 #DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
 
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
 #DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
 

+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)
 
 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)
 


@@ -41,36 +47,59 @@ SRC := $(SRC.loba) $(SRC.simple_async)
 OBJ := $(SRC:%.cpp=%.o)
 DEP := $(SRC:%.cpp=%.d)
 
 OBJ := $(SRC:%.cpp=%.o)
 DEP := $(SRC:%.cpp=%.d)
 

-TARGETS := loba simple_async
+DEFAULT_TARGETS := loba
+FLAVOURED_LOBA := loba-dev loba-stable
+TARGETS := $(DEFAULT_TARGETS)  \
+          simple_async
+
+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 clean realclean
+.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)

 
 

-all: $(TARGETS)
+all: $(DEFAULT_TARGETS)
+
+full:
+       @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) $(TARGETS)
 
 realclean: clean
        $(RM) localversion
        $(RM) $(OBJ)
        $(RM) $(DEP)
        $(RM) $(TARGETS)
 
 realclean: clean

+       $(RM) $(FLAVOURED_LOBA)
+       $(RM) $(XML_DEV_FILES)

        $(RM) *~
 
 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 
        $(RM) *~
 
 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 

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

 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 
 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))
 

-ifneq ($(MAKECMDGOALS),clean)
-  ifneq ($(MAKECMDGOALS),realclean)
-    $(shell ./setlocalversion)
-    -include $(DEP)
-  endif
+ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)
+  $(shell ./setlocalversion)
+  -include $(DEP)

 endif
 
 .SECONDEXPANSION:
 endif
 
 .SECONDEXPANSION: