From ac9e5de4c0ff479ce265da01df4d53771e096d9d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 21 Dec 2010 17:08:40 +0100 Subject: [PATCH] Remove C targets from Makefile. --- Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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 -- 2.39.5