From ad92e4a76abf9d6cc52488a4a6c22406f60d485a Mon Sep 17 00:00:00 2001
From: Rudy Bousset <rbousset@z2r5p2.le-101.fr>
Date: Sat, 22 Feb 2020 20:01:27 +0100
Subject: Makefile update, better directory tree

---
 Makefile | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e7b037a..3db5516 100644
--- a/Makefile
+++ b/Makefile
@@ -132,19 +132,16 @@ else
 	${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -lft -lX11 -lXext -lmlx -lm -lbsd
 endif
 #--------------------------------------------------------------------------------------------------#
-lft:
+all:
+ifeq (${OS}, Darwin)
+	@$(MAKE) --no-print-directory -C ${MLX_DIR} all
+endif
 ifdef ASAN
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} all ASAN=1
 else
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} all
 endif
-#--------------------------------------------------------------------------------------------------#
-mlx:
-ifeq (${OS}, Darwin)
-	@$(MAKE) --no-print-directory -C ${MLX_DIR} all
-endif
-#--------------------------------------------------------------------------------------------------#
-all: mlx lft ${NAME}
+	@$(MAKE) ${NAME}
 #--------------------------------------------------------------------------------------------------#
 clean: 
 ifeq (${OS}, Darwin)
@@ -153,14 +150,14 @@ endif
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} clean
 	${RM} ${OBJS_DIR}
 #--------------------------------------------------------------------------------------------------#
-fclean:		clean
+fclean: clean
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} fclean
 	${RM} ${NAME}
 	${RM} ${NAME}.dSYM
 #--------------------------------------------------------------------------------------------------#
-re:		fclean all
+re: fclean all
 #--------------------------------------------------------------------------------------------------#
-run:	all
+run: all
 	@./${NAME} "map/map_one.cub"
 #--------------------------------------------------------------------------------------------------#
 .PHONY:	all clean clean fclean re run default
-- 
cgit v1.2.3