X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TP_13%2Fexo1%2FMakefile;h=65b7fdc23894fa3e45df161cb73fe902c286175a;hb=fac749d5f8fab2991c3b149b82f168cec194362b;hp=146115f0af178fc9623f83ebfacc19a8f3fa5930;hpb=a80f64d2e55ee92329a3a8a74ec91ca0c8784964;p=TD_C.git

diff --git a/TP_13/exo1/Makefile b/TP_13/exo1/Makefile
index 146115f..65b7fdc 100644
--- a/TP_13/exo1/Makefile
+++ b/TP_13/exo1/Makefile
@@ -12,10 +12,11 @@
 # Automatic dependencies code from:
 # http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/#tldr
 BINARY_NAME=exo1
-BINARY_PATH:=src
+SRC_PATH:=src
 LIBRARY_NAME=libexo1
 LIBRARY_PATH:=lib
 BUILD_TYPE=debug
+#BUILD_TYPE=release
 
 # ====================================
 # DO NOT CHANGE STUFF BEYOND THIS LINE
@@ -42,7 +43,9 @@ STRIP_FLAG = -s
 OPTI_FLAG = -O3
 endif
 
-CFLAGS := $(CFLAGS) $(WARN_FLAGS) $(STD_FLAG) $(OPTI_FLAG) $(DEBUG_FLAG)
+# Puting header files in the source directory is not the purpose of this INCLUDES variable
+INCLUDES := $(INCLUDES) -I$(SRC_PATH) -I$(LIBRARY_PATH)
+CFLAGS := $(CFLAGS) $(WARN_FLAGS) $(STD_FLAG) $(OPTI_FLAG) $(DEBUG_FLAG) $(INCLUDES)
 LIBCFLAGS := -fPIC $(CFLAGS)
 LDFLAGS := $(LDFLAGS) $(STRIP_FLAG)
 LIBLDFLAGS := -shared $(LDFLAGS)
@@ -52,7 +55,7 @@ LDLIBS := $(LDLIBS) -L$(LIBRARY_PATH) -l$(BINARY_NAME)
 OBJDIR := $(BUILDDIR)/objs
 $(shell mkdir -p $(OBJDIR))
 
-SRCS=$(wildcard $(BINARY_PATH)/*.c)
+SRCS=$(wildcard $(SRC_PATH)/*.c)
 LIBSRCS=$(wildcard $(LIBRARY_PATH)/*.c)
 OBJS=$(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(SRCS)))
 LIBOBJS=$(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(LIBSRCS)))
@@ -62,15 +65,6 @@ $(shell mkdir -p $(DEPDIR))
 DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$(notdir $*).Td
 POSTCOMPILE = mv -f $(DEPDIR)/$(notdir $*).Td $(DEPDIR)/$(notdir $*).d
 
-print: 
-	@echo $(basename $(notdir $(SRCS)))
-	@echo $(notdir $(SRCS))
-	@echo $(DEPDIR)/%d
-	@echo $(wildcard $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRCS))))
-	@echo $(OBJS) $(LIBOBJS)
-	@echo $(SRCS) $(LIBSRCS)
-	@echo $(POSTCOMPILE)
-
 $(LIBRARY_PATH)/$(LIBRARY_NAME).a: $(LIBOBJS)
 	@echo "[AR StO] $@"
 	@$(AR) rcs $@ $^
@@ -91,22 +85,18 @@ $(BINARY_NAME).static: $(OBJS) $(LIBRARY_PATH)/$(LIBRARY_NAME).a
 	@echo "[LD ] $@"
 	@$(LD) $(CFLAGS) $(STATICLIBLDFLAGS) $^ $(LDLIBS) -o $@
 
-#$(BINARY_NAME).staticlocal: $(OBJS) $(LIBRARY_PATH)/$(LIBRARY_NAME).a
-#	@echo "[LD ] $@"
-#	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
-
 $(BINARY_NAME).dynamic: $(OBJS) $(LIBRARY_PATH)/$(LIBRARY_NAME).so
 	@echo "[LD ] $@"
 	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
-$(OBJS): $(SRCS) $(DEPDIR)/%.d
+$(OBJDIR)/%.o: $(SRC_PATH)/%.c $(DEPDIR)/%.d
 	@echo "[C  ] $(notdir $*)"
 	@$(CC) $(DEPFLAGS) $(CFLAGS) -c $< -o $@
 	@$(POSTCOMPILE)
 
 include $(wildcard $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRCS))))
 
-$(LIBOBJS): $(LIBSRCS) $(DEPDIR)/%.d
+$(OBJDIR)/%.o: $(LIBRARY_PATH)/%.c $(DEPDIR)/%.d
 	@echo "[C  ] $(notdir $*)"
 	@$(CC) $(DEPFLAGS) $(LIBCFLAGS) -c $< -o $@
 	@$(POSTCOMPILE)