Deadlock fix, and other changes.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 2ab9e7bee0393c381fbc4a02d3e0842ea03d6608..8030fa06f8bd136cfbfdfde7ee2f86297d8a24de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,34 +3,26 @@ SIMGRID_INSTALL_DIR := ./simgrid-stable
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
+#DEBUG_FLAGS += -pg
 CHECK_FLAGS += -Wall -Wextra
 
-CC := gcc
 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
-CFLAGS += -std=c99
-#CFLAGS += -fgnu89-inline      # workaround simgrid bug
-CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
-
 #CXXFLAGS += -std=c++0x
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib
 
-LINK.o = $(CXX) $(LDFLAGS) $(TARGET_ARCH)
+LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
 LDLIBS := -lsimgrid
 
-MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MF $@ $<
-MAKEDEPEND.C = $(CC) $(MAKEDEPEND.FLAGS)
+MAKEDEPEND.FLAGS =  $(CPPFLAGS) -MM -MG -MF $@ $<
 MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
-LOCALVERSION := localversion
-SETLOCALVERSION := ./setlocalversion
-
 SRC.loba := main.cpp           \
        communicator.cpp        \
        cost_func.cpp           \
@@ -51,15 +43,14 @@ DEP := $(SRC:%.cpp=%.d)
 
 TARGETS := loba simple_async
 
-$(shell $(SETLOCALVERSION))
-
 .PHONY: all clean realclean
 
 all: $(TARGETS)
 
 clean:
        $(RM) core core.[0-9]* vgcore.[0-9]*
-       $(RM) $(LOCALVERSION)
+       $(RM) misc_autogen.h
+       $(RM) localversion
        $(RM) $(OBJ)
        $(RM) $(DEP)
        $(RM) $(TARGETS)
@@ -67,15 +58,19 @@ clean:
 realclean: clean
        $(RM) *~
 
-%.d: %.c ; $(MAKEDEPEND.C)
 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 
+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)))
 
 ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),realclean)
--include $(DEP)
-endif
+  ifneq ($(MAKECMDGOALS),realclean)
+    $(shell ./setlocalversion)
+    -include $(DEP)
+  endif
 endif
 
 .SECONDEXPANSION: