From f1294ffe51b4cee659a10f464966ce9e3c0c4fa6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 7 Mar 2017 18:47:05 +0100 Subject: [PATCH] TP11: Rename the static binary target to express that it's not statically linked binary but linked only against the embedded libraries MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- TP_11/exo1/Makefile | 6 +++--- TP_11/exo2/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TP_11/exo1/Makefile b/TP_11/exo1/Makefile index 634334e..adaddf0 100644 --- a/TP_11/exo1/Makefile +++ b/TP_11/exo1/Makefile @@ -21,7 +21,7 @@ BUILD_TYPE=debug # DO NOT CHANGE STUFF BEYOND THIS LINE # ==================================== -all: $(BINARY_NAME) $(BINARY_NAME).dynamic $(BINARY_NAME).static +all: $(BINARY_NAME) $(BINARY_NAME).dynamic $(BINARY_NAME).staticlocal CC=gcc LD=gcc @@ -72,7 +72,7 @@ $(BINARY_NAME): $(OBJS) @$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ LOCALLDLIBS=-L. -ltpC -$(BINARY_NAME).static: $(OBJDIR)/$(BINARY_NAME).o $(LIBRARY_NAME).a +$(BINARY_NAME).staticlocal: $(OBJDIR)/$(BINARY_NAME).o $(LIBRARY_NAME).a @echo "[LD ] $@" @$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LOCALLDLIBS) $(LDLIBS) -o $@ @@ -95,7 +95,7 @@ clean: @echo "[CLN]" -@rm -r $(BUILDDIR) -@rm $(BINARY_NAME) - -@rm $(BINARY_NAME).static + -@rm $(BINARY_NAME).staticlocal -@rm $(BINARY_NAME).dynamic -@rm $(LIBRARY_NAME).so -@rm $(LIBRARY_NAME).a diff --git a/TP_11/exo2/Makefile b/TP_11/exo2/Makefile index aded269..50191de 100644 --- a/TP_11/exo2/Makefile +++ b/TP_11/exo2/Makefile @@ -21,7 +21,7 @@ BUILD_TYPE=debug # DO NOT CHANGE STUFF BEYOND THIS LINE # ==================================== -all: $(BINARY_NAME) $(BINARY_NAME).dynamic $(BINARY_NAME).static +all: $(BINARY_NAME) $(BINARY_NAME).dynamic $(BINARY_NAME).staticlocal CC=gcc LD=gcc @@ -72,7 +72,7 @@ $(BINARY_NAME): $(OBJS) @$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ LOCALLDLIBS=-L. -ltpC -$(BINARY_NAME).static: $(OBJDIR)/$(BINARY_NAME).o $(LIBRARY_NAME).a +$(BINARY_NAME).staticlocal: $(OBJDIR)/$(BINARY_NAME).o $(LIBRARY_NAME).a @echo "[LD ] $@" @$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LOCALLDLIBS) $(LDLIBS) -o $@ @@ -95,7 +95,7 @@ clean: @echo "[CLN]" -@rm -r $(BUILDDIR) -@rm $(BINARY_NAME) - -@rm $(BINARY_NAME).static + -@rm $(BINARY_NAME).staticlocal -@rm $(BINARY_NAME).dynamic -@rm $(LIBRARY_NAME).so -@rm $(LIBRARY_NAME).a -- 2.34.1