diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 64 | ||||
| -rw-r--r-- | include/get_next_line.h (renamed from get_next_line/get_next_line.h) | 0 | ||||
| -rw-r--r-- | include/libft.h (renamed from libft.h) | 0 | ||||
| -rw-r--r-- | src/ft_asprintf.c (renamed from ft_asprintf.c) | 0 | ||||
| -rw-r--r-- | src/ft_atoi.c (renamed from ft_atoi.c) | 0 | ||||
| -rw-r--r-- | src/ft_bzero.c (renamed from ft_bzero.c) | 0 | ||||
| -rw-r--r-- | src/ft_calloc.c (renamed from ft_calloc.c) | 0 | ||||
| -rw-r--r-- | src/ft_dprintf.c (renamed from ft_dprintf.c) | 0 | ||||
| -rw-r--r-- | src/ft_isalnum.c (renamed from ft_isalnum.c) | 0 | ||||
| -rw-r--r-- | src/ft_isalpha.c (renamed from ft_isalpha.c) | 0 | ||||
| -rw-r--r-- | src/ft_isascii.c (renamed from ft_isascii.c) | 0 | ||||
| -rw-r--r-- | src/ft_isdigit.c (renamed from ft_isdigit.c) | 0 | ||||
| -rw-r--r-- | src/ft_isprint.c (renamed from ft_isprint.c) | 0 | ||||
| -rw-r--r-- | src/ft_itoa.c (renamed from ft_itoa.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstadd_back_bonus.c (renamed from ft_lstadd_back_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstadd_front_bonus.c (renamed from ft_lstadd_front_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstclear_bonus.c (renamed from ft_lstclear_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstdelone_bonus.c (renamed from ft_lstdelone_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstiter_bonus.c (renamed from ft_lstiter_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstlast_bonus.c (renamed from ft_lstlast_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstmap_bonus.c (renamed from ft_lstmap_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstnew_bonus.c (renamed from ft_lstnew_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstpop_front_bonus.c (renamed from ft_lstpop_front_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_lstsize_bonus.c (renamed from ft_lstsize_bonus.c) | 0 | ||||
| -rw-r--r-- | src/ft_memalloc.c (renamed from ft_memalloc.c) | 0 | ||||
| -rw-r--r-- | src/ft_memccpy.c (renamed from ft_memccpy.c) | 0 | ||||
| -rw-r--r-- | src/ft_memchr.c (renamed from ft_memchr.c) | 0 | ||||
| -rw-r--r-- | src/ft_memcmp.c (renamed from ft_memcmp.c) | 0 | ||||
| -rw-r--r-- | src/ft_memcpy.c (renamed from ft_memcpy.c) | 0 | ||||
| -rw-r--r-- | src/ft_memdel.c (renamed from ft_memdel.c) | 0 | ||||
| -rw-r--r-- | src/ft_memmove.c (renamed from ft_memmove.c) | 0 | ||||
| -rw-r--r-- | src/ft_memset.c (renamed from ft_memset.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf.c (renamed from ft_printf.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert.c (renamed from ft_printf/convert.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_char.c (renamed from ft_printf/convert_char.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_hex.c (renamed from ft_printf/convert_hex.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_int.c (renamed from ft_printf/convert_int.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_none.c (renamed from ft_printf/convert_none.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_percent.c (renamed from ft_printf/convert_percent.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_ptr.c (renamed from ft_printf/convert_ptr.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_str.c (renamed from ft_printf/convert_str.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_uint.c (renamed from ft_printf/convert_uint.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/convert_written.c (renamed from ft_printf/convert_written.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/extract.c (renamed from ft_printf/extract.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/ft_printf.c (renamed from ft_printf/ft_printf.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/ft_vasprintf.h (renamed from ft_printf/ft_vasprintf.h) | 0 | ||||
| -rw-r--r-- | src/ft_printf/length_modifier.c (renamed from ft_printf/length_modifier.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/list.c (renamed from ft_printf/list.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/parse.c (renamed from ft_printf/parse.c) | 0 | ||||
| -rw-r--r-- | src/ft_printf/utils.c (renamed from ft_printf/utils.c) | 0 | ||||
| -rw-r--r-- | src/ft_putchar.c (renamed from ft_putchar.c) | 0 | ||||
| -rw-r--r-- | src/ft_putchar_fd.c (renamed from ft_putchar_fd.c) | 0 | ||||
| -rw-r--r-- | src/ft_putendl.c (renamed from ft_putendl.c) | 0 | ||||
| -rw-r--r-- | src/ft_putendl_fd.c (renamed from ft_putendl_fd.c) | 0 | ||||
| -rw-r--r-- | src/ft_putnbr.c (renamed from ft_putnbr.c) | 0 | ||||
| -rw-r--r-- | src/ft_putnbr_fd.c (renamed from ft_putnbr_fd.c) | 0 | ||||
| -rw-r--r-- | src/ft_putstr.c (renamed from ft_putstr.c) | 0 | ||||
| -rw-r--r-- | src/ft_putstr_fd.c (renamed from ft_putstr_fd.c) | 0 | ||||
| -rw-r--r-- | src/ft_snprintf.c (renamed from ft_snprintf.c) | 0 | ||||
| -rw-r--r-- | src/ft_split.c (renamed from ft_split.c) | 0 | ||||
| -rw-r--r-- | src/ft_sprintf.c (renamed from ft_sprintf.c) | 0 | ||||
| -rw-r--r-- | src/ft_strcat.c (renamed from ft_strcat.c) | 0 | ||||
| -rw-r--r-- | src/ft_strchr.c (renamed from ft_strchr.c) | 0 | ||||
| -rw-r--r-- | src/ft_strclr.c (renamed from ft_strclr.c) | 0 | ||||
| -rw-r--r-- | src/ft_strcmp.c (renamed from ft_strcmp.c) | 0 | ||||
| -rw-r--r-- | src/ft_strcount.c (renamed from ft_strcount.c) | 0 | ||||
| -rw-r--r-- | src/ft_strcpy.c (renamed from ft_strcpy.c) | 0 | ||||
| -rw-r--r-- | src/ft_strdel.c (renamed from ft_strdel.c) | 0 | ||||
| -rw-r--r-- | src/ft_strdup.c (renamed from ft_strdup.c) | 0 | ||||
| -rw-r--r-- | src/ft_strequ.c (renamed from ft_strequ.c) | 0 | ||||
| -rw-r--r-- | src/ft_striter.c (renamed from ft_striter.c) | 0 | ||||
| -rw-r--r-- | src/ft_striteri.c (renamed from ft_striteri.c) | 0 | ||||
| -rw-r--r-- | src/ft_strjoin.c (renamed from ft_strjoin.c) | 0 | ||||
| -rw-r--r-- | src/ft_strjoin_free.c (renamed from ft_strjoin_free.c) | 0 | ||||
| -rw-r--r-- | src/ft_strjoin_free_snd.c (renamed from ft_strjoin_free_snd.c) | 0 | ||||
| -rw-r--r-- | src/ft_strlcat.c (renamed from ft_strlcat.c) | 0 | ||||
| -rw-r--r-- | src/ft_strlcpy.c (renamed from ft_strlcpy.c) | 0 | ||||
| -rw-r--r-- | src/ft_strlen.c (renamed from ft_strlen.c) | 0 | ||||
| -rw-r--r-- | src/ft_strmap.c (renamed from ft_strmap.c) | 0 | ||||
| -rw-r--r-- | src/ft_strmapi.c (renamed from ft_strmapi.c) | 0 | ||||
| -rw-r--r-- | src/ft_strncat.c (renamed from ft_strncat.c) | 0 | ||||
| -rw-r--r-- | src/ft_strncmp.c (renamed from ft_strncmp.c) | 0 | ||||
| -rw-r--r-- | src/ft_strncpy.c (renamed from ft_strncpy.c) | 0 | ||||
| -rw-r--r-- | src/ft_strndup.c (renamed from ft_strndup.c) | 0 | ||||
| -rw-r--r-- | src/ft_strnequ.c (renamed from ft_strnequ.c) | 0 | ||||
| -rw-r--r-- | src/ft_strnew.c (renamed from ft_strnew.c) | 0 | ||||
| -rw-r--r-- | src/ft_strnstr.c (renamed from ft_strnstr.c) | 0 | ||||
| -rw-r--r-- | src/ft_strrchr.c (renamed from ft_strrchr.c) | 0 | ||||
| -rw-r--r-- | src/ft_strstr.c (renamed from ft_strstr.c) | 0 | ||||
| -rw-r--r-- | src/ft_strtrim.c (renamed from ft_strtrim.c) | 0 | ||||
| -rw-r--r-- | src/ft_substr.c (renamed from ft_substr.c) | 0 | ||||
| -rw-r--r-- | src/ft_tolower.c (renamed from ft_tolower.c) | 0 | ||||
| -rw-r--r-- | src/ft_toupper.c (renamed from ft_toupper.c) | 0 | ||||
| -rw-r--r-- | src/ft_vasprintf.c (renamed from ft_vasprintf.c) | 0 | ||||
| -rw-r--r-- | src/ft_vdprintf.c (renamed from ft_vdprintf.c) | 0 | ||||
| -rw-r--r-- | src/ft_vprintf.c (renamed from ft_vprintf.c) | 0 | ||||
| -rw-r--r-- | src/ft_vsnprintf.c (renamed from ft_vsnprintf.c) | 0 | ||||
| -rw-r--r-- | src/ft_vsprintf.c (renamed from ft_vsprintf.c) | 0 | ||||
| -rw-r--r-- | src/get_next_line/get_next_line.c (renamed from get_next_line/get_next_line.c) | 0 |
100 files changed, 37 insertions, 28 deletions
@@ -4,3 +4,4 @@ *.ghc a.out main.c +build/* @@ -6,61 +6,69 @@ # By: cacharle <marvin@42.fr> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2020/01/15 07:34:57 by cacharle ### ########.fr # +# Updated: 2020/01/15 08:48:42 by cacharle ### ########.fr # # # # **************************************************************************** # LIB = ar rcs RM = rm -f +SRC_DIR = src +OBJ_DIR = build +INCLUDE_DIR = include GET_NEXT_LINE_DIR = get_next_line CC = gcc -CCFLAGS = -I. -I$(GET_NEXT_LINE_DIR) -Wall -Wextra -Werror +CCFLAGS = -I$(INCLUDE_DIR) -Wall -Wextra -Werror NAME = libft.a -SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c \ - ft_isprint.c ft_itoa.c ft_memalloc.c ft_memccpy.c ft_memchr.c \ - ft_memcmp.c ft_memcpy.c ft_memdel.c ft_memmove.c ft_memset.c \ - ft_putchar.c ft_putchar_fd.c ft_putendl.c ft_putendl_fd.c \ - ft_putnbr.c ft_putnbr_fd.c ft_putstr.c ft_putstr_fd.c ft_strcat.c \ - ft_strchr.c ft_strclr.c ft_strcmp.c ft_strcpy.c ft_strdel.c \ - ft_strdup.c ft_strequ.c ft_striter.c ft_striteri.c ft_strjoin.c \ - ft_strlcat.c ft_strlen.c ft_strmap.c ft_strmapi.c ft_strncat.c \ - ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \ - ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c \ - ft_tolower.c ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c \ - ft_strjoin_free.c ft_strjoin_free_snd.c ft_strcount.c +SRC_FILES = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c \ + ft_isprint.c ft_itoa.c ft_memalloc.c ft_memccpy.c ft_memchr.c \ + ft_memcmp.c ft_memcpy.c ft_memdel.c ft_memmove.c ft_memset.c \ + ft_putchar.c ft_putchar_fd.c ft_putendl.c ft_putendl_fd.c \ + ft_putnbr.c ft_putnbr_fd.c ft_putstr.c ft_putstr_fd.c ft_strcat.c \ + ft_strchr.c ft_strclr.c ft_strcmp.c ft_strcpy.c ft_strdel.c \ + ft_strdup.c ft_strequ.c ft_striter.c ft_striteri.c ft_strjoin.c \ + ft_strlcat.c ft_strlen.c ft_strmap.c ft_strmapi.c ft_strncat.c \ + ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \ + ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c \ + ft_tolower.c ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c \ + ft_strjoin_free.c ft_strjoin_free_snd.c ft_strcount.c \ + $(GET_NEXT_LINE_DIR)/get_next_line.c ft_isdigit.c # ft_printf.c ft_sprintf.c ft_snprintf.c ft_asprintf.c ft_dprintf.c \ # ft_vprintf.c ft_vsprintf.c ft_vsnprintf.c ft_vasprintf.c ft_vdprintf.c -SRC += $(GET_NEXT_LINE_DIR)/get_next_line.c +SRC = $(addprefix $(SRC_DIR)/,$(SRC_FILES)) +OBJ = $(SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o) -OBJ = $(SRC:.c=.o) +HEADER_FILES = libft.h get_next_line.h +HEADER = $(addprefix $(INCLUDE_DIR)/,$(HEADER_FILES)) -HEADER = libft.h -BONUSSRC = ft_lstadd_back_bonus.c ft_lstadd_front_bonus.c ft_lstclear_bonus.c \ - ft_lstdelone_bonus.c ft_lstiter_bonus.c ft_lstlast_bonus.c \ - ft_lstmap_bonus.c ft_lstnew_bonus.c ft_lstsize_bonus.c ft_lstpop_front_bonus.c -BONUSOBJ = $(BONUSSRC:.c=.o) +# BONUSSRC = ft_lstadd_back_bonus.c ft_lstadd_front_bonus.c ft_lstclear_bonus.c \ +# ft_lstdelone_bonus.c ft_lstiter_bonus.c ft_lstlast_bonus.c \ +# ft_lstmap_bonus.c ft_lstnew_bonus.c ft_lstsize_bonus.c ft_lstpop_front_bonus.c +# BONUSOBJ = $(BONUSSRC:.c=.o) -all: $(NAME) +all: dir_prerequisit $(NAME) + +dir_prerequisit: + @if [ ! -d "$(OBJ_DIR)" ]; then mkdir $(OBJ_DIR); fi + @if [ ! -d "$(OBJ_DIR)/$(GET_NEXT_LINE_DIR)" ]; then \ + mkdir $(OBJ_DIR)/$(GET_NEXT_LINE_DIR); fi $(NAME): $(OBJ) $(HEADER) $(LIB) $(NAME) $(OBJ) -bonus: $(BONUSOBJ) $(HEADER) - $(LIB) $(NAME) $(BONUSOBJ) +# bonus: $(BONUSOBJ) $(HEADER) +# $(LIB) $(NAME) $(BONUSOBJ) -%.o: %.c +$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(CC) $(CCFLAGS) -c -o $@ $< clean: - $(RM) $(OBJ) $(BONUSOBJ) + $(RM) $(OBJ) fclean: clean $(RM) $(NAME) re: fclean all - -rebonus: fclean bonus diff --git a/get_next_line/get_next_line.h b/include/get_next_line.h index 9d15202..9d15202 100644 --- a/get_next_line/get_next_line.h +++ b/include/get_next_line.h diff --git a/libft.h b/include/libft.h index 0880568..0880568 100644 --- a/libft.h +++ b/include/libft.h diff --git a/ft_asprintf.c b/src/ft_asprintf.c index 5eb62d9..5eb62d9 100644 --- a/ft_asprintf.c +++ b/src/ft_asprintf.c diff --git a/ft_atoi.c b/src/ft_atoi.c index bfba860..bfba860 100644 --- a/ft_atoi.c +++ b/src/ft_atoi.c diff --git a/ft_bzero.c b/src/ft_bzero.c index d179af0..d179af0 100644 --- a/ft_bzero.c +++ b/src/ft_bzero.c diff --git a/ft_calloc.c b/src/ft_calloc.c index 24501bf..24501bf 100644 --- a/ft_calloc.c +++ b/src/ft_calloc.c diff --git a/ft_dprintf.c b/src/ft_dprintf.c index 8e60970..8e60970 100644 --- a/ft_dprintf.c +++ b/src/ft_dprintf.c diff --git a/ft_isalnum.c b/src/ft_isalnum.c index 1ee1e0f..1ee1e0f 100644 --- a/ft_isalnum.c +++ b/src/ft_isalnum.c diff --git a/ft_isalpha.c b/src/ft_isalpha.c index 6f155b4..6f155b4 100644 --- a/ft_isalpha.c +++ b/src/ft_isalpha.c diff --git a/ft_isascii.c b/src/ft_isascii.c index 51dcd1c..51dcd1c 100644 --- a/ft_isascii.c +++ b/src/ft_isascii.c diff --git a/ft_isdigit.c b/src/ft_isdigit.c index f8a5850..f8a5850 100644 --- a/ft_isdigit.c +++ b/src/ft_isdigit.c diff --git a/ft_isprint.c b/src/ft_isprint.c index c311709..c311709 100644 --- a/ft_isprint.c +++ b/src/ft_isprint.c diff --git a/ft_itoa.c b/src/ft_itoa.c index 166e278..166e278 100644 --- a/ft_itoa.c +++ b/src/ft_itoa.c diff --git a/ft_lstadd_back_bonus.c b/src/ft_lstadd_back_bonus.c index 01eb00c..01eb00c 100644 --- a/ft_lstadd_back_bonus.c +++ b/src/ft_lstadd_back_bonus.c diff --git a/ft_lstadd_front_bonus.c b/src/ft_lstadd_front_bonus.c index 282b0b4..282b0b4 100644 --- a/ft_lstadd_front_bonus.c +++ b/src/ft_lstadd_front_bonus.c diff --git a/ft_lstclear_bonus.c b/src/ft_lstclear_bonus.c index ee1d9e5..ee1d9e5 100644 --- a/ft_lstclear_bonus.c +++ b/src/ft_lstclear_bonus.c diff --git a/ft_lstdelone_bonus.c b/src/ft_lstdelone_bonus.c index 30cec69..30cec69 100644 --- a/ft_lstdelone_bonus.c +++ b/src/ft_lstdelone_bonus.c diff --git a/ft_lstiter_bonus.c b/src/ft_lstiter_bonus.c index 282e0fa..282e0fa 100644 --- a/ft_lstiter_bonus.c +++ b/src/ft_lstiter_bonus.c diff --git a/ft_lstlast_bonus.c b/src/ft_lstlast_bonus.c index 247f4da..247f4da 100644 --- a/ft_lstlast_bonus.c +++ b/src/ft_lstlast_bonus.c diff --git a/ft_lstmap_bonus.c b/src/ft_lstmap_bonus.c index c623d6f..c623d6f 100644 --- a/ft_lstmap_bonus.c +++ b/src/ft_lstmap_bonus.c diff --git a/ft_lstnew_bonus.c b/src/ft_lstnew_bonus.c index ea10e4d..ea10e4d 100644 --- a/ft_lstnew_bonus.c +++ b/src/ft_lstnew_bonus.c diff --git a/ft_lstpop_front_bonus.c b/src/ft_lstpop_front_bonus.c index f81315a..f81315a 100644 --- a/ft_lstpop_front_bonus.c +++ b/src/ft_lstpop_front_bonus.c diff --git a/ft_lstsize_bonus.c b/src/ft_lstsize_bonus.c index b9d65d2..b9d65d2 100644 --- a/ft_lstsize_bonus.c +++ b/src/ft_lstsize_bonus.c diff --git a/ft_memalloc.c b/src/ft_memalloc.c index 5aab2ec..5aab2ec 100644 --- a/ft_memalloc.c +++ b/src/ft_memalloc.c diff --git a/ft_memccpy.c b/src/ft_memccpy.c index f95aa03..f95aa03 100644 --- a/ft_memccpy.c +++ b/src/ft_memccpy.c diff --git a/ft_memchr.c b/src/ft_memchr.c index d2364db..d2364db 100644 |