X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4e922bca67d7cf4bc30a878cd7cd46d39fbe1573..779b929d3831ca0aea2f667029d6381946c86e01:/Makefile?ds=inline

diff --git a/Makefile b/Makefile
index 2760531..59afd30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-SIMGRID_INSTALL_DIR ?= ./simgrid-stable
-#SIMGRID_INSTALL_DIR ?= ./simgrid-dev
+#SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-stable
+SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-dev
 
-OPTIM_FLAGS += -O3
+OPTIM_FLAGS += -pipe -O3
 DEBUG_FLAGS += -g
 #DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
@@ -16,7 +16,7 @@ CPPFLAGS += $(CHECK_FLAGS)
 #CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
-#CXXFLAGS += -std=c++0x
+CXXFLAGS += -std=c++0x
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
@@ -26,7 +26,8 @@ LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
 LDLIBS := -lsimgrid
 
 MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
-MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.C = $(CC) $(CFLAGS) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.CXX = $(CXX) $(CXXFLAGS) $(MAKEDEPEND.FLAGS)
 
 SRC.loba := main.cpp		\
 	communicator.cpp	\
@@ -34,31 +35,23 @@ SRC.loba := main.cpp		\
 	deployment.cpp		\
 	hostdata.cpp		\
 	$(wildcard loba_*.cpp)	\
+	messages.cpp		\
 	misc.cpp		\
+	msg_thread.cpp		\
 	neighbor.cpp		\
 	options.cpp		\
 	process.cpp		\
 	version.cpp
 
-SRC.simple_async := simple_async.cpp
-
-SRC := $(SRC.loba) $(SRC.simple_async)
+SRC := $(SRC.loba)
 OBJ := $(SRC:%.cpp=%.o)
-DEP := $(SRC:%.cpp=%.d)
+DEP := $(SRC:%.cpp=.%.d)
 
 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)
+TARGETS := $(DEFAULT_TARGETS)
 
-.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)
 
 all: $(DEFAULT_TARGETS)
 
@@ -67,13 +60,10 @@ full:
 		echo $(MAKE) "$$target";	\
 		$(MAKE) "$$target";		\
 	done
-	$(MAKE) xml $(DEFAULT_TARGETS)
-
-xml: $(XML_DEV_FILES)
+	$(MAKE) $(DEFAULT_TARGETS)
 
 clean:
 	$(RM) core core.[0-9]* vgcore.[0-9]*
-	$(RM) misc_autogen.h
 	$(RM) localversion
 	$(RM) $(OBJ)
 	$(RM) $(DEP)
@@ -81,24 +71,18 @@ clean:
 
 realclean: clean
 	$(RM) $(FLAVOURED_LOBA)
-	$(RM) $(XML_DEV_FILES)
 	$(RM) *~
 
-%.d: %.cpp ; $(MAKEDEPEND.CXX)
+.%.d: %.c ; $(MAKEDEPEND.C)
 
-%_dev.xml: %.xml
-	sed '/DOCTYPE/s,simgrid.dtd,http://simgrid.gforge.inria.fr/&,' $< > $@
+.%.d: %.cpp ; $(MAKEDEPEND.CXX)
 
 $(FLAVOURED_LOBA):
 	$(MAKE) clean
-	$(MAKE) SIMGRID_INSTALL_DIR=./simgrid-$(patsubst loba-%,%,$@) loba
+	$(MAKE) SIMGRID_INSTALL_DIR=$(PWD)/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)))
 
 ifeq ($(filter $(MAKECMDGOALS),full clean realclean $(FLAVOURED_LOBA)),)