Add rules to ease building of loba-dev and loba-stable, which are

loba linked with their respective simgrid flavour.

diff --git a/Makefile b/Makefile
index dc2d3b0b78e2fbd048ac72e496611d7838b46db9..a80f02591c031fd33f698180d554b7d246f10c03 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,18 @@ 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

 
 

-.PHONY: all clean realclean
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)

 
 

-all: $(TARGETS)
+all: $(DEFAULT_TARGETS)
+
+full:
+       $(MAKE) $(FLAVOURED_LOBA)
+       $(MAKE) $(TARGETS)

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


@@ -56,21 +63,26 @@ clean:
        $(RM) $(TARGETS)
 
 realclean: clean
        $(RM) $(TARGETS)
 
 realclean: clean

+       $(RM) $(FLAVOURED_LOBA)

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

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

-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: