diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2021-01-08 14:35:53 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2021-01-08 14:35:53 +0100 |
| commit | ad7ed73c124c8fcda6629350307f0f4f41b87fe3 (patch) | |
| tree | 5faf9809401b64fecffe709f20cc9bb980aa7406 | |
| parent | 907debbb7d1e7ccc4914805cfe4acbed92b82bcc (diff) | |
| download | philosophers-ad7ed73c124c8fcda6629350307f0f4f41b87fe3.tar.gz philosophers-ad7ed73c124c8fcda6629350307f0f4f41b87fe3.tar.bz2 philosophers-ad7ed73c124c8fcda6629350307f0f4f41b87fe3.zip | |
Updated Makefile, restructuring common files
| -rw-r--r-- | common/Makefile | 24 | ||||
| -rw-r--r-- | common/inc/common.h (renamed from common/common.h) | 3 | ||||
| -rw-r--r-- | common/src/args.c (renamed from common/args.c) | 0 | ||||
| -rw-r--r-- | common/src/helper.c (renamed from common/helper.c) | 0 | ||||
| -rw-r--r-- | common/src/io.c (renamed from common/io.c) | 0 | ||||
| -rw-r--r-- | philo_one/Makefile | 7 | ||||
| -rw-r--r-- | philo_three/Makefile | 7 | ||||
| -rw-r--r-- | philo_two/Makefile | 7 |
8 files changed, 30 insertions, 18 deletions
diff --git a/common/Makefile b/common/Makefile index d23cac9..e40fb30 100644 --- a/common/Makefile +++ b/common/Makefile @@ -6,27 +6,35 @@ # By: cacharle <marvin@42.fr> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/02/09 22:39:08 by cacharle #+# #+# # -# Updated: 2021/01/02 10:47:14 by cacharle ### ########.fr # +# Updated: 2021/01/08 14:32:37 by charles ### ########.fr # # # # **************************************************************************** # LIB = ar rcs -RM = rm -rf +RM = rm -f +MKDIR = mkdir -pv + +SRCDIR = src +OBJDIR = obj +INCDIR = inc CC = gcc -CCFLAGS = -std=c99 -O2 -Wall -Wextra -Werror +CCFLAGS = -std=c99 -Wall -Wextra -Werror -O2 -I$(INCDIR) NAME = libphilocommon.a -SRC = $(shell find . -type f -name "*.c") -OBJ = $(SRC:.c=.o) +SRC = $(shell find $(SRCDIR) -type f -name "*.c") +OBJ = $(SRC:$(SRCDIR)/%.c=$(OBJDIR)/%.o) + +all: prebuild $(NAME) -all: $(NAME) +prebuild: + @$(MKDIR) $(OBJDIR) $(NAME): $(OBJ) $(LIB) $(NAME) $(OBJ) -%.o: %.c +$(OBJDIR)/%.o: $(SRCDIR)/%.c $(CC) $(CCFLAGS) -c -o $@ $< clean: @@ -35,4 +43,4 @@ clean: re: clean all -.PHONY: all clean re +.PHONY: all prebuild clean re diff --git a/common/common.h b/common/inc/common.h index 09fdf79..6d36e35 100644 --- a/common/common.h +++ b/common/inc/common.h @@ -6,13 +6,14 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/08 22:58:35 by cacharle #+# #+# */ -/* Updated: 2021/01/04 11:52:30 by cacharle ### ########.fr */ +/* Updated: 2021/01/04 13:06:52 by charles ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef COMMON_H # define COMMON_H +# define _XOPEN_SOURCE 500 # include <unistd.h> # include <stdlib.h> # include <stdbool.h> diff --git a/common/args.c b/common/src/args.c index 2070e46..2070e46 100644 --- a/common/args.c +++ b/common/src/args.c diff --git a/common/helper.c b/common/src/helper.c index a9d0652..a9d0652 100644 --- a/common/helper.c +++ b/common/src/helper.c diff --git a/common/io.c b/common/src/io.c index c01accd..c01accd 100644 --- a/common/io.c +++ b/common/src/io.c diff --git a/philo_one/Makefile b/philo_one/Makefile index 6c6a97a..e976a50 100644 --- a/philo_one/Makefile +++ b/philo_one/Makefile @@ -6,17 +6,18 @@ # By: cacharle <marvin@42.fr> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/11/24 05:50:15 by cacharle #+# #+# # -# Updated: 2021/01/04 10:23:35 by cacharle ### ########.fr # +# Updated: 2021/01/08 14:31:29 by charles ### ########.fr # # # # **************************************************************************** # RM = rm -f +MKDIR = mkdir -p MAKE = make --no-print-directory COMMONDIR = ../common CC = gcc -CCFLAGS = -I$(COMMONDIR) -O2 -std=c99 -Wall -Wextra -Werror +CCFLAGS = -std=c99 -Wall -Wextra -Werror -O2 -I$(COMMONDIR)/inc LDFLAGS = -lpthread -L$(COMMONDIR) -lphilocommon NAME = philo_one @@ -30,7 +31,7 @@ OBJ = $(SRC:$(SRCDIR)/%.c=$(OBJDIR)/%.o) all: prebuild $(NAME) prebuild: - @mkdir -pv $(OBJDIR) + $(MKDIR) $(OBJDIR) $(NAME): common_all $(OBJ) $(CC) -o $@ $(OBJ) $(LDFLAGS) diff --git a/philo_three/Makefile b/philo_three/Makefile index 17c5b46..da20c9d 100644 --- a/philo_three/Makefile +++ b/philo_three/Makefile @@ -6,17 +6,18 @@ # By: cacharle <marvin@42.fr> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/11/24 05:50:15 by cacharle #+# #+# # -# Updated: 2021/01/01 16:28:33 by charles ### ########.fr # +# Updated: 2021/01/08 14:32:09 by charles ### ########.fr # # # # **************************************************************************** # RM = rm -f +MKDIR = mkdir -p MAKE = make --no-print-directory COMMON_DIR = ../common CC = gcc -CCFLAGS = -I$(COMMON_DIR) -O2 -std=c99 -Wall -Wextra #-Werror +CCFLAGS = -std=c99 -Wall -Wextra -Werror -O2 -I$(COMMON_DIR)/inc LDFLAGS = -lpthread -L$(COMMON_DIR) -lphilocommon NAME = philo_three @@ -30,7 +31,7 @@ OBJ = $(SRC:$(SRCDIR)/%.c=$(OBJDIR)/%.o) all: prebuild $(NAME) prebuild: - @mkdir -p $(OBJDIR) + $(MKDIR) $(OBJDIR) $(NAME): common_all $(OBJ) $(CC) -o $@ $(OBJ) $(LDFLAGS) diff --git a/philo_two/Makefile b/philo_two/Makefile index 88c0f8b..ccb7ae6 100644 --- a/philo_two/Makefile +++ b/philo_two/Makefile @@ -6,17 +6,18 @@ # 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/08 14:31:50 by charles ### ########.fr # # # # **************************************************************************** # RM = rm -f +MKDIR = mkdir -p MAKE = make --no-print-directory COMMONDIR = ../common CC = gcc -CCFLAGS = -g -I$(COMMONDIR) -O2 -std=c99 -Wall -Wextra #-Werror +CCFLAGS = -std=c99 -Wall -Wextra -Werror -O2 -I$(COMMONDIR)/inc LDFLAGS = -lpthread -L$(COMMONDIR) -lphilocommon NAME = philo_two @@ -30,7 +31,7 @@ OBJ = $(SRC:$(SRCDIR)/%.c=$(OBJDIR)/%.o) all: prebuild $(NAME) prebuild: - @mkdir -p $(OBJDIR) + $(MKDIR) $(OBJDIR) $(NAME): common_all $(OBJ) $(CC) -o $@ $(OBJ) $(LDFLAGS) |