From 7c70e80b629cc759c070e3a783bdb9d746b1df66 Mon Sep 17 00:00:00 2001 From: kinou-p Date: Tue, 15 Feb 2022 01:42:29 +0100 Subject: [PATCH] done --- Makefile | 20 ++++++++++---------- libft/Makefile | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index edb82b5..ce9b300 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/02/13 16:27:49 by apommier #+# #+# # -# Updated: 2022/02/14 23:44:46 by apommier ### ########.fr # +# Updated: 2022/02/15 01:41:04 by apommier ### ########.fr # # # # **************************************************************************** # @@ -16,25 +16,25 @@ SRCS = srcs/main.c\ srcs/utils.c\ srcs/print_map.c OBJS = ${SRCS:.c=.o} -CC = gcc +CC = gcc LIB = -L ./mlx -lmlx -lXext -lX11 -CFLAGS = -g -Wall -Wextra +CFLAGS = -Wall -Wextra -Werror RM = rm -rf LIBFT = ./libft -${NAME}:${OBJS} - make bonus -C ${LIBFT} - gcc -g ${OBJS} ${LIBFT}/libft.a ${LIB} -o so_long +${NAME}: ${OBJS} + @make bonus -C ${LIBFT} + @${CC} ${CFLAGS} ${OBJS} ${LIBFT}/libft.a ${LIB} -o so_long all: ${NAME} bonus clean: - ${RM} ${OBJS} - make clean -C ${LIBFT} + @${RM} ${OBJS} + @make clean -C ${LIBFT} fclean: clean - ${RM} ${NAME} - make fclean -C ${LIBFT} + @${RM} ${NAME} + @make fclean -C ${LIBFT} re: fclean all diff --git a/libft/Makefile b/libft/Makefile index f402b07..a77d2ed 100644 --- a/libft/Makefile +++ b/libft/Makefile @@ -44,23 +44,23 @@ CFLAGS = -Wall -Wextra RM = rm -rf .c.o: - ${CC} ${CFLAGS} -c $< -o ${<:.c=.o} + @${CC} ${CFLAGS} -c $< -o ${<:.c=.o} ${NAME}:${OBJS} - ar -rcs ${NAME} ${OBJS} + @ar -rcs ${NAME} ${OBJS} all: ${NAME} bonus: all - ${CC} ${CFLAGS} -c ${BONUS_C} - ar -rcs ${NAME} ${BONUS_O} + @${CC} ${CFLAGS} -c ${BONUS_C} + @ar -rcs ${NAME} ${BONUS_O} clean: - ${RM} ${OBJS} - ${RM} ${BONUS_O} + @${RM} ${OBJS} + @${RM} ${BONUS_O} fclean: clean - ${RM} ${NAME} + @${RM} ${NAME} re: fclean all