From fad9d1cfd071fda5a4df52e40f14b5ffeebde05b Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@crans.org>
Date: Sun, 3 Sep 2017 23:51:49 +0200
Subject: [PATCH] removed libft from makefile

---
 strace/Makefile          | 30 ++++++------------------------
 strace/includes/strace.h |  5 ++++-
 strace/srcs/strace.c     | 12 ++++++------
 3 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/strace/Makefile b/strace/Makefile
index 0bc06537..a2b01c98 100644
--- a/strace/Makefile
+++ b/strace/Makefile
@@ -22,10 +22,6 @@ FLAGS		=	$(W_FLAGS) $(D_FLAGS)
 LEN_NAME	=	`printf "%s" $(NAME) |wc -c`
 DELTA		=	$$(echo "$$(tput cols)-31-$(LEN_NAME)"|bc)
 
-LIBFT_DIR	=	libft/
-LIBFT_LIB	=	$(LIBFT_DIR)libft.a
-LIBFT_INC	=	$(LIBFT_DIR)includes/
-
 SRC_DIR		=	srcs/
 INC_DIR		=	includes/
 OBJ_DIR		=	objs/
@@ -39,19 +35,14 @@ NB			=	$(words $(SRC_BASE))
 INDEX		=	0
 
 all :
-	@make -C $(LIBFT_DIR)
 	@make -j $(NAME)
 
-$(NAME):	$(LIBFT_LIB) $(OBJ_DIR) $(OBJS)
+$(NAME):	$(OBJ_DIR) $(OBJS)
 	@$(CC) $(OBJS) -o $@ \
 		-I $(INC_DIR) \
-		-I $(LIBFT_INC) \
-		$(LIBFT_LIB) $(FLAGS)
+		$(FLAGS)
 	@printf "\r\033[38;5;117m✓ MAKE $@ \033[0m\033[K\n"
 
-$(LIBFT_LIB):
-	@make -C $(LIBFT_DIR)
-
 $(OBJ_DIR) :
 	@mkdir -p $(OBJ_DIR)
 
@@ -62,20 +53,16 @@ $(OBJ_DIR)%.o :	$(SRC_DIR)%.c | $(OBJ_DIR)
 	@$(eval COLOR=$(shell list=(160 196 202 208 215 221 226 227 190 154 118 82 46); index=$$(($(PERCENT) * $${#list[@]} / 100)); echo "$${list[$$index]}"))
 	@printf "\r\033[38;5;%dm⌛ [%s]: %2d%% `printf '█%.0s' {0..$(DONE)}`%*s❙%*.*s\033[0m\033[K" $(COLOR) ft_p $(PERCENT) $(TO_DO) "" $(DELTA) $(DELTA) "$(shell echo "$@" | sed 's/^.*\///')"
 	@$(CC) $(FLAGS) $(OBJ_FLAG) -MMD -c $< -o $@\
-		-I $(INC_DIR)\
-		-I $(LIBFT_INC)
+		-I $(INC_DIR)
 	@$(eval INDEX=$(shell echo $$(($(INDEX)+1))))
 
-clean:			cleanlib
+clean:
 	@if [ -e $(OBJ_DIR) ]; then \
 		rm -rf $(OBJ_DIR); \
 		printf "\r\033[38;5;202m✗ clean $(NAME) \033[0m\033[K\n"; \
 	fi;
 
-cleanlib:
-	@make -C $(LIBFT_DIR) clean
-
-fclean:			clean fcleanlib
+fclean:		clean
 	@for file in $(NAME); do \
 		if [ -e $$file ]; then \
 			rm -f $$file ; \
@@ -83,13 +70,8 @@ fclean:			clean fcleanlib
 		fi; \
 	done;
 
-fcleanlib:		cleanlib
-	@make -C $(LIBFT_DIR) fclean
-
 re:				fclean all
 
-relib:			fcleanlib $(LIBFT_LIB)
-
-.PHONY :		fclean clean re relib cleanlib fcleanlib
+.PHONY :		fclean clean re
 
 -include $(OBJS:.o=.d)
diff --git a/strace/includes/strace.h b/strace/includes/strace.h
index 09331ee0..528f8ac0 100644
--- a/strace/includes/strace.h
+++ b/strace/includes/strace.h
@@ -13,7 +13,10 @@
 #ifndef FT_STRACE_H
 # define FT_STRACE_H
 
-# include "libft.h"
+# include <unistd.h>
+# include <stdlib.h>
+# include <stdio.h>
+# include <string.h>
 # include <sys/ptrace.h>
 # include <sys/user.h>
 # include <sys/wait.h>
diff --git a/strace/srcs/strace.c b/strace/srcs/strace.c
index 27e77d49..d3d089c4 100644
--- a/strace/srcs/strace.c
+++ b/strace/srcs/strace.c
@@ -17,12 +17,12 @@ extern char **environ;
 extern t_syscall	g_syscalls[];
 
 #define LOAD_PARAMS(params, regs) do { \
-	ft_memcpy(params + 0, &regs->rdi, 8); \
-	ft_memcpy(params + 1, &regs->rsi, 8); \
-	ft_memcpy(params + 2, &regs->rdx, 8); \
-	ft_memcpy(params + 3, &regs->rcx, 8); \
-	ft_memcpy(params + 4, &regs->r8, 8); \
-	ft_memcpy(params + 5, &regs->r9, 8); \
+	memcpy(params + 0, &regs->rdi, 8); \
+	memcpy(params + 1, &regs->rsi, 8); \
+	memcpy(params + 2, &regs->rdx, 8); \
+	memcpy(params + 3, &regs->rcx, 8); \
+	memcpy(params + 4, &regs->r8, 8); \
+	memcpy(params + 5, &regs->r9, 8); \
 } while (0)
 
 void	print_syscall_params(t_syscall syscall, struct user_regs_struct *regs)