X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/6f5ec5fdc42f96a8fe95f4b846b163d4dc92e0c8..16a31c00016c1067d3f401c90562b7415dfd2c26:/Makefile

diff --git a/Makefile b/Makefile
index 8f484f1..127476b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-SIMGRID_INSTALL_DIR := ./simgrid-3.5-install
-#SIMGRID_INSTALL_DIR := ../simgrid-git-install
+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,28 +12,29 @@ 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
 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 -MF $@ $<
-MAKEDEPEND.C = $(CC) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
 MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
-LOCALVERSION := localversion
-SETLOCALVERSION := ./setlocalversion
-
 SRC.loba := main.cpp		\
 	communicator.cpp	\
 	cost_func.cpp		\
+	deployment.cpp		\
+	hostdata.cpp		\
+	$(wildcard loba_*.cpp)	\
+	misc.cpp		\
 	neighbor.cpp		\
 	options.cpp		\
 	process.cpp		\
@@ -44,30 +46,49 @@ SRC := $(SRC.loba) $(SRC.simple_async)
 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
 
-$(shell $(SETLOCALVERSION))
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)
 
-.PHONY: all depend clean
+all: $(DEFAULT_TARGETS)
 
-all: $(TARGETS)
+full:
+	$(MAKE) $(FLAVOURED_LOBA)
+	$(MAKE) $(TARGETS)
 
 clean:
 	$(RM) core core.[0-9]* vgcore.[0-9]*
-	$(RM) $(LOCALVERSION)
+	$(RM) misc_autogen.h
+	$(RM) localversion
 	$(RM) $(OBJ)
 	$(RM) $(DEP)
 	$(RM) $(TARGETS)
 
 realclean: clean
+	$(RM) $(FLAVOURED_LOBA)
 	$(RM) *~
 
-%.d: %.c ; $(MAKEDEPEND.C)
 %.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)))
 
--include $(DEP)
+ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)
+  $(shell ./setlocalversion)
+  -include $(DEP)
+endif
 
 .SECONDEXPANSION:
 $(TARGETS): $$(patsubst %.cpp,%.o,$$(SRC.$$@))