From 6a1e91750ee43fccb6160af0f44139698c8dfdc3 Mon Sep 17 00:00:00 2001
From: Charles <sircharlesaze@gmail.com>
Date: Sat, 15 Feb 2020 00:36:04 +0100
Subject: philo_two working (again with the hack?)

---
 philo_two/Makefile | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'philo_two/Makefile')

diff --git a/philo_two/Makefile b/philo_two/Makefile
index 8845406..53c06f4 100644
--- a/philo_two/Makefile
+++ b/philo_two/Makefile
@@ -6,33 +6,44 @@
 #    By: cacharle <marvin@42.fr>                    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2019/11/24 05:50:15 by cacharle          #+#    #+#              #
-#    Updated: 2019/11/24 07:07:05 by cacharle         ###   ########.fr        #
+#    Updated: 2020/02/14 23:37:39 by cacharle         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 RM = rm -f
 
+COMMON_DIR = ../common
+
 CC = gcc
-CCFLAGS = -Wall -Wextra #-Werror
-LDFLAGS = -lpthread
+CCFLAGS = -I$(COMMON_DIR) -Wall -Wextra #-Werror
+LDFLAGS = -lpthread -L$(COMMON_DIR) -lphilocommon
 
 NAME = philo_two
-SRC = main.c
-OBJ = $(SRC:.c=.o)
 
+SRC = main.c \
+	  io.c \
+	  routine.c
+
+OBJ = $(SRC:.c=.o)
 
 all: $(NAME)
 
-$(NAME): $(OBJ)
+$(NAME): common_all $(OBJ)
 	$(CC) $(LDFLAGS) -o $@ $(OBJ)
 
 %.o: %.c
-	$(CC) $(CCFLAGS) -c -o $@ $^
+	$(CC) $(CCFLAGS) -c -o $@ $<
 
-clean:
+clean: common_fclean
 	$(RM) $(OBJ)
 
 fclean: clean
 	$(RM) $(NAME)
 
 re: fclean all
+
+common_all:
+	make -C $(COMMON_DIR) all
+
+common_fclean:
+	make -C $(COMMON_DIR) fclean
-- 
cgit