From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 21 Dec 2010 16:08:40 +0000 (+0100)
Subject: Remove C targets from Makefile.
X-Git-Tag: v0.1~214
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/ac9e5de4c0ff479ce265da01df4d53771e096d9d?ds=inline;hp=-c

Remove C targets from Makefile.
---

ac9e5de4c0ff479ce265da01df4d53771e096d9d
diff --git a/Makefile b/Makefile
index d206ab4..8030fa0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,29 +3,24 @@ 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 -MG -MF $@ $<
-MAKEDEPEND.C = $(CC) $(MAKEDEPEND.FLAGS)
 MAKEDEPEND.CXX = $(CXX) $(MAKEDEPEND.FLAGS)
 
 SRC.loba := main.cpp		\
@@ -63,7 +58,6 @@ clean:
 realclean: clean
 	$(RM) *~
 
-%.d: %.c ; $(MAKEDEPEND.C)
 %.d: %.cpp ; $(MAKEDEPEND.CXX)
 
 misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h