diff --git a/shcat_c/Makefile b/shcat_c/Makefile index 79def5ac..05650dda 100644 --- a/shcat_c/Makefile +++ b/shcat_c/Makefile @@ -6,7 +6,7 @@ # By: rparodi +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/12 11:05:05 by rparodi #+# #+# # -# Updated: 2024/04/28 17:50:28 by maiboyer ### ########.fr # +# Updated: 2024/04/28 19:53:00 by maiboyer ### ########.fr # # # # **************************************************************************** # @@ -22,6 +22,8 @@ END = \033[0m # Rules +NAME = minishell + # All (make all) all: @$(MAKE) --no-print-directory header OBJDIRNAME=$(OBJDIRNAME) @@ -71,13 +73,13 @@ pull: # Clean (make clean) clean: - @printf '$(GREY) Removing $(END)$(RED)Objects$(END)\n' - @printf '$(GREY) Removing $(END)$(RED)Objects Folder$(END)\n' + @echo -e '$(GREY) Removing $(END)$(RED)Objects$(END)' + @echo -e '$(GREY) Removing $(END)$(RED)Objects Folder$(END)' @$(RM) -r $(OBJDIRNAME) # Clean (make fclean) fclean: clean - @printf '$(GREY) Removing $(END)$(RED)Program$(END)\n' + @echo -e '$(GREY) Removing $(END)$(RED)Program$(END)' @$(RM) $(NAME) @echo "" diff --git a/shcat_c/Minishell.mk b/shcat_c/Minishell.mk index c1687296..d580d15e 100644 --- a/shcat_c/Minishell.mk +++ b/shcat_c/Minishell.mk @@ -6,7 +6,7 @@ # By: maiboyer +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/04/28 17:28:30 by maiboyer #+# #+# # -# Updated: 2024/04/28 18:56:27 by maiboyer ### ########.fr # +# Updated: 2024/04/28 19:52:08 by maiboyer ### ########.fr # # # # **************************************************************************** # @@ -35,7 +35,7 @@ SRC = ./sources/ft_cmd.c \ ./sources/node/node.c # Name -NAME = minishell +NAME = minishell LIBDIRNAME = libft SRCDIRNAME = sources @@ -54,9 +54,14 @@ RED = \033[0;31m GOLD = \033[38;5;220m END = \033[0m -.PHONY: $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a +.PHONY: all bonus -all: $(NAME) +all: + @$(MAKE) -C ./stdme/ LIB_NAME="$(shell realpath ./stdme)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libme.a + @$(MAKE) -C ./parser/ LIB_NAME="$(shell realpath ./parser)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a + @$(MAKE) -f./Minishell.mk $(NAME) + +__build_final: $(NAME) # Bonus (make bonus) bonus: $(OBJ) $(LIB_OBJ) $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a @@ -67,7 +72,7 @@ bonus: $(OBJ) $(LIB_OBJ) $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a @cc $(CFLAGS) -D DEBUG=42 -o $(NAME) $(OBJ) -L$(OBJDIRNAME) -lme -lgmr # Dependences for all -$(NAME): $(OBJ) $(LIB_OBJ) $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a +$(NAME): $(OBJ) $(LIB_OBJ) @mkdir -p $(OBJDIRNAME) @mkdir -p $(OBJDIRNAME)/$(LIBDIRNAME) @mkdir -p $(OBJDIRNAME)/$(SRCDIRNAME) @@ -77,11 +82,6 @@ $(NAME): $(OBJ) $(LIB_OBJ) $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a $(OBJDIRNAME)/%.o: %.c @mkdir -p $(dir $@) @printf '$(GREY) Compiling $(END)$(GREEN)$<$(END)\n' - @cc $(CFLAGS) -o $@ -c $< -$(OBJDIRNAME)/libme.a: - @$(MAKE) --no-print-directory -C ./stdme/ LIB_NAME="$(realpath ./$(stdme))/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libme.a - -$(OBJDIRNAME)/libgmr.a: - @$(MAKE) --no-print-directory -C ./parser/ LIB_NAME="$(realpath ./$(stdme))/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a + @cc $(CFLAGS) -o $@ -c $< -include ${OBJ:.o=.d} diff --git a/shcat_c/stdme b/shcat_c/stdme index 559fefe2..1812a562 160000 --- a/shcat_c/stdme +++ b/shcat_c/stdme @@ -1 +1 @@ -Subproject commit 559fefe22084dc18707c8244c26b69e307762226 +Subproject commit 1812a562f473f0ad218fe4b1055ed377f5a020d3