From 776ccfa9c0421226da1b6c254791390f8fa4b730 Mon Sep 17 00:00:00 2001 From: Maix0 Date: Wed, 3 Jul 2024 22:41:19 +0200 Subject: [PATCH] Updated Makefile to properly align and make linking pop out --- Minishell.mk | 6 +++--- allocator/Makefile | 11 ++++++----- ast/Makefile | 5 +++-- math/Makefile | 2 +- parser/Grammar.mk | 4 ++-- parser/Parser.mk | 4 ++-- stdme/Makefile | 5 +++-- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Minishell.mk b/Minishell.mk index f0b14a17..ce9fb23a 100644 --- a/Minishell.mk +++ b/Minishell.mk @@ -72,18 +72,18 @@ bonus: $(OBJ) $(LIBS_FILES) @mkdir -p $(BUILD_DIR) @mkdir -p $(BUILD_DIR)/$(SRCDIRNAME) @echo -e '$(GREY) Be Carefull ur in $(END)$(GREEN)Debug Mode$(END)' - @echo -e '$(GREY) Linking\t$(END)$(GREEN)$(NAME)$(END)' + @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)' @$(CC) $(CFLAGS) -DDEBUG=1 -o $(NAME) $(OBJ) -L$(BUILD_DIR) $(call link_group,$(LIBS_FLAGS)) # Dependences for all $(NAME): $(OBJ) $(LIBS_FILES) - @echo -e '$(GREY) Linking\t$(END)$(GREEN)$(NAME)$(END)' + @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)' @$(CC) $(CFLAGS) -o $(NAME) $(OBJ) -L$(BUILD_DIR) $(call link_group,$(LIBS_FLAGS)) # Creating the objects $(BUILD_DIR)/sh/%.o: %.c @mkdir -p $(dir $@) - @echo -e '$(GREY) Compiling\t$(END)$(GREEN)$<$(END)' + @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)' @$(CC) $(CFLAGS) -o $@ -c $< -include ${OBJ:.o=.d} diff --git a/allocator/Makefile b/allocator/Makefile index d9df6378..6110a831 100644 --- a/allocator/Makefile +++ b/allocator/Makefile @@ -6,7 +6,7 @@ # By: maiboyer +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # -# Updated: 2024/05/30 16:02:45 by maiboyer ### ########.fr # +# Updated: 2024/07/03 22:39:16 by maiboyer ### ########.fr # # # # **************************************************************************** # @@ -37,11 +37,12 @@ DEPS = $(addsuffix .d,$(addprefix $(BUILD_DIR)/aq/,$(SRC_FILES))) LIBS = $(addprefix $(LIBS_DIR)/,$(LIBS_NAME)) INCLUDES = $(addprefix -I,$(foreach P,$(INCLUDE_DIR) $(LIBS) $(addsuffix /include,$(LIBS)) vendor $(addsuffix /vendor,$(LIBS)),$(realpath $(P)))) -COL_GRAY = \033[90m -COL_WHITE = \033[37m -COL_GREEN = \033[32m COL_BOLD = \033[1m +COL_GOLD = \033[33m +COL_GRAY = \033[90m +COL_GREEN = \033[32m COL_RESET = \033[0m +COL_WHITE = \033[37m # TODO: REMOVE FOR RENDU !!!!! CFLAGS += -DPRINT_BACKTRACE @@ -54,7 +55,7 @@ all: $(NAME) $(NAME): $(TARGET) $(TARGET): $(OBJ) - @echo -e '$(COL_GRAY) Linking\t$(COL_GREEN)$(TARGET)$(COL_RESET)' + @echo -e '$(COL_GRAY) Linking \t$(COL_GOLD)$(TARGET)$(COL_RESET)' @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) $(BUILD_DIR)/aq/%.o: $(SRC_DIR)/%.c diff --git a/ast/Makefile b/ast/Makefile index 1781bbcd..e6ae6e1a 100644 --- a/ast/Makefile +++ b/ast/Makefile @@ -6,7 +6,7 @@ # By: maiboyer +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # -# Updated: 2024/06/17 13:12:53 by maiboyer ### ########.fr # +# Updated: 2024/07/03 22:39:28 by maiboyer ### ########.fr # # # # **************************************************************************** # @@ -38,6 +38,7 @@ DEPS = $(addsuffix .d,$(addprefix $(BUILD_DIR)/ast/,$(SRC_FILES))) LIBS = $(addprefix $(LIBS_DIR)/,$(LIBS_NAME)) INCLUDES = $(addprefix -I,$(foreach P,$(INCLUDE_DIR) $(LIBS) $(addsuffix /include,$(LIBS)) vendor $(addsuffix /vendor,$(LIBS)),$(realpath $(P)))) +COL_GOLD = \033[33m COL_GRAY = \033[90m COL_WHITE = \033[37m COL_GREEN = \033[32m @@ -55,7 +56,7 @@ all: $(NAME) $(NAME): $(TARGET) $(TARGET): $(OBJ) - @echo -e '$(COL_GRAY) Linking\t$(COL_GREEN)$(TARGET)$(COL_RESET)' + @echo -e '$(COL_GRAY) Linking \t$(COL_GOLD)$(TARGET)$(COL_RESET)' @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) $(BUILD_DIR)/ast/%.o: $(SRC_DIR)/%.c diff --git a/math/Makefile b/math/Makefile index 6d593eef..55c95e1d 100644 --- a/math/Makefile +++ b/math/Makefile @@ -90,7 +90,7 @@ $(NAME): $(OBJ) $(LIB_OBJ) # Creating the objects $(OBJDIRNAME)/%.o: %.c @mkdir -p $(dir $@) - @printf '$(GREY) Compiling $(END)$(GREEN)$<$(END)\n' + @printf '$(GREY) Building $(END)$(GREEN)$<$(END)\n' @cc $(CFLAGS) -o $@ -c $< # Header diff --git a/parser/Grammar.mk b/parser/Grammar.mk index 0443ed92..5d8d0e7e 100644 --- a/parser/Grammar.mk +++ b/parser/Grammar.mk @@ -50,12 +50,12 @@ all: $(NAME) $(NAME): $(TARGET) $(TARGET): $(OBJ) - @echo -e '$(GREY) Linking\t$(END)$(GREEN)$(NAME)$(END)' + @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)' @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) $(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c @mkdir -p $(dir $@) - @echo -e '$(GREY) Compiling\t$(END)$(GREEN)$<$(END)' + @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)' @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ clean: diff --git a/parser/Parser.mk b/parser/Parser.mk index fb2af0ce..0a9534f9 100644 --- a/parser/Parser.mk +++ b/parser/Parser.mk @@ -46,12 +46,12 @@ $(NAME): $(TARGET) $(TARGET): $(OBJ) @#echo "ar rcs $(BUILD_DIR)/$(NAME) " - @echo -e '$(GREY) Linking\t$(END)$(GREEN)$(NAME)$(END)' + @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)' @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) $(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c @mkdir -p $(dir $@) - @echo -e '$(GREY) Compiling\t$(END)$(GREEN)$<$(END)' + @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)' @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ clean: diff --git a/stdme/Makefile b/stdme/Makefile index f70060b9..6615b0f8 100644 --- a/stdme/Makefile +++ b/stdme/Makefile @@ -6,7 +6,7 @@ # By: maiboyer +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # -# Updated: 2024/05/25 16:28:21 by maiboyer ### ########.fr # +# Updated: 2024/07/03 22:39:36 by maiboyer ### ########.fr # # # # **************************************************************************** # @@ -49,6 +49,7 @@ COL_WHITE = \033[37m COL_GREEN = \033[32m COL_BOLD = \033[1m COL_RESET = \033[0m +COL_GOLD = \033[33m # TODO: REMOVE FOR RENDU !!!!! CFLAGS += -DPRINT_BACKTRACE @@ -61,7 +62,7 @@ all: $(NAME) $(NAME): $(TARGET) $(TARGET): $(OBJ) - @echo -e '$(COL_GRAY) Linking\t$(COL_GREEN)$(TARGET)$(COL_RESET)' + @echo -e '$(COL_GRAY) Linking \t$(COL_GOLD)$(TARGET)$(COL_RESET)' @#$(CC) $(INCLUDES) $(OBJ) $(CFLAGS) -o $(NAME) @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ)