From 6a1e91750ee43fccb6160af0f44139698c8dfdc3 Mon Sep 17 00:00:00 2001 From: Charles Date: Sat, 15 Feb 2020 00:36:04 +0100 Subject: philo_two working (again with the hack?) --- philo_one/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'philo_one/Makefile') diff --git a/philo_one/Makefile b/philo_one/Makefile index b630f40..1bab8d6 100644 --- a/philo_one/Makefile +++ b/philo_one/Makefile @@ -6,7 +6,7 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/11/24 05:50:15 by cacharle #+# #+# # -# Updated: 2020/02/14 19:53:14 by cacharle ### ########.fr # +# Updated: 2020/02/14 22:48:10 by cacharle ### ########.fr # # # # **************************************************************************** # @@ -15,7 +15,7 @@ RM = rm -f COMMON_DIR = ../common CC = gcc -CCFLAGS = -g -I$(COMMON_DIR) -Wall -Wextra #-Werror +CCFLAGS = -I$(COMMON_DIR) -Wall -Wextra #-Werror LDFLAGS = -lpthread -L$(COMMON_DIR) -lphilocommon NAME = philo_one @@ -23,22 +23,29 @@ NAME = philo_one SRC = main.c \ philo.c \ fork.c \ - routine.c + routine.c \ + io.c OBJ = $(SRC:.c=.o) all: $(NAME) -$(NAME): $(OBJ) +$(NAME): common_all $(OBJ) $(CC) -o $@ $(OBJ) $(LDFLAGS) %.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