From 929d7d4da5da372e7afea5ae265a03b4cc3bd7b9 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Fri, 9 Jan 2026 14:52:16 +0100 Subject: [PATCH] Makefile base --- Makefile | 24 ++++++++++++++++++++++++ bonus/checker_bonus.c | 3 ++- parsing/disorder.c | 4 +++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d3dca84..5d29c97 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,19 @@ DEP = $(OBJ:.o=.d) # BONUS CONFIG #============================ +BONUS_DIR = bonus +GNL_DIR = bonus/GNL + +BONUS_FILES = $(BONUS_DIR)/ft_bzero.c $(BONUS_DIR)/checker_bonus.c + +GNL_FILES = $(GNL_DIR)/get_next_line.c $(GNL_DIR)/get_next_line_utils.c + +ALL_BONUS_FILES = $(BONUS_FILES) $(GNL_FILES) + +BONUS_OBJ = $(addprefix $(OBJ_DIR)/, $(notdir $(ALL_BONUS_FILES:.c=.o))) + +BONUS = checker .PHONY: all clean fclean re @@ -81,6 +93,12 @@ $(NAME): $(OBJ) @echo "======= PUSH SWAP COMPILED =========" @echo "====================================" +$(BONUS): $(BONUS_OBJ) + @$(CC) $(CFLAGS) -I$(GNL_DIR) $(BONUS_OBJ) -o $(BONUS) + @echo "====================================" + @echo "======= PUSH SWAP COMPILED =========" + @echo "====================================" + $(OBJ_DIR)/%.o: $(PARS_DIR)/%.c | $(OBJ_DIR) $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ @@ -111,6 +129,12 @@ $(OBJ_DIR)/%.o: $(CHECKER_DIR)/%.c | $(OBJ_DIR) $(OBJ_DIR)/%.o: %.c | $(OBJ_DIR) $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ +$(OBJ_DIR)/%.o: $(BONUS_DIR)%.c | $(OBJ_DIR) + $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ + +$(OBJ_DIR)/%.o: $(GNL_DIR)%.c | $(OBJ_DIR) + $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ + $(OBJ_DIR): @mkdir -p $(OBJ_DIR) diff --git a/bonus/checker_bonus.c b/bonus/checker_bonus.c index f025513..616b719 100644 --- a/bonus/checker_bonus.c +++ b/bonus/checker_bonus.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/09 11:46:36 by dgaillet #+# #+# */ -/* Updated: 2026/01/09 14:40:06 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/09 14:51:32 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,7 @@ #include "parsing.h" #include "get_next_line.h" #include +#include static int apply_operation(t_stacks *stacks, char buf[1024]) { diff --git a/parsing/disorder.c b/parsing/disorder.c index 5a4bafd..e1a39d9 100644 --- a/parsing/disorder.c +++ b/parsing/disorder.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/09 11:05:37 by dgaillet #+# #+# */ -/* Updated: 2026/01/09 11:26:24 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/09 14:35:14 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -40,7 +40,9 @@ float compute_disorder(char **strs) total_pairs += 1; if (strs[i] > strs[j]) mistakes += 1; + j++; } + i++; } return (mistakes / total_pairs); }