From 318cff516b7649c2c0793b8793ffe73e6d036f82 Mon Sep 17 00:00:00 2001 From: asus Date: Fri, 26 Jan 2024 12:30:38 +0100 Subject: [PATCH] new file structure according to subject --- {1_Colleen => C/1_Colleen}/Colleen.c | 0 {1_Colleen => C/1_Colleen}/Colleen_exploded.c | 0 {1_Colleen => C/1_Colleen}/Makefile | 4 ++-- {2_Grace => C/2_Grace}/Grace.c | 0 {2_Grace => C/2_Grace}/Grace_exploded.c | 0 {2_Grace => C/2_Grace}/Makefile | 2 +- {3_Sully => C/3_Sully}/Makefile | 2 +- {3_Sully => C/3_Sully}/Sully.c | 0 {3_Sully => C/3_Sully}/Sully_exploded.c | 0 Makefile => C/Makefile | 8 ++++++-- MakefileCommon => C/MakefileCommon | 6 +++--- 11 files changed, 13 insertions(+), 9 deletions(-) rename {1_Colleen => C/1_Colleen}/Colleen.c (100%) rename {1_Colleen => C/1_Colleen}/Colleen_exploded.c (100%) rename {1_Colleen => C/1_Colleen}/Makefile (53%) rename {2_Grace => C/2_Grace}/Grace.c (100%) rename {2_Grace => C/2_Grace}/Grace_exploded.c (100%) rename {2_Grace => C/2_Grace}/Makefile (76%) rename {3_Sully => C/3_Sully}/Makefile (91%) rename {3_Sully => C/3_Sully}/Sully.c (100%) rename {3_Sully => C/3_Sully}/Sully_exploded.c (100%) rename Makefile => C/Makefile (93%) rename MakefileCommon => C/MakefileCommon (95%) diff --git a/1_Colleen/Colleen.c b/C/1_Colleen/Colleen.c similarity index 100% rename from 1_Colleen/Colleen.c rename to C/1_Colleen/Colleen.c diff --git a/1_Colleen/Colleen_exploded.c b/C/1_Colleen/Colleen_exploded.c similarity index 100% rename from 1_Colleen/Colleen_exploded.c rename to C/1_Colleen/Colleen_exploded.c diff --git a/1_Colleen/Makefile b/C/1_Colleen/Makefile similarity index 53% rename from 1_Colleen/Makefile rename to C/1_Colleen/Makefile index bf9ed46..9f92f0b 100644 --- a/1_Colleen/Makefile +++ b/C/1_Colleen/Makefile @@ -1,6 +1,6 @@ NAME = Colleen SRCS = Colleen.c -CLONE = $(NAME)_kid.c -CREATE_CLONE = ./$(NAME) > $(CLONE) +CLONES = $(NAME)_kid.c +CREATE_CLONE = ./$(NAME) > $(CLONES) include ../MakefileCommon diff --git a/2_Grace/Grace.c b/C/2_Grace/Grace.c similarity index 100% rename from 2_Grace/Grace.c rename to C/2_Grace/Grace.c diff --git a/2_Grace/Grace_exploded.c b/C/2_Grace/Grace_exploded.c similarity index 100% rename from 2_Grace/Grace_exploded.c rename to C/2_Grace/Grace_exploded.c diff --git a/2_Grace/Makefile b/C/2_Grace/Makefile similarity index 76% rename from 2_Grace/Makefile rename to C/2_Grace/Makefile index e973a7f..464cc85 100644 --- a/2_Grace/Makefile +++ b/C/2_Grace/Makefile @@ -1,6 +1,6 @@ NAME = Grace SRCS = Grace.c -CLONE = $(NAME)_kid.c +CLONES = $(NAME)_kid.c CREATE_CLONE = ./$(NAME) include ../MakefileCommon diff --git a/3_Sully/Makefile b/C/3_Sully/Makefile similarity index 91% rename from 3_Sully/Makefile rename to C/3_Sully/Makefile index 2372c1d..4c831a5 100644 --- a/3_Sully/Makefile +++ b/C/3_Sully/Makefile @@ -1,6 +1,6 @@ NAME = Sully SRCS = Sully.c -CLONE = Sully_4.c \ +CLONES = Sully_4.c \ Sully_3.c \ Sully_2.c \ Sully_1.c \ diff --git a/3_Sully/Sully.c b/C/3_Sully/Sully.c similarity index 100% rename from 3_Sully/Sully.c rename to C/3_Sully/Sully.c diff --git a/3_Sully/Sully_exploded.c b/C/3_Sully/Sully_exploded.c similarity index 100% rename from 3_Sully/Sully_exploded.c rename to C/3_Sully/Sully_exploded.c diff --git a/Makefile b/C/Makefile similarity index 93% rename from Makefile rename to C/Makefile index f8f61e5..a4931d8 100644 --- a/Makefile +++ b/C/Makefile @@ -31,7 +31,8 @@ RESET = "\e[0m" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # D_QUINES = ./1_Colleen \ - ./2_Grace + ./2_Grace \ + ./3_Sully RULE = all @@ -44,6 +45,9 @@ RULE = all all: @$(MAKE) RULE=$@ loop +run: + @$(MAKE) RULE=$@ loop + diff: @$(MAKE) RULE=$@ loop @@ -64,5 +68,5 @@ loop: $(D_QUINES) re: fclean all -.PHONY : all clean fclean re loop +.PHONY : all clean fclean re loop run diff leaks diff --git a/MakefileCommon b/C/MakefileCommon similarity index 95% rename from MakefileCommon rename to C/MakefileCommon index ca5cfdd..1d750da 100644 --- a/MakefileCommon +++ b/C/MakefileCommon @@ -33,7 +33,7 @@ RESET = "\e[0m" # FILES : #NAME -> defined in subfolder makefiles #SRCS -> defined in subfolder makefiles -#CLONE -> defined in subfolder makefiles +#CLONES -> defined in subfolder makefiles #CREATE_CLONE -> defined in subfolder makefiles #RM_MORE -> might be defined in subfolder makefiles LIBS = @@ -111,13 +111,13 @@ run: diff: $(NAME) @echo $(CYAN)"compare source with output :"$(RESET) - diff --color $(CLONE) $(SRCS); \ - if [ $$? -eq 0 ]; then echo $(GREEN)"Files $(SRCS) and $(CLONE) are identical"$(RESET); else echo $(RED)":Files $(SRCS) and $(CLONE) differ"$(RESET); fi + if [ $$? -eq 0 ]; then echo $(GREEN)"Files $(SRCS) and $(CLONES) are identical"$(RESET); else echo $(RED)":Files $(SRCS) and $(CLONES) differ"$(RESET); fi clean: $(RM_OBJS) fclean: clean rm -f $(NAME) - rm -f $(CLONE) + rm -f $(CLONES) $(RM_MORE) re: fclean all