X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/a35ca9c48e49042d4c1f21c118777a6bf9898c64..fc4b169f4e9a3b0e8c8ae807fdb4c7cf8d3e6507:/Makefile?ds=inline diff --git a/Makefile b/Makefile index 2af8eba..59afd30 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-stable -#SIMGRID_INSTALL_DIR ?= $(PWD)/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 \ @@ -50,14 +51,7 @@ DEFAULT_TARGETS := loba FLAVOURED_LOBA := loba-dev loba-stable TARGETS := $(DEFAULT_TARGETS) -XML_FILES = \ - Dep.xml Plat.xml \ - platform.xml deployment.xml \ - cluster1000.xml machines1000.xml - -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) @@ -66,9 +60,7 @@ 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]* @@ -79,13 +71,11 @@ 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