From 8de34862518d9292b1b850abac87dd94597e7181 Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Sun, 19 Mar 2023 23:18:56 +0100
Subject: [PATCH] better makefiles

---
 TP1/Makefile |  5 ++++-
 TP2/Makefile | 18 +++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/TP1/Makefile b/TP1/Makefile
index f45bce5..e19a7fa 100644
--- a/TP1/Makefile
+++ b/TP1/Makefile
@@ -2,7 +2,10 @@ NAME        = TP1 - Groupe 4
 CPP_NAME    = C++
 PROLOG_NAME = Prolog
 
-TAR         = tar --exclude="*AidesCPP" --exclude="*TODO.md" -czf
+EXCLUSIONS  = *AidesCPP *.md
+$(foreach i, $(EXCLUSIONS), $(eval TAR_EXCLUDE = $(TAR_EXCLUDE) --exclude="$(i)"))
+
+TAR         = tar $(TAR_EXCLUDE) -czf
 CP          = cp -r
 RM          = rm -r
 
diff --git a/TP2/Makefile b/TP2/Makefile
index 96757f1..d038c31 100644
--- a/TP2/Makefile
+++ b/TP2/Makefile
@@ -2,9 +2,15 @@ CXX          = g++
 CXXFLAGS     = -std=c++11
 RM           = rm -f
 
+RAPPORT_DIR  = Rapport
+EXCLUSIONS   = README.* $(RAPPORT_DIR)
+$(foreach i, $(EXCLUSIONS), $(eval TAR_EXCLUDE = $(TAR_EXCLUDE) --exclude="$(i)"))
+
 NAME         = TP2 - Groupe 4
-TAR          = tar --exclude="README.*" --exclude="Rapport" -czf
-RAPPORT      = Rapport/rapport.tex
+TAR          = tar -czf
+RAPPORT      = $(RAPPORT_DIR)/rapport.pdf
+CP           = rsync -av $(TAR_EXCLUDE)
+MV           = mv
 
 SOURCES_RAND = $(filter-out src/my_player.cpp, $(wildcard src/*.cpp))
 OBJETS_RAND  = $(patsubst %.cpp,%.cpp.o,$(notdir $(SOURCES_RAND)))
@@ -40,7 +46,13 @@ compilation_me: $(OBJETS_ME)
 
 tgz:
 	$(MAKE) clean
-	$(TAR) "$(NAME).tar.gz" $(RAPPORT) *
+	$(CP) * temp
+	mkdir temp/$(RAPPORT_DIR)
+	$(CP) $(RAPPORT) temp/$(RAPPORT_DIR)
+	cd temp && \
+	$(TAR) "$(NAME).tar.gz" * && \
+	$(MV) "$(NAME).tar.gz" ..
+	$(RM) -r temp/
 
 clean:
 	$(RM) $(OBJETS_RAND) $(EXE_RAND) $(OBJETS_ME) $(EXE_ME)