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

diff --git a/TP_13/exo1/Makefile b/TP_13/exo1/Makefile
index 8168c45..146115f 100644
--- a/TP_13/exo1/Makefile
+++ b/TP_13/exo1/Makefile
@@ -15,7 +15,6 @@ BINARY_NAME=exo1
 BINARY_PATH:=src
 LIBRARY_NAME=libexo1
 LIBRARY_PATH:=lib
-#LDLIBS=-L$(LIBRARY_PATH) -l$(BINARY_NAME)
 BUILD_TYPE=debug
 
 # ====================================
@@ -43,11 +42,12 @@ STRIP_FLAG = -s
 OPTI_FLAG = -O3
 endif
 
-#FIXME: Add a way to better control the library build flag
-CFLAGS := -fPIC $(CFLAGS) $(WARN_FLAGS) $(STD_FLAG) $(OPTI_FLAG) $(DEBUG_FLAG)
+CFLAGS := $(CFLAGS) $(WARN_FLAGS) $(STD_FLAG) $(OPTI_FLAG) $(DEBUG_FLAG)
+LIBCFLAGS := -fPIC $(CFLAGS)
 LDFLAGS := $(LDFLAGS) $(STRIP_FLAG)
 LIBLDFLAGS := -shared $(LDFLAGS)
 STATICLIBLDFLAGS := -static $(LDFLAGS)
+LDLIBS := $(LDLIBS) -L$(LIBRARY_PATH) -l$(BINARY_NAME)
 
 OBJDIR := $(BUILDDIR)/objs
 $(shell mkdir -p $(OBJDIR))
@@ -77,39 +77,38 @@ $(LIBRARY_PATH)/$(LIBRARY_NAME).a: $(LIBOBJS)
 
 $(LIBRARY_PATH)/$(LIBRARY_NAME).so: $(LIBOBJS)
 	@echo "[LD ShO] $@"
-	@$(LD) $(CFLAGS) $(LIBLDFLAGS) $^ $(LDLIBS) -o $@
+	@$(LD) $(LIBCFLAGS) $(LIBLDFLAGS) $^ -o $@
 
 #$(BINARY_NAME): $(OBJS) $(LIBOBJS)
 #	@echo "[LD ] $@"
-#	$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+#	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 $(BINARY_NAME): $(OBJS) $(LIBRARY_PATH)/$(LIBRARY_NAME).a
 	@echo "[LD ] $@"
-	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LOCALLDLIBS) $(LDLIBS) -o $@
+	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
-LOCALLDLIBS=-L$(LIBRARY_PATH) -l$(BINARY_NAME)
 $(BINARY_NAME).static: $(OBJS) $(LIBRARY_PATH)/$(LIBRARY_NAME).a
 	@echo "[LD ] $@"
-	@$(LD) $(CFLAGS) $(STATICLIBLDFLAGS) $^ $(LOCALLDLIBS) $(LDLIBS) -o $@
+	@$(LD) $(CFLAGS) $(STATICLIBLDFLAGS) $^ $(LDLIBS) -o $@
 
 #$(BINARY_NAME).staticlocal: $(OBJS) $(LIBRARY_PATH)/$(LIBRARY_NAME).a
 #	@echo "[LD ] $@"
-#	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LOCALLDLIBS) $(LDLIBS) -o $@
+#	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 $(BINARY_NAME).dynamic: $(OBJS) $(LIBRARY_PATH)/$(LIBRARY_NAME).so
 	@echo "[LD ] $@"
-	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LOCALLDLIBS) $(LDLIBS) -o $@
+	@$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 $(OBJS): $(SRCS) $(DEPDIR)/%.d
-	@echo "[C  ] $*"
+	@echo "[C  ] $(notdir $*)"
 	@$(CC) $(DEPFLAGS) $(CFLAGS) -c $< -o $@
 	@$(POSTCOMPILE)
 
 include $(wildcard $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRCS))))
 
 $(LIBOBJS): $(LIBSRCS) $(DEPDIR)/%.d
-	@echo "[C  ] $*"
-	@$(CC) $(DEPFLAGS) $(CFLAGS) -c $< -o $@
+	@echo "[C  ] $(notdir $*)"
+	@$(CC) $(DEPFLAGS) $(LIBCFLAGS) -c $< -o $@
 	@$(POSTCOMPILE)
 
 include $(wildcard $(patsubst %,$(DEPDIR)/%.d,$(basename $(LIBSRCS))))
@@ -118,6 +117,8 @@ $(DEPDIR)/%.d: ;
 
 .PRECIOUS: $(DEPDIR)/%.d
 
+#FIXME: add an install target
+
 clean:
 	@echo "[CLN]"
 	-@rm -r $(BUILDDIR)