Makefile: add compiler flags to MAKEDEPEND, define MAKEDEPEND.C.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 3990aa5b0d3db0ed986843f3bb05eddea3d9e11d..c714785a757bf08612c48e5a19250b7692074327 100644 (file)
--- 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
@@ -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        \
@@ -36,30 +37,21 @@ SRC.loba := main.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 machines1000.xml
+TARGETS := $(DEFAULT_TARGETS)
 
-XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
-
-.PHONY: all full xml clean realclean $(FLAVOURED_LOBA)
+.PHONY: all full clean realclean $(FLAVOURED_LOBA)
 
 all: $(DEFAULT_TARGETS)
 
@@ -70,8 +62,6 @@ full:
        done
        $(MAKE) xml $(DEFAULT_TARGETS)
 
-xml: $(XML_DEV_FILES)
-
 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*
        $(RM) localversion
@@ -84,14 +74,13 @@ realclean: clean
        $(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