X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/ff7e29859a43a9a98d018bc7410acbb2dda47b4c..HEAD:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index f7e2171..21457ba 100644
--- 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
@@ -16,17 +16,18 @@ CPPFLAGS += $(CHECK_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)
-LDLIBS := -lsimgrid
+LDLIBS := -lsimgrid -lrt
 
 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	\
@@ -59,7 +60,7 @@ full:
 		echo $(MAKE) "$$target";	\
 		$(MAKE) "$$target";		\
 	done
-	$(MAKE) xml $(DEFAULT_TARGETS)
+	$(MAKE) $(DEFAULT_TARGETS)
 
 clean:
 	$(RM) core core.[0-9]* vgcore.[0-9]*
@@ -70,9 +71,10 @@ clean:
 
 realclean: clean
 	$(RM) $(FLAVOURED_LOBA)
-	$(RM) $(XML_DEV_FILES)
 	$(RM) *~
 
+.%.d: %.c ; $(MAKEDEPEND.C)
+
 .%.d: %.cpp ; $(MAKEDEPEND.CXX)
 
 $(FLAVOURED_LOBA):