X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4b1551933104a6764eec30774b92737cda2d8097..f483eedcc241fabb1210b5800d903989202ad9fe:/Makefile

diff --git a/Makefile b/Makefile
index d206ab4..9de6a19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-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
 
 CC := gcc
@@ -11,8 +12,8 @@ CXX := g++
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
-CFLAGS += -std=c99
-#CFLAGS += -fgnu89-inline	# workaround simgrid bug
+#CFLAGS += -std=c99
+#CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 #CXXFLAGS += -std=c++0x
@@ -21,11 +22,10 @@ CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 
-LINK.o = $(CXX) $(LDFLAGS) $(TARGET_ARCH)
+LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
 LDLIBS := -lsimgrid
 
 MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
-MAKEDEPEND.C = $(CC) $(MAKEDEPEND.FLAGS)
 MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
 SRC.loba := main.cpp		\
@@ -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,39 +46,61 @@ SRC.simple_async := simple_async.cpp
 
 SRC := $(SRC.loba) $(SRC.simple_async)
 OBJ := $(SRC:%.cpp=%.o)
-DEP := $(SRC:%.cpp=%.d)
+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
+XML_FILES =						\
+	Dep.xml  Plat.xml				\
+	platform.xml deployment.xml simple_async.xml	\
+	cluster1000.xml machines1000.xml
 
-all: $(TARGETS)
+XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
+
+.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)
+
+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]*
-	$(RM) misc_autogen.h
 	$(RM) localversion
 	$(RM) $(OBJ)
 	$(RM) $(DEP)
 	$(RM) $(TARGETS)
 
 realclean: clean
+	$(RM) $(FLAVOURED_LOBA)
+	$(RM) $(XML_DEV_FILES)
 	$(RM) *~
 
-%.d: %.c ; $(MAKEDEPEND.C)
-%.d: %.cpp ; $(MAKEDEPEND.CXX)
+.%.d: %.cpp ; $(MAKEDEPEND.CXX)
+
+%_dev.xml: %.xml
+	sed '/DOCTYPE/s,simgrid.dtd,http://simgrid.gforge.inria.fr/&,' $< > $@
 
-misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
-	grep -C1 '# *define *CLOG' $< \
-	| sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
+$(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)))
 
-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: