hmm

Fatihcill · Feb 3, 2022 · 714df56 · 714df56
1 parent 4b04ce4
commit 714df56
Show file tree

Hide file tree

Showing 47 changed files with 10 additions and 46 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/libft/.DS_Store b/libft/.DS_Store
diff --git a/libft/Makefile b/libft/Makefile
@@ -6,16 +6,19 @@
 #    By: fcil <[email protected]>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2022/01/11 17:58:34 by fcil              #+#    #+#              #
-#    Updated: 2022/02/02 16:55:20 by fcil             ###   ########.fr        #
+#    Updated: 2022/02/03 16:48:18 by fcil             ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 NAME = libft.a
-CC = clang
+CC = gcc
 FLAGS = -Wall -Wextra -Werror
-SRC=$(wildcard src/*.c)
+
+SRC = $(shell find . -type f ! -name "ft_lst*.c" -name "ft_*.c")
 
 OBJ = $(SRC:.c=.o)
+BSRC	:= $(wildcard ft_lst*.c)
+B_OBJ	:= $(BSRC:%.c=%.o)
 
 %.o: %.c
 	$(CC) $(FLAGS) -c $< -o $@
@@ -25,8 +28,10 @@ $(NAME): $(OBJ)
 
 all: $(NAME)
 
+bonus: $(OBJ) $(B_OBJ)
+	ar -rc $(NAME) $(OBJ) $(B_OBJ)
 clean: 
-	rm -f $(OBJ)
+	rm -f *.o
 
 fclean: clean
 		rm -f $(NAME)
@@ -35,45 +40,4 @@ re: fclean all
 
 main: main.c $(NAME)
 	$(CC) $(FLAGS) main.c $(NAME) -o main
-	./main
-
-
-# NAME = libft.a
-# CC = clang
-# FLAGS = -Wall -Wextra -Werror
-# SOURCE = ft_isalnum.c ft_isprint.c ft_memcmp.c ft_putchar_fd.c ft_split.c \
-# 			ft_strlcat.c ft_strncmp.c ft_substr.c ft_atoi.c ft_isalpha.c \
-# 			ft_itoa.c ft_memcpy.c ft_putendl_fd.c ft_strchr.c ft_strlcpy.c \
-# 			ft_strnstr.c ft_tolower.c ft_bzero.c ft_isascii.c \
-# 			ft_memmove.c ft_putnbr_fd.c ft_strdup.c ft_strlen.c ft_strrchr.c \
-# 			ft_toupper.c ft_calloc.c ft_isdigit.c ft_memchr.c ft_memset.c  \
-# 			ft_putstr_fd.c ft_strjoin.c ft_strmapi.c ft_strtrim.c ft_striteri.c
-# OBJ = $(SOURCE:.c=.o)
-# BONUS = ft_lstnew.c ft_lstadd_front.c ft_lstadd_back.c ft_lstsize.c \
-# 			ft_lstlast.c ft_lstdelone.c ft_lstclear.c
-# B_OBJ = $(BONUS:.c=.o)
-
-# %.o: %.c
-# 	$(CC) $(FLAGS) -c $< -o $@
-
-# all: $(NAME)
-
-# $(NAME): $(OBJ)
-# 	ar -rc $(NAME) $(OBJ)
-
-# bonus: $(B_OBJ)
-# 	ar -rc $(NAME) $(B_OBJ)
-
-# clean:
-# 	rm -f $(OBJ) $(B_OBJ)
-
-# fclean: clean
-# 	rm -f $(NAME)
-
-# re: fclean all
-
-# .PHONY: all clean fclean re main bonus
-
-# main: main.c $(OBJ) $(NAME)
-# 	$(CC) -lbsd $(FLAGS) main.c $(NAME) -o main
-# 	./main
+	./main
diff --git a/libft/src/ft_atoi.c → libft/ft_atoi.c b/libft/src/ft_atoi.c → libft/ft_atoi.c
diff --git a/libft/src/ft_bzero.c → libft/ft_bzero.c b/libft/src/ft_bzero.c → libft/ft_bzero.c
diff --git a/libft/src/ft_calloc.c → libft/ft_calloc.c b/libft/src/ft_calloc.c → libft/ft_calloc.c
diff --git a/libft/src/ft_isalnum.c → libft/ft_isalnum.c b/libft/src/ft_isalnum.c → libft/ft_isalnum.c
diff --git a/libft/src/ft_isalpha.c → libft/ft_isalpha.c b/libft/src/ft_isalpha.c → libft/ft_isalpha.c
diff --git a/libft/src/ft_isascii.c → libft/ft_isascii.c b/libft/src/ft_isascii.c → libft/ft_isascii.c
diff --git a/libft/src/ft_isdigit.c → libft/ft_isdigit.c b/libft/src/ft_isdigit.c → libft/ft_isdigit.c
diff --git a/libft/src/ft_isprint.c → libft/ft_isprint.c b/libft/src/ft_isprint.c → libft/ft_isprint.c
diff --git a/libft/src/ft_itoa.c → libft/ft_itoa.c b/libft/src/ft_itoa.c → libft/ft_itoa.c
diff --git a/libft/bonus/ft_lstadd_back.c → libft/ft_lstadd_back.c b/libft/bonus/ft_lstadd_back.c → libft/ft_lstadd_back.c
diff --git a/libft/bonus/ft_lstadd_front.c → libft/ft_lstadd_front.c b/libft/bonus/ft_lstadd_front.c → libft/ft_lstadd_front.c
diff --git a/libft/bonus/ft_lstclear.c → libft/ft_lstclear.c b/libft/bonus/ft_lstclear.c → libft/ft_lstclear.c
diff --git a/libft/bonus/ft_lstdelone.c → libft/ft_lstdelone.c b/libft/bonus/ft_lstdelone.c → libft/ft_lstdelone.c
diff --git a/libft/bonus/ft_lstiter.c → libft/ft_lstiter.c b/libft/bonus/ft_lstiter.c → libft/ft_lstiter.c
diff --git a/libft/bonus/ft_lstlast.c → libft/ft_lstlast.c b/libft/bonus/ft_lstlast.c → libft/ft_lstlast.c
diff --git a/libft/bonus/ft_lstmap.c → libft/ft_lstmap.c b/libft/bonus/ft_lstmap.c → libft/ft_lstmap.c
diff --git a/libft/bonus/ft_lstnew.c → libft/ft_lstnew.c b/libft/bonus/ft_lstnew.c → libft/ft_lstnew.c
diff --git a/libft/bonus/ft_lstsize.c → libft/ft_lstsize.c b/libft/bonus/ft_lstsize.c → libft/ft_lstsize.c
diff --git a/libft/src/ft_memchr.c → libft/ft_memchr.c b/libft/src/ft_memchr.c → libft/ft_memchr.c
diff --git a/libft/src/ft_memcmp.c → libft/ft_memcmp.c b/libft/src/ft_memcmp.c → libft/ft_memcmp.c
diff --git a/libft/src/ft_memcpy.c → libft/ft_memcpy.c b/libft/src/ft_memcpy.c → libft/ft_memcpy.c
diff --git a/libft/src/ft_memmove.c → libft/ft_memmove.c b/libft/src/ft_memmove.c → libft/ft_memmove.c
diff --git a/libft/src/ft_memset.c → libft/ft_memset.c b/libft/src/ft_memset.c → libft/ft_memset.c
diff --git a/libft/src/ft_putchar_fd.c → libft/ft_putchar_fd.c b/libft/src/ft_putchar_fd.c → libft/ft_putchar_fd.c
diff --git a/libft/src/ft_putendl_fd.c → libft/ft_putendl_fd.c b/libft/src/ft_putendl_fd.c → libft/ft_putendl_fd.c
diff --git a/libft/src/ft_putnbr_fd.c → libft/ft_putnbr_fd.c b/libft/src/ft_putnbr_fd.c → libft/ft_putnbr_fd.c
diff --git a/libft/src/ft_putstr_fd.c → libft/ft_putstr_fd.c b/libft/src/ft_putstr_fd.c → libft/ft_putstr_fd.c
diff --git a/libft/src/ft_split.c → libft/ft_split.c b/libft/src/ft_split.c → libft/ft_split.c
diff --git a/libft/src/ft_strchr.c → libft/ft_strchr.c b/libft/src/ft_strchr.c → libft/ft_strchr.c
diff --git a/libft/src/ft_strdup.c → libft/ft_strdup.c b/libft/src/ft_strdup.c → libft/ft_strdup.c
diff --git a/libft/src/ft_striteri.c → libft/ft_striteri.c b/libft/src/ft_striteri.c → libft/ft_striteri.c
diff --git a/libft/src/ft_strjoin.c → libft/ft_strjoin.c b/libft/src/ft_strjoin.c → libft/ft_strjoin.c
diff --git a/libft/src/ft_strlcat.c → libft/ft_strlcat.c b/libft/src/ft_strlcat.c → libft/ft_strlcat.c
diff --git a/libft/src/ft_strlcpy.c → libft/ft_strlcpy.c b/libft/src/ft_strlcpy.c → libft/ft_strlcpy.c
diff --git a/libft/src/ft_strlen.c → libft/ft_strlen.c b/libft/src/ft_strlen.c → libft/ft_strlen.c
diff --git a/libft/src/ft_strmapi.c → libft/ft_strmapi.c b/libft/src/ft_strmapi.c → libft/ft_strmapi.c
diff --git a/libft/src/ft_strncmp.c → libft/ft_strncmp.c b/libft/src/ft_strncmp.c → libft/ft_strncmp.c
diff --git a/libft/src/ft_strnstr.c → libft/ft_strnstr.c b/libft/src/ft_strnstr.c → libft/ft_strnstr.c
diff --git a/libft/src/ft_strrchr.c → libft/ft_strrchr.c b/libft/src/ft_strrchr.c → libft/ft_strrchr.c
diff --git a/libft/src/ft_strtrim.c → libft/ft_strtrim.c b/libft/src/ft_strtrim.c → libft/ft_strtrim.c
diff --git a/libft/src/ft_substr.c → libft/ft_substr.c b/libft/src/ft_substr.c → libft/ft_substr.c
diff --git a/libft/src/ft_tolower.c → libft/ft_tolower.c b/libft/src/ft_tolower.c → libft/ft_tolower.c
diff --git a/libft/src/ft_toupper.c → libft/ft_toupper.c b/libft/src/ft_toupper.c → libft/ft_toupper.c
diff --git a/libft/include/libft.h → libft/libft.h b/libft/include/libft.h → libft/libft.h