correcting merge errors
This commit is contained in:
4
Makefile
4
Makefile
@@ -6,7 +6,7 @@
|
||||
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2018/04/07 12:47:06 by tmaze #+# #+# #
|
||||
# Updated: 2018/06/07 16:54:14 by tmaze ### ########.fr #
|
||||
# Updated: 2018/06/07 16:59:16 by tmaze ### ########.fr #
|
||||
# #
|
||||
#******************************************************************************#
|
||||
|
||||
@@ -32,7 +32,7 @@ $(NAME): $(OBJS)
|
||||
ar rcs $(NAME) $(OBJS)
|
||||
|
||||
%.o: %.c libft.h
|
||||
$(CC) $(CCFLAGS) $(CCSTD) $(INCLS) -c $< -o $@
|
||||
$(CC) $(CCFLAGS) $(CCSTD) $(INCLS) -g -c $< -o $@
|
||||
|
||||
clean:
|
||||
rm -f $(OBJS)
|
||||
|
Reference in New Issue
Block a user