Use git diff instead of diff-index for setlocalversion.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 59afd305661ef32ebad623058992b63083ef433e..21457babe42cc7d3165fbfa93a90d6673f8a8d7c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-#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 += -pipe -O3
 DEBUG_FLAGS += -g
 
 OPTIM_FLAGS += -pipe -O3
 DEBUG_FLAGS += -g


@@ -16,14 +16,14 @@ CPPFLAGS += $(CHECK_FLAGS)
 #CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 #CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 

-CXXFLAGS += -std=c++0x
+CXXFLAGS += -std=c++11

 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 
 LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 
 LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)

-LDLIBS := -lsimgrid
+LDLIBS := -lsimgrid -lrt

 
 MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
 MAKEDEPEND.C = $(CC) $(CFLAGS) $(MAKEDEPEND.FLAGS)
 
 MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
 MAKEDEPEND.C = $(CC) $(CFLAGS) $(MAKEDEPEND.FLAGS)