diff --git a/fillit/Makefile b/fillit/Makefile
index 3f89de36..239e56af 100644
--- a/fillit/Makefile
+++ b/fillit/Makefile
@@ -1,19 +1,27 @@
 NAME	=	fillit
 CC		=	gcc
 
+
 D_SRC	=	src
+F_SRC	:=	$(shell ls -1 $(D_SRC) | grep "\.c$$")
+
 D_OBJ	=	obj
-D_LIB	=	lib
+F_OBJ	=	$(F_SRC:.c=.o)
+F_OBJ	:=	$(addprefix $(D_OBJ)/, $(F_OBJ))
+
 D_INC	=	includes
 
+D_LIB	=	lib
+D_LIB	:=	$(shell find $(D_LIB) -maxdepth 1 -mindepth 1 -type d)
+D_LIB	:=	$(addprefix -L,$(D_LIB))
+F_LIB	=	ft
+F_LIB	:=	$(addprefix -l, $(F_LIB))
+
 W_FLAGS	=	-Wall -Wextra -Werror
 DEBUG	=
 MKDIR	=	mkdir -p
 RM		=	/bin/rm -rf
 
-F_SRC	:=	$(shell ls -1 $(D_SRC) | grep "\.c$$")
-F_OBJ	:=	$(F_SRC:.c=.o)
-F_OBJ	:=	$(addprefix $(D_OBJ)/, $(F_OBJ))
 
 .PHONY: all clean fclean re
 
@@ -25,7 +33,7 @@ $(D_OBJ)/%.o: $(D_SRC)/%.c $(D_INC)
 	@echo "Compiling "$<"..."
 
 $(NAME): $(F_OBJ)
-	$(CC) -I$(D_INC) -L$(D_LIB) -lft $(F_OBJ) -o $@ $(DEBUG)
+	$(CC) -I$(D_INC) $(D_LIB) $(F_LIB) $(W_FLAGS) $(F_OBJ) -o $@ $(DEBUG)
 
 clean:
 	$(RM) $(D_OBJ)
diff --git a/fillit/lib/libft.a b/fillit/lib/libft.a
deleted file mode 120000
index 8d034290..00000000
--- a/fillit/lib/libft.a
+++ /dev/null
@@ -1 +0,0 @@
-libft/libft.a
\ No newline at end of file