ATERCATES · ATERCATES · Nov 29, 2025 · Nov 29, 2025
diff --git a/.github/workflows/pipeline.yml.backup b/.github/workflows/pipeline.yml.backup
diff --git a/Makefile b/Makefile
@@ -6,45 +6,91 @@
 #    By: javifer2 <javifer2@student.42barcelona.co  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/05/22 18:00:37 by javifer2          #+#    #+#              #
-#    Updated: 2025/11/03 15:39:22 by javifer2         ###   ########.fr        #
+#    Updated: 2025/11/29 14:23:00 by javifer2         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-NAME = libft.a
-CC = cc
-CFLAGS = -Wall -Wextra -Werror
+NAME		= libft.a
 
-SRCS = ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_strlen.c ft_memset.c \
-	   ft_bzero.c ft_memcpy.c ft_memmove.c ft_strlcpy.c ft_strlcat.c ft_toupper.c ft_tolower.c \
-	   ft_strchr.c ft_strrchr.c ft_strncmp.c ft_memchr.c ft_memcmp.c ft_strnstr.c ft_atoi.c \
-	   ft_calloc.c ft_strdup.c ft_substr.c ft_strjoin.c ft_strtrim.c ft_split.c ft_itoa.c \
-	   ft_strmapi.c ft_striteri.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c
+# Compilador y flags
+CC			= cc
+CFLAGS		= -Wall -Wextra -Werror
+INCLUDES	= -I include
 
-BONUS_SRCS = ft_lstnew.c ft_lstadd_front.c ft_lstsize.c ft_lstlast.c \
-             ft_lstadd_back.c ft_lstdelone.c ft_lstclear.c ft_lstiter.c \
-             ft_lstmap.c
+# Directorios
+SRC_DIR		= src
+OBJ_DIR		= obj
+INC_DIR		= include
 
-OBJS = $(SRCS:.c=.o)
-BONUS_OBJS = $(BONUS_SRCS:.c=.o)
+# Subdirectorios de src
+CHAR_DIR	= $(SRC_DIR)/char
+STR_DIR		= $(SRC_DIR)/str
+MEM_DIR		= $(SRC_DIR)/mem
+CONV_DIR	= $(SRC_DIR)/conv
+FD_DIR		= $(SRC_DIR)/fd
+LST_DIR		= $(SRC_DIR)/lst
 
-AR = ar -rcs
+# Archivos fuente por categoría
+CHAR_SRC	= ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c \
+			  ft_isprint.c ft_toupper.c ft_tolower.c
 
+STR_SRC		= ft_strlen.c ft_strchr.c ft_strrchr.c ft_strncmp.c \
+			  ft_strnstr.c ft_strdup.c ft_strlcpy.c ft_strlcat.c \
+			  ft_substr.c ft_strjoin.c ft_strtrim.c ft_split.c \
+			  ft_strmapi.c ft_striteri.c
+
+MEM_SRC		= ft_memset.c ft_bzero.c ft_memcpy.c ft_memmove.c \
+			  ft_memchr.c ft_memcmp.c ft_calloc.c
+
+CONV_SRC	= ft_atoi.c ft_itoa.c
+
+FD_SRC		= ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c
+
+LST_SRC		= ft_lstnew.c ft_lstadd_front.c ft_lstadd_back.c ft_lstsize.c \
+			  ft_lstlast.c ft_lstdelone.c ft_lstclear.c ft_lstiter.c ft_lstmap.c
+
+# Rutas completas de fuentes
+SRCS		= $(addprefix $(CHAR_DIR)/, $(CHAR_SRC)) \
+			  $(addprefix $(STR_DIR)/, $(STR_SRC)) \
+			  $(addprefix $(MEM_DIR)/, $(MEM_SRC)) \
+			  $(addprefix $(CONV_DIR)/, $(CONV_SRC)) \
+			  $(addprefix $(FD_DIR)/, $(FD_SRC))
+
+BONUS_SRCS	= $(addprefix $(LST_DIR)/, $(LST_SRC))
+
+# Objetos
+OBJS		= $(SRCS:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
+BONUS_OBJS	= $(BONUS_SRCS:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
+
+# Colores para output
+GREEN		= \033[0;32m
+YELLOW		= \033[0;33m
+RESET		= \033[0m
+
+# Reglas
 all: $(NAME)
 
-$(NAME): $(OBJS) Makefile libft.h
-	$(AR) $(NAME) $(OBJS)
+$(NAME): $(OBJS)
+	@ar rcs $(NAME) $(OBJS)
+	@echo "$(GREEN)✓ $(NAME) compilado$(RESET)"
 
 bonus: $(OBJS) $(BONUS_OBJS)
-	$(AR) $(NAME) $(OBJS) $(BONUS_OBJS)
+	@ar rcs $(NAME) $(OBJS) $(BONUS_OBJS)
+	@echo "$(GREEN)✓ $(NAME) compilado con bonus$(RESET)"
 
-%.o: %.c libft.h Makefile
-	$(CC) $(CFLAGS) -c -o $@ $<
+# Crear directorios obj y compilar .c a .o
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(INC_DIR)/libft.h
+	@mkdir -p $(dir $@)
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo "$(YELLOW)Compilando: $<$(RESET)"
 
 clean:
-	rm -f $(OBJS) $(BONUS_OBJS)
+	@rm -rf $(OBJ_DIR)
+	@echo "$(GREEN)✓ Objetos eliminados$(RESET)"
 
 fclean: clean
-	rm -f $(NAME)
+	@rm -f $(NAME)
+	@echo "$(GREEN)✓ $(NAME) eliminado$(RESET)"
 
 re: fclean all
 

diff --git a/libft.h → include/libft.h b/libft.h → include/libft.h
diff --git a/ft_isalnum.c → src/char/ft_isalnum.c b/ft_isalnum.c → src/char/ft_isalnum.c
diff --git a/ft_isalpha.c → src/char/ft_isalpha.c b/ft_isalpha.c → src/char/ft_isalpha.c
diff --git a/ft_isascii.c → src/char/ft_isascii.c b/ft_isascii.c → src/char/ft_isascii.c
diff --git a/ft_isdigit.c → src/char/ft_isdigit.c b/ft_isdigit.c → src/char/ft_isdigit.c
diff --git a/ft_isprint.c → src/char/ft_isprint.c b/ft_isprint.c → src/char/ft_isprint.c
diff --git a/ft_tolower.c → src/char/ft_tolower.c b/ft_tolower.c → src/char/ft_tolower.c
diff --git a/ft_toupper.c → src/char/ft_toupper.c b/ft_toupper.c → src/char/ft_toupper.c
diff --git a/ft_atoi.c → src/conv/ft_atoi.c b/ft_atoi.c → src/conv/ft_atoi.c
diff --git a/ft_itoa.c → src/conv/ft_itoa.c b/ft_itoa.c → src/conv/ft_itoa.c
diff --git a/ft_putchar_fd.c → src/fd/ft_putchar_fd.c b/ft_putchar_fd.c → src/fd/ft_putchar_fd.c
diff --git a/ft_putendl_fd.c → src/fd/ft_putendl_fd.c b/ft_putendl_fd.c → src/fd/ft_putendl_fd.c
diff --git a/ft_putnbr_fd.c → src/fd/ft_putnbr_fd.c b/ft_putnbr_fd.c → src/fd/ft_putnbr_fd.c
diff --git a/ft_putstr_fd.c → src/fd/ft_putstr_fd.c b/ft_putstr_fd.c → src/fd/ft_putstr_fd.c
diff --git a/ft_lstadd_back.c → src/lst/ft_lstadd_back.c b/ft_lstadd_back.c → src/lst/ft_lstadd_back.c
diff --git a/ft_lstadd_front.c → src/lst/ft_lstadd_front.c b/ft_lstadd_front.c → src/lst/ft_lstadd_front.c
diff --git a/ft_lstclear.c → src/lst/ft_lstclear.c b/ft_lstclear.c → src/lst/ft_lstclear.c
diff --git a/ft_lstdelone.c → src/lst/ft_lstdelone.c b/ft_lstdelone.c → src/lst/ft_lstdelone.c
diff --git a/ft_lstiter.c → src/lst/ft_lstiter.c b/ft_lstiter.c → src/lst/ft_lstiter.c
diff --git a/ft_lstlast.c → src/lst/ft_lstlast.c b/ft_lstlast.c → src/lst/ft_lstlast.c
diff --git a/ft_lstmap.c → src/lst/ft_lstmap.c b/ft_lstmap.c → src/lst/ft_lstmap.c
diff --git a/ft_lstnew.c → src/lst/ft_lstnew.c b/ft_lstnew.c → src/lst/ft_lstnew.c
diff --git a/ft_lstsize.c → src/lst/ft_lstsize.c b/ft_lstsize.c → src/lst/ft_lstsize.c
diff --git a/ft_bzero.c → src/mem/ft_bzero.c b/ft_bzero.c → src/mem/ft_bzero.c
diff --git a/ft_calloc.c → src/mem/ft_calloc.c b/ft_calloc.c → src/mem/ft_calloc.c
diff --git a/ft_memchr.c → src/mem/ft_memchr.c b/ft_memchr.c → src/mem/ft_memchr.c
diff --git a/ft_memcmp.c → src/mem/ft_memcmp.c b/ft_memcmp.c → src/mem/ft_memcmp.c
diff --git a/ft_memcpy.c → src/mem/ft_memcpy.c b/ft_memcpy.c → src/mem/ft_memcpy.c
diff --git a/ft_memmove.c → src/mem/ft_memmove.c b/ft_memmove.c → src/mem/ft_memmove.c
diff --git a/ft_memset.c → src/mem/ft_memset.c b/ft_memset.c → src/mem/ft_memset.c
diff --git a/ft_split.c → src/str/ft_split.c b/ft_split.c → src/str/ft_split.c
diff --git a/ft_strchr.c → src/str/ft_strchr.c b/ft_strchr.c → src/str/ft_strchr.c
diff --git a/ft_strdup.c → src/str/ft_strdup.c b/ft_strdup.c → src/str/ft_strdup.c
diff --git a/ft_striteri.c → src/str/ft_striteri.c b/ft_striteri.c → src/str/ft_striteri.c
diff --git a/ft_strjoin.c → src/str/ft_strjoin.c b/ft_strjoin.c → src/str/ft_strjoin.c
diff --git a/ft_strlcat.c → src/str/ft_strlcat.c b/ft_strlcat.c → src/str/ft_strlcat.c
diff --git a/ft_strlcpy.c → src/str/ft_strlcpy.c b/ft_strlcpy.c → src/str/ft_strlcpy.c
diff --git a/ft_strlen.c → src/str/ft_strlen.c b/ft_strlen.c → src/str/ft_strlen.c
diff --git a/ft_strmapi.c → src/str/ft_strmapi.c b/ft_strmapi.c → src/str/ft_strmapi.c
diff --git a/ft_strncmp.c → src/str/ft_strncmp.c b/ft_strncmp.c → src/str/ft_strncmp.c
diff --git a/ft_strnstr.c → src/str/ft_strnstr.c b/ft_strnstr.c → src/str/ft_strnstr.c
diff --git a/ft_strrchr.c → src/str/ft_strrchr.c b/ft_strrchr.c → src/str/ft_strrchr.c
diff --git a/ft_strtrim.c → src/str/ft_strtrim.c b/ft_strtrim.c → src/str/ft_strtrim.c
diff --git a/ft_substr.c → src/str/ft_substr.c b/ft_substr.c → src/str/ft_substr.c