tvdu29/push_swap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only gets better B)

Browse Source 
ditched GNL for ft_getline in checker
norm cleanup
This commit is contained in:
Tanguy MAZE
2019-03-17 17:29:32 +01:00
parent e7d88896e7
commit 558f8edfab
7 changed files with 355 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -6,7 +6,7 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2019/02/23 14:30:57 by tmaze #+# #+# #
# Updated: 2019/03/16 17:21:14 by tmaze ### ########.fr #
# Updated: 2019/03/17 15:11:39 by tmaze ### ########.fr #
# #
#******************************************************************************#
@@ -48,13 +48,13 @@ SRC = ps_clean.c \
ps_sorttools.c \
ps_specsort.c
MAIN1 = checker.c
MAIN2 = push_swap.c
MAIN1 = checker.c
MAIN2 = push_swap.c
OBJ = $(SRC:.c=.o)
OBJ1 = $(MAIN1:.c=.o)
OBJ2 = $(MAIN2:.c=.o)
OBJ1 = $(MAIN1:.c=.o)
OBJ2 = $(MAIN2:.c=.o)
LIB = ft
LIBFILE = libft.a
@@ -63,7 +63,7 @@ LIBFILE = libft.a
OBJP = $(addprefix $(OBJDIR)/, $(SRC:.c=.o))
OBJP1 = $(addprefix $(OBJDIR)/, $(MAIN1:.c=.o))
OBJP2 = $(addprefix $(OBJDIR)/, $(MAIN2:.c=.o))
INCP = $(foreach dir, $(INCDIR), -I$(dir))
INCP = $(foreach dir, $(INCDIR), -I$(dir))
# Default Rule
DRULE = all
@@ -78,13 +78,10 @@ all : $(NAME1) $(NAME2)
# Compilation rules
$(OBJDIR)/%.o : $(SRCDIR)/%.c $(OBJDIR) includes/push_swap.h
$(OBJDIR)/%.o : $(SRCDIR)/%.c includes/push_swap.h
@mkdir -p $(OBJDIR)
$(CC) $(FLAGS) -c -o $@ $< $(INCP)
$(OBJDIR) :
@echo -e "$(YEL)===> $(GRE)$(NAME2) : $(YEL) Directory Creation <===$(DEF)"
mkdir -p $(OBJDIR)
$(LIBDIR)/$(LIBFILE) :
@echo -e "$(YEL)===> $(GRE)$(NAME2) : $(YEL) Librairy Compilation <===$(DEF)"
$(MAKE) -C $(LIBDIR) all
@@ -101,10 +98,12 @@ $(NAME2) : $(OBJP2) $(OBJP) $(LIBDIR)/$(LIBFILE)
clean :
@echo -e "$(RED)===> $(GRE)$(NAME) : $(RED) Delete Object Files <===$(DEF)"
@$(RM) -rf $(OBJDIR)
@$(MAKE) -C $(LIBDIR) clean
fclean : clean
@echo -e "$(RED)===> $(GRE)$(NAME) : $(RED) Delete Binary File <===$(DEF)"
@$(RM) -f $(NAME1) $(NAME2)
@$(MAKE) -C $(LIBDIR) fclean
re : fclean default