diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-09-29 16:16:20 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-09-29 16:16:20 +0200 |
| commit | b6f4db572d7d40c178ec286373422faa2172f135 (patch) | |
| tree | 03fd9601de99de8111994f487cfdacc7127ce6d0 | |
| parent | 6bfcd3c6f921e7717e61167b291bb27bd3f66386 (diff) | |
| download | philosophers-b6f4db572d7d40c178ec286373422faa2172f135.tar.gz philosophers-b6f4db572d7d40c178ec286373422faa2172f135.tar.bz2 philosophers-b6f4db572d7d40c178ec286373422faa2172f135.zip | |
philo_two file restructuration
| -rw-r--r-- | philo_two/Makefile | 37 | ||||
| -rw-r--r-- | philo_two/src/io.c (renamed from philo_two/io.c) | 0 | ||||
| -rw-r--r-- | philo_two/src/main.c (renamed from philo_two/main.c) | 3 | ||||
| -rw-r--r-- | philo_two/src/philo_two.h (renamed from philo_two/philo_two.h) | 4 | ||||
| -rw-r--r-- | philo_two/src/routine.c (renamed from philo_two/routine.c) | 0 |
5 files changed, 24 insertions, 20 deletions
diff --git a/philo_two/Makefile b/philo_two/Makefile index 53c06f4..b1cd2ed 100644 --- a/philo_two/Makefile +++ b/philo_two/Makefile @@ -6,35 +6,38 @@ # By: cacharle <marvin@42.fr> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/11/24 05:50:15 by cacharle #+# #+# # -# Updated: 2020/02/14 23:37:39 by cacharle ### ########.fr # +# Updated: 2020/09/29 15:21:43 by cacharle ### ########.fr # # # # **************************************************************************** # RM = rm -f -COMMON_DIR = ../common +# COMMON_DIR = ../common CC = gcc -CCFLAGS = -I$(COMMON_DIR) -Wall -Wextra #-Werror -LDFLAGS = -lpthread -L$(COMMON_DIR) -lphilocommon +CCFLAGS = -Wall -Wextra #-I$(COMMON_DIR) -Werror +LDFLAGS = -lpthread #-L$(COMMON_DIR) -lphilocommon NAME = philo_two -SRC = main.c \ - io.c \ - routine.c +SRCDIR = src +OBJDIR = obj -OBJ = $(SRC:.c=.o) +SRC = $(shell find $(SRCDIR) -type f -name '*.c') +OBJ = $(SRC:$(SRCDIR)/%.c=$(OBJDIR)/%.o) -all: $(NAME) +all: prebuild $(NAME) -$(NAME): common_all $(OBJ) +prebuild: + @mkdir -p $(OBJDIR) + +$(NAME): $(OBJ) $(CC) $(LDFLAGS) -o $@ $(OBJ) -%.o: %.c +$(OBJDIR)/%.o: $(SRCDIR)/%.c $(CC) $(CCFLAGS) -c -o $@ $< -clean: common_fclean +clean: $(RM) $(OBJ) fclean: clean @@ -42,8 +45,8 @@ fclean: clean re: fclean all -common_all: - make -C $(COMMON_DIR) all - -common_fclean: - make -C $(COMMON_DIR) fclean +# common_all: +# make -C $(COMMON_DIR) all +# +# common_fclean: +# make -C $(COMMON_DIR) fclean diff --git a/philo_two/io.c b/philo_two/src/io.c index 20aec03..20aec03 100644 --- a/philo_two/io.c +++ b/philo_two/src/io.c diff --git a/philo_two/main.c b/philo_two/src/main.c index 17f5ab2..5442d1a 100644 --- a/philo_two/main.c +++ b/philo_two/src/main.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 22:45:23 by cacharle #+# #+# */ -/* Updated: 2020/02/15 00:34:26 by cacharle ### ########.fr */ +/* Updated: 2020/09/29 15:27:05 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,6 +22,7 @@ int main(int argc, char **argv) if (!parse_args(&philo_args, argc, argv)) return (1); + sem_unlink("philo_two"); forks = sem_open("philo_two", O_CREAT, 0700, philo_args.philo_num); if (forks == SEM_FAILED) return (1); diff --git a/philo_two/philo_two.h b/philo_two/src/philo_two.h index d239e34..fb42628 100644 --- a/philo_two/philo_two.h +++ b/philo_two/src/philo_two.h @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 22:47:23 by cacharle #+# #+# */ -/* Updated: 2020/02/14 23:55:04 by cacharle ### ########.fr */ +/* Updated: 2020/09/29 15:21:32 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ # include <pthread.h> # include <semaphore.h> -# include "common.h" +// # include "common.h" typedef struct { diff --git a/philo_two/routine.c b/philo_two/src/routine.c index fefeb34..fefeb34 100644 --- a/philo_two/routine.c +++ b/philo_two/src/routine.c |