Fix error reporting in opt::parse_args.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index c5202cf0239512c9bd9b1c7bb0bcf6666ba05ae7..8030fa06f8bd136cfbfdfde7ee2f86297d8a24de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,29 +3,24 @@ SIMGRID_INSTALL_DIR := ./simgrid-stable
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g
 
 OPTIM_FLAGS += -O3
 DEBUG_FLAGS += -g

+#DEBUG_FLAGS += -pg

 CHECK_FLAGS += -Wall -Wextra
 
 CHECK_FLAGS += -Wall -Wextra
 

-CC := gcc

 CXX := g++
 
 CPPFLAGS += -I $(SIMGRID_INSTALL_DIR)/include
 CPPFLAGS += $(CHECK_FLAGS)
 
 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
 
 #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
 
 LDLIBS := -lsimgrid
 

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

 MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
 SRC.loba := main.cpp           \
 MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
 SRC.loba := main.cpp           \


@@ -63,7 +58,6 @@ clean:
 realclean: clean
        $(RM) *~
 
 realclean: clean
        $(RM) *~
 

-%.d: %.c ; $(MAKEDEPEND.C)

 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 
 misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 
 misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h