From 3433a95dddac9ffac6a12cbfe357bb493a5b348b Mon Sep 17 00:00:00 2001 From: David Gailleton Date: Tue, 11 Nov 2025 16:33:30 +0100 Subject: [PATCH] fix make file crash with depedencies --- Makefile | 140 +++++++++++++++++++++---------------------- ft_isdigit.c | 2 +- ft_lstdelone_bonus.c | 4 +- 3 files changed, 72 insertions(+), 74 deletions(-) diff --git a/Makefile b/Makefile index 8099728..9abd5b2 100644 --- a/Makefile +++ b/Makefile @@ -1,102 +1,98 @@ -CC = cc +CC= cc -AR = ar +AR= ar -ARFLAGS = rc +ARFLAGS= rc -HEADER = libft.h +HEADER= libft.h -CFLAGS = -Wall -Wextra -Werror +CFLAGS= -Wall \ + -Wextra \ + -Werror -NAME = libft.a +NAME= libft.a -SRC = 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_memcmp.c \ - ft_memchr.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 +SRC= ft_isdigit.c \ + ft_isalpha.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_memcmp.c \ + ft_memchr.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 -BONUS_SRC = ft_lstnew_bonus.c \ - ft_lstadd_front_bonus.c \ - ft_lstsize_bonus.c \ - ft_lstlast_bonus.c \ - ft_lstadd_back_bonus.c \ - ft_lstdelone_bonus.c \ - ft_lstclear_bonus.c \ - ft_lstiter_bonus.c \ - ft_lstmap_bonus.c +BONUS_SRC= ft_lstnew_bonus.c \ + ft_lstadd_front_bonus.c \ + ft_lstsize_bonus.c \ + ft_lstlast_bonus.c \ + ft_lstadd_back_bonus.c \ + ft_lstdelone_bonus.c \ + ft_lstclear_bonus.c \ + ft_lstiter_bonus.c \ + ft_lstmap_bonus.c -OBJ = $(SRC:.c=.o) +OBJ= $(SRC:.c=.o) -BONUS_OBJ = $(BONUS_SRC:.c=.o) +BONUS_OBJ= $(BONUS_SRC:.c=.o) -DEP = $(SRC:.c=.d) +DEP= $(SRC:.c=.d) -BONUS_DEP = $(BONUS_SRC:.c=.d) +BONUS_DEP= $(BONUS_SRC:.c=.d) -ALL_SRC = $(SRC) $(BONUS_SRC) +ALL_SRC= $(SRC) $(BONUS_SRC) -ALL_OBJ = $(OBJ) $(BONUS_OBJ) +ALL_OBJ= $(OBJ) $(BONUS_OBJ) -ALL_DEP = $(DEP) $(BONUS_DEP) +ALL_DEP= $(DEP) $(BONUS_DEP) + +%.o: %.c + $(CC) -MMD -MP -o $@ -c $< $(CFLAGS) -I$(HEADER) -%.o: %.c - $(CC) -o $@ -c $< $(CFLAGS) -I$(HEADER) - -%.d: %.c - @set -e; rm -f $@; \ - $(CC) -M $(CFLAGS) $< > $@.$$$$; \ - sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ - rm -f $@.$$$$ - -$(NAME): $(OBJ) $(DEP) +$(NAME): $(OBJ) $(AR) $(ARFLAGS) $(NAME) $(OBJ) ranlib $(NAME) -all: $(NAME) +all: $(NAME) -bonus: $(ALL_OBJ) $(ALL_DEP) - $(AR) $(ARFLAGS) $(NAME) $(OBJ) $(BONUS_OBJ) +bonus: $(ALL_OBJ) + $(AR) $(ARFLAGS) $(NAME) $(ALL_OBJ) ranlib $(NAME) -clean: - rm -f $(OBJ) $(BONUS_OBJ) +clean: + rm -f $(ALL_OBJ) $(ALL_DEP) fclean: clean rm -f $(NAME) re: fclean all --include $(ALL_DEP) +-include $(ALL_DEP) .PHONY: all clean fclean re bonus diff --git a/ft_isdigit.c b/ft_isdigit.c index 0b25ac9..79cd935 100644 --- a/ft_isdigit.c +++ b/ft_isdigit.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/11/05 09:57:01 by dgaillet #+# #+# */ -/* Updated: 2025/11/05 21:08:46 by dgaillet ### ########lyon.fr */ +/* Updated: 2025/11/11 15:45:19 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_lstdelone_bonus.c b/ft_lstdelone_bonus.c index 07cf243..87da2fd 100644 --- a/ft_lstdelone_bonus.c +++ b/ft_lstdelone_bonus.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/11/09 15:22:02 by dgaillet #+# #+# */ -/* Updated: 2025/11/10 18:19:01 by dgaillet ### ########lyon.fr */ +/* Updated: 2025/11/11 16:10:09 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,8 @@ void ft_lstdelone(t_list *lst, void (*del)(void *)) { + if (!lst) + return ; del(lst->content); free(lst); }