From cc2adbf09541c0d9309d66f719c86e7fe5d351d7 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Sun, 3 Jan 2021 14:42:46 +0100
Subject: Updated philo directories for correction

---
 philo_two/Makefile | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'philo_two/Makefile')

diff --git a/philo_two/Makefile b/philo_two/Makefile
index 88c0f8b..224809b 100644
--- a/philo_two/Makefile
+++ b/philo_two/Makefile
@@ -6,39 +6,39 @@
 #    By: cacharle <marvin@42.fr>                    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2019/11/24 05:50:15 by cacharle          #+#    #+#              #
-#    Updated: 2021/01/02 11:27:33 by cacharle         ###   ########.fr        #
+#    Updated: 2021/01/03 14:39:09 by cacharle         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 RM = rm -f
 MAKE = make --no-print-directory
 
-COMMONDIR = ../common
-
 CC = gcc
-CCFLAGS = -g -I$(COMMONDIR) -O2 -std=c99 -Wall -Wextra #-Werror
-LDFLAGS = -lpthread -L$(COMMONDIR) -lphilocommon
+CCFLAGS = -I. -O2 -std=c99 -Wall -Wextra -Werror
+LDFLAGS = -lpthread
 
 NAME = philo_two
 
 SRCDIR = src
 OBJDIR = obj
 
-SRC = $(shell find $(SRCDIR) -type f -name '*.c')
-OBJ = $(SRC:$(SRCDIR)/%.c=$(OBJDIR)/%.o)
+SRC = args.c helper.c io.c \
+	  src/event.c src/main.c src/routine.c
+
+OBJ = $(SRC:%.c=%.o)
 
 all: prebuild $(NAME)
 
 prebuild:
-	@mkdir -p $(OBJDIR)
+	@mkdir -pv $(OBJDIR)
 
-$(NAME): common_all $(OBJ)
+$(NAME): $(OBJ)
 	$(CC) -o $@ $(OBJ) $(LDFLAGS)
 
-$(OBJDIR)/%.o: $(SRCDIR)/%.c
+%.o: %.c
 	$(CC) $(CCFLAGS) -c -o $@ $<
 
-clean: common_clean
+clean:
 	$(RM) $(OBJ)
 
 fclean: clean
@@ -46,10 +46,4 @@ fclean: clean
 
 re: fclean all
 
-common_all:
-	$(MAKE) -C $(COMMONDIR) all
-
-common_clean:
-	$(MAKE) -C $(COMMONDIR) clean
-
-.PHONY: all prebuild clean fclean re common_all common_clean
+.PHONY: all prebuild clean fclean re
-- 
cgit