diff --git a/.gitmodules b/.gitmodules index 8403f0d..5fd0074 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "libft2"] - path = libft2 - url = https://git.gaetanbrochard.dev/gbrochar/libft2.git +[submodule "libft"] + path = libft + url = https://git.gaetanbrochard.dev/gbrochar/libft.git diff --git a/Makefile b/Makefile index 8b8b2a1..916b12c 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ CC = gcc CFLAGS = -Wall -Werror -Wextra -LIB_NAME = libft2 +LIB_NAME = libft RED = \033[31m GREEN = \033[32m @@ -38,7 +38,7 @@ $(NAME): create_libft $(OBJ) $(INC) create_libft: @git submodule update --init @make -C $(LIB_NAME) - @cp $(LIB_NAME)/inc/libft.h inc/libft.h + @cp $(LIB_NAME)/libft.h inc/libft.h $(OBJ_DIR)%.o: $(SRC_DIR)%.c @if [ ! -d ./obj ]; then \ diff --git a/libft b/libft new file mode 160000 index 0000000..1ab0cdf --- /dev/null +++ b/libft @@ -0,0 +1 @@ +Subproject commit 1ab0cdf1acf97db0cb8d90940c96a6f1ccb3a7af diff --git a/libft2 b/libft2 deleted file mode 160000 index f423887..0000000 --- a/libft2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f4238872bb85d8317f5b4867b45cf81197ba0576