splited src in category, more generic makefile

98 files changed, 111 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index cd957eb..429d029 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: cacharle <marvin@42.fr>                    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2019/10/08 15:45:53 by cacharle          #+#    #+#              #
-#    Updated: 2020/01/15 08:48:42 by cacharle         ###   ########.fr        #
+#    Updated: 2020/01/15 09:54:56 by cacharle         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -22,46 +22,119 @@ CC = gcc
 CCFLAGS = -I$(INCLUDE_DIR) -Wall -Wextra -Werror
 
 NAME = libft.a
-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 = $(addprefix $(SRC_DIR)/,$(SRC_FILES))
+
+# SRC_CTYPE_DIR = ctype
+# SRC_CTYPE = ft_isalnum.c \
+# 			ft_isalpha.c \
+# 			ft_isascii.c \
+# 			ft_isdigit.c \
+# 			ft_isprint.c \
+# 			ft_tolower.c \
+# 			ft_toupper.c
+#
+# SRC_IO_DIR = io
+# SRC_IO = ft_asprintf.c \
+# 		 ft_dprintf.c \
+# 		 ft_printf \
+# 		 ft_printf.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_snprintf.c \
+# 		 ft_sprintf.c \
+# 		 ft_vasprintf.c \
+# 		 ft_vdprintf.c \
+# 		 ft_vprintf.c \
+# 		 ft_vsnprintf.c \
+# 		 ft_vsprintf.c \
+# 		 get_next_line
+#
+# SRC_LST_DIR = lst
+# SRC_LST = ft_lstadd_back.c \
+# 		  ft_lstadd_front.c \
+# 		  ft_lstclear.c \
+# 		  ft_lstdelone.c \
+# 		  ft_lstiter.c \
+# 		  ft_lstlast.c \
+# 		  ft_lstmap.c \
+# 		  ft_lstnew.c \
+# 		  ft_lstpop_front.c \
+# 		  ft_lstsize.c
+#
+# SRC_MEM_DIR = mem
+# SRC_MEM = ft_bzero.c \
+# 		  ft_calloc.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
+#
+# SRC_STR_DIR = str
+# SRC_STR = ft_atoi.c \
+# 		  ft_itoa.c \
+# 		  ft_split.c \
+# 		  ft_strcat.c \
+# 		  ft_strchr.c \
+# 		  ft_strclr.c \
+# 		  ft_strcmp.c \
+# 		  ft_strcount.c \
+# 		  ft_strcpy.c \
+# 		  ft_strdel.c \
+# 		  ft_strdup.c \
+# 		  ft_strequ.c \
+# 		  ft_striter.c \
+# 		  ft_striteri.c \
+# 		  ft_strjoin.c \
+# 		  ft_strjoin_free.c \
+# 		  ft_strjoin_free_snd.c \
+# 		  ft_strlcat.c \
+# 		  ft_strlcpy.c \
+# 		  ft_strlen.c \
+# 		  ft_strmap.c \
+# 		  ft_strmapi.c \
+# 		  ft_strncat.c \
+# 		  ft_strncmp.c \
+# 		  ft_strncpy.c \
+# 		  ft_strndup.c \
+# 		  ft_strnequ.c \
+# 		  ft_strnew.c \
+# 		  ft_strnstr.c \
+# 		  ft_strrchr.c \
+# 		  ft_strstr.c \
+# 		  ft_strtrim.c \
+# 		  ft_substr.c
+
+SRC = $(shell find $(SRC_DIR) -name *.c)
+
+# SRC = $(addprefix $(SRC_DIR)/,$(SRC_FILES))
 OBJ = $(SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
 
 HEADER_FILES = libft.h get_next_line.h
 HEADER = $(addprefix $(INCLUDE_DIR)/,$(HEADER_FILES))
 
 
-# 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)
+BONUSOBJ = $(BONUSSRC:.c=.o)
 
-all: dir_prerequisit $(NAME)
+all: make_build_dirs $(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
+make_build_dirs:
+	@for dir in $$(find $(SRC_DIR)/* -type d | sed 's_$(SRC_DIR)/_$(OBJ_DIR)/_g'); \
+	do \
+		if [ ! -d "$$dir" ]; then mkdir -p $$dir; fi \
+	done
 
 $(NAME): $(OBJ) $(HEADER)
 	$(LIB) $(NAME) $(OBJ)
 
-# bonus: $(BONUSOBJ) $(HEADER)
-# 	$(LIB) $(NAME) $(BONUSOBJ)
-
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	$(CC) $(CCFLAGS) -c -o $@ $<
 
@@ -71,4 +144,6 @@ clean:
 fclean: clean
 	$(RM) $(NAME)
 
-re: fclean all
+re:
+	@make fclean
+	@make all
diff --git a/include/libft.h b/include/libft.h
index 0880568..3777f8a 100644
--- a/include/libft.h
+++ b/include/libft.h
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/10/07 09:45:02 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:39:19 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/01/15 10:03:22 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,6 +27,10 @@
 # define MAX(x, y) ((x) > (y) ? (x) : (y))
 
 typedef unsigned char	t_byte;
+typedef int				t_bool;
+
+# define TRUE 1
+# define FALSE 0
 
 /*
 ** memory
diff --git a/src/ft_isalnum.c b/src/ctype/ft_isalnum.c
index 1ee1e0f..1ee1e0f 100644
--- a/src/ft_isalnum.c
+++ b/src/ctype/ft_isalnum.c
diff --git a/src/ft_isalpha.c b/src/ctype/ft_isalpha.c
index 6f155b4..6f155b4 100644
--- a/src/ft_isalpha.c
+++ b/src/ctype/ft_isalpha.c
diff --git a/src/ft_isascii.c b/src/ctype/ft_isascii.c
index 51dcd1c..51dcd1c 100644
--- a/src/ft_isascii.c
+++ b/src/ctype/ft_isascii.c
diff --git a/src/ft_isdigit.c b/src/ctype/ft_isdigit.c
index f8a5850..f8a5850 100644
--- a/src/ft_isdigit.c
+++ b/src/ctype/ft_isdigit.c
diff --git a/src/ft_isprint.c b/src/ctype/ft_isprint.c
index c311709..c311709 100644
--- a/src/ft_isprint.c
+++ b/src/ctype/ft_isprint.c
diff --git a/src/ft_tolower.c b/src/ctype/ft_tolower.c
index 919469f..919469f 100644
--- a/src/ft_tolower.c
+++ b/src/ctype/ft_tolower.c
diff --git a/src/ft_toupper.c b/src/ctype/ft_toupper.c
index 8579b91..8579b91 100644
--- a/src/ft_toupper.c
+++ b/src/ctype/ft_toupper.c
diff --git a/src/ft_asprintf.c b/src/io/ft_asprintf.c
index 5eb62d9..5eb62d9 100644
--- a/src/ft_asprintf.c
+++ b/src/io/ft_asprintf.c
diff --git a/src/ft_dprintf.c b/src/io/ft_dprintf.c
index 8e60970..8e60970 100644
--- a/src/ft_dprintf.c
+++ b/src/io/ft_dprintf.c
diff --git a/src/ft_printf.c b/src/io/ft_printf.c
index 1b92bb2..1b92bb2 100644
--- a/src/ft_printf.c
+++ b/src/io/ft_printf.c
diff --git a/src/ft_printf/convert.c b/src/io/ft_printf/convert.c
index 398c754..398c754 1006