da7e/42-libft
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix make file crash with depedencies

Browse Source
This commit is contained in:
David Gailleton
2025-11-11 16:33:30 +01:00
parent a3e7a3d556
commit 3433a95ddd
3 changed files with 72 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Makefile
View File

@@ -1,17 +1,19 @@
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 \ SRC= ft_isdigit.c \
ft_isdigit.c \ ft_isalpha.c \
ft_isalnum.c \ ft_isalnum.c \
ft_isascii.c \ ft_isascii.c \
ft_isprint.c \ ft_isprint.c \
@@ -45,7 +47,7 @@ SRC = ft_isalpha.c \
ft_putendl_fd.c \ ft_putendl_fd.c \
ft_putnbr_fd.c ft_putnbr_fd.c
BONUS_SRC = ft_lstnew_bonus.c \ BONUS_SRC= ft_lstnew_bonus.c \
ft_lstadd_front_bonus.c \ ft_lstadd_front_bonus.c \
ft_lstsize_bonus.c \ ft_lstsize_bonus.c \
ft_lstlast_bonus.c \ ft_lstlast_bonus.c \
@@ -55,42 +57,36 @@ BONUS_SRC = ft_lstnew_bonus.c \
ft_lstiter_bonus.c \ ft_lstiter_bonus.c \
ft_lstmap_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 %.o: %.c
$(CC) -o $@ -c $< $(CFLAGS) -I$(HEADER) $(CC) -MMD -MP -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) $(AR) $(ARFLAGS) $(NAME) $(OBJ)
ranlib $(NAME) ranlib $(NAME)
all: $(NAME) all: $(NAME)
bonus: $(ALL_OBJ) $(ALL_DEP) bonus: $(ALL_OBJ)
$(AR) $(ARFLAGS) $(NAME) $(OBJ) $(BONUS_OBJ) $(AR) $(ARFLAGS) $(NAME) $(ALL_OBJ)
ranlib $(NAME) ranlib $(NAME)
clean: clean:
rm -f $(OBJ) $(BONUS_OBJ) rm -f $(ALL_OBJ) $(ALL_DEP)
fclean: clean fclean: clean
rm -f $(NAME) rm -f $(NAME)

2
ft_isdigit.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/05 09:57:01 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

4
ft_lstdelone_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/09 15:22:02 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 *)) void ft_lstdelone(t_list *lst, void (*del)(void *))
{ {
if (!lst)
return ;
del(lst->content); del(lst->content);
free(lst); free(lst);
} }