From 7341246f5345b9232a872cb2db3704189d730a66 Mon Sep 17 00:00:00 2001 From: whaffman Date: Mon, 4 Nov 2024 13:28:08 +0100 Subject: [PATCH] Makefile LIBFT INCLUDES ETC --- .gitignore | 6 ++--- Makefile | 25 ++++++++--------- inc/libft.h | 77 ----------------------------------------------------- 3 files changed, 14 insertions(+), 94 deletions(-) delete mode 100644 inc/libft.h diff --git a/.gitignore b/.gitignore index 5d80c30..52250be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ a.out -.o -.a +*.o +*.a *~ -.vscode +.vscode/ push_swap obj/ lib/ diff --git a/Makefile b/Makefile index 1d6964c..83739c2 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: whaffman +#+ +:+ +#++#++:++#++ # # +#+ +#+#+ +#++#+ +#+ \o/ # # Created: 2024/10/15 11:48:46 by whaffman #+#+# #+#+# #+# #+# | # -# Updated: 2024/10/15 12:40:48 by whaffman ### ### ### ### / \ # +# Updated: 2024/11/04 13:26:31 by whaffman ### ### ### ### / \ # # # # **************************************************************************** # @@ -14,7 +14,8 @@ NAME = push_swap SRC_PATH = src INC_PATH = inc -LIB_PATH = lib +LIBFT_INC_PATH = libft/inc +LIBFT = libft/libft.a OBJ_PATH = obj VPATH = $(SRC_PATH) @@ -26,20 +27,16 @@ OBJECTS = $(addprefix $(OBJ_PATH)/, $(SOURCES:.c=.o)) CC = cc RM = rm -rf -CFLAGS = -Wall -Wextra -Werror -I./$(INC_PATH) -LDFLAGS = -L./lib +INCLUDES = -I./$(INC_PATH) -I./$(LIBFT_INC_PATH) +CFLAGS = -Wall -Wextra -Werror +LDFLAGS = -L./libft LDLIBS = -lft all: $(NAME) -$(LIB_PATH)/libft.a: +$(LIBFT): @echo "Make Libft and add the archive to lib and the header to inc" @$(MAKE) -sC libft - @$(MAKE) -sC libft clean - @mkdir -p $(INC_PATH) - @mkdir -p $(LIB_PATH) - @cp libft/inc/libft.h $(INC_PATH)/libft.h - @mv libft/libft.a $(LIB_PATH)/libft.a $(NAME): $(OBJECTS) @echo "Linking the object files in the executable." @@ -48,9 +45,9 @@ $(NAME): $(OBJECTS) $(OBJ_PATH): @mkdir -p $@ -$(OBJ_PATH)/%.o: %.c $(LIB_PATH)/libft.a | $(OBJ_PATH) +$(OBJ_PATH)/%.o: %.c $(LIBFT) | $(OBJ_PATH) @echo "Compiling $@." - @$(CC) $(CFLAGS) -c $< $(LDFLAGS) $(LDLIBS) -o $@ + @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ clean: @echo "Delete object files and the object path" @@ -58,8 +55,8 @@ clean: @$(MAKE) -sC libft clean fclean: clean - @echo "Delete the executable and the library path" - @$(RM) $(NAME) $(LIB_PATH) + @echo "Delete the executable and the library" + @$(RM) $(NAME) @$(MAKE) -sC libft fclean re: fclean all diff --git a/inc/libft.h b/inc/libft.h deleted file mode 100644 index 70a72be..0000000 --- a/inc/libft.h +++ /dev/null @@ -1,77 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: whaffman +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2024/07/06 11:15:10 by whaffman #+# #+# */ -/* Updated: 2024/07/10 16:27:58 by whaffman ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_H -# define LIBFT_H -# include - -typedef struct s_list -{ - void *content; - struct s_list *next; -} t_list; - -int ft_isalpha(int c); -int ft_isdigit(int c); -int ft_isalnum(int c); -int ft_isascii(int c); -int ft_isprint(int c); -size_t ft_strlen(const char *s); -void *ft_memset(void *s, int c, size_t n); -void ft_bzero(void *s, size_t n); -void *ft_memcpy(void *dest, const void *src, size_t n); -void *ft_memmove(void *dest, const void *src, size_t n); -size_t ft_strlcpy(char *dst, const char *src, size_t size); -size_t ft_strlcat(char *dst, const char *src, size_t size); -int ft_toupper(int c); -int ft_tolower(int c); -char *ft_strchr(const char *s, int c); -char *ft_strrchr(const char *s, int c); -int ft_strncmp(const char *s1, const char *s2, size_t n); -void *ft_memchr(const void *s, int c, size_t n); -int ft_memcmp(const void *s1, const void *s2, size_t n); -char *ft_strnstr(const char *big, const char *little, size_t len); -int ft_atoi(const char *nptr); -void *ft_calloc(size_t nmemb, size_t size); -char *ft_strdup(const char *s); -char *ft_substr(char const *s, unsigned int start, size_t len); -char *ft_strjoin(char const *s1, char const *s2); -char *ft_strtrim(char const *s1, char const *set); -char **ft_split(char const *s, char c); -char *ft_itoa(int n); -char *ft_strmapi(char const *s, char (*f)(unsigned int, char)); -void ft_striteri(char *s, void (*f)(unsigned int, char*)); -void ft_putchar_fd(char c, int fd); -void ft_putstr_fd(char *s, int fd); -void ft_putendl_fd(char *s, int fd); -void ft_putnbr_fd(int n, int fd); - -/* - * Lists - */ - -t_list *ft_lstnew(void *content); -void ft_lstadd_front(t_list **lst, t_list *new); -int ft_lstsize(t_list *lst); -t_list *ft_lstlast(t_list *lst); -void ft_lstadd_back(t_list **lst, t_list *new); -void ft_lstdelone(t_list *lst, void (*del)(void *)); -void ft_lstclear(t_list **lst, void (*del)(void *)); -void ft_lstiter(t_list *lst, void (*f)(void *)); -t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)); - -/* - * Printf -*/ - -int ft_printf(const char *format, ...); -#endif