From 82f1e954590de21f6db9b1b6e3dba78a951bc319 Mon Sep 17 00:00:00 2001
From: Charles <sircharlesaze@gmail.com>
Date: Tue, 9 Jun 2020 10:59:59 +0200
Subject: Added make with multiple jobs and making merge compile

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f3bfbd5..d726b69 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,13 @@
 #    By: cacharle <marvin@42.fr>                    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/02/03 04:14:24 by cacharle          #+#    #+#              #
-#    Updated: 2020/04/03 13:50:17 by charles          ###   ########.fr        #
+#    Updated: 2020/06/09 10:51:41 by charles          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 RM = rm -f
-MAKE = make
+MAKE = make --no-print-directory
+JOBS = 4
 DOXYGEN = doxygen
 DOXYGEN_FILE = Doxyfile
 DOC_DIR = doc
@@ -37,7 +38,11 @@ LDFLAGS = -L$(LIBFTDIR) -lft
 NAME = minishell
 
 .PHONY: all
-all: libft_all prebuild $(NAME)
+all: libft_all prebuild
+	@$(MAKE) -j$(JOBS) allnopre
+
+.PHONY: allnopre
+allnopre: $(NAME)
 
 .PHONY: test
 test:
-- 
cgit