Update the exercice skeleton Makefile to the one given during the

course.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/TP_9/exo2/clist.c b/TP_9/exo2/clist.c
index 2857042028966a52133304c9bd73d23534b8c22b..0ee532f36b283d0a8795cf2b10348bf066acfb15 100644 (file)
--- a/TP_9/exo2/clist.c
+++ b/TP_9/exo2/clist.c
@@ -45,7 +45,7 @@ unsigned list_count(link_t* head) {
 
 void list_set(link_t* head, unsigned index, int value) {
 
-    // FIXME: check for the index value validity
+    //FIXME: check for the index value validity
     for (unsigned count = 0; count < index; count++) {
         head = head->next;
     }

diff --git a/exo_skel/Makefile b/exo_skel/Makefile
index 1822902ce1f7f3b54059214a9e31cb8b7f05c8ad..51c401af169b9ef0881ab841c018f03a360c5028 100644 (file)
--- a/exo_skel/Makefile
+++ b/exo_skel/Makefile
@@ -1,31 +1,79 @@
-TARGET = exo_skel
-LIBS =
-CC = gcc
-# Enforce C11 ISO standard for now
-CFLAGS = -std=c11 -g -Wall -Wextra
-LDFLAGS = -g -Wall -Wextra
+# Sample Makefile to build simple project.
+#
+# This Makefile expect all source files (.c) to be at the same level, in the
+# current working directory.
+#
+# It will automatically generate dependencies, compile all files, and produce a
+# binary using the provided name.
+#
+# Set BINARY_NAME to the name of the binary file to build.
+# Set BUILD_TYPE to either debug or release
+#
+# Automatic dependencies code from:
+# http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/#tldr
+BINARY_NAME=exo_skel
+BUILD_TYPE=debug
 
-.PHONY: default all clean
+# ====================================
+# DO NOT CHANGE STUFF BEYOND THIS LINE
+# ====================================
 
-default: $(TARGET)
-all: default
+all: $(BINARY_NAME)
 
-OBJECTS = $(patsubst %.c, %.o, $(wildcard *.c))
-HEADERS = $(wildcard *.h)
+CC=gcc
+LD=gcc
 
-%.o: %.c $(HEADERS)
-       $(CC) $(CFLAGS) -c $< -o $@
+WARN_FLAGS = -Wall -Wextra
+STD_FLAG = -std=c99
 
-.PRECIOUS: $(TARGET) $(OBJECTS)
+ifeq ($(BUILD_TYPE),debug)
+BUILDDIR := .build/debug
+DEBUG_FLAG = -g
+STRIP_FLAG =
+OPTI_FLAG = -O0
+else
+BUILDDIR := .build/release
+DEBUG_FLAG =
+STRIP_FLAG = -s
+OPTIFLAG = -O3
+endif
 
-$(TARGET): $(OBJECTS)
-       $(CC) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $@
+CFLAGS := $(CFLAGS) $(WARN_FLAGS) $(STD_FLAG) $(OPTI_FLAG) $(DEBUG_FLAG)
+LDFLAGS := $(LDFLAGS) $(STRIP_FLAG)
+
+OBJDIR := $(BUILDDIR)/objs
+$(shell mkdir -p $(OBJDIR))
+
+SRCS=$(wildcard *.c)
+OBJS=$(patsubst %.c,$(OBJDIR)/%.o,$(SRCS))
+
+DEPDIR := $(BUILDDIR)/deps
+$(shell mkdir -p $(DEPDIR))
+DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td
+POSTCOMPILE = mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d
+
+$(BINARY_NAME): $(OBJS)
+       @echo "[LD ] $@"
+       @$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
+$(OBJDIR)/%.o: %.c $(DEPDIR)/%.d
+       @echo "[C  ] $*"
+       @$(CC) $(DEPFLAGS) $(CFLAGS) -c $< -o $@
+       @$(POSTCOMPILE)
+
+$(DEPDIR)/%.d: ;
+
+.PRECIOUS: $(DEPDIR)/%.d
+
+include $(wildcard $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRCS))))
 
 clean:
-       -rm -f $(TARGET) $(OBJECTS) 
+       @echo "[CLN]"
+       -@rm -r $(BUILDDIR)
+       -@rm $(BINARY_NAME)
 
-disassemble: $(TARGET)
+disassemble: $(BINARY_NAME)
        objdump -d $< | less
 
-symbols: $(TARGET)
+symbols: $(BINARY_NAME)
        objdump -t $< | sort | less