aboutsummaryrefslogtreecommitdiff
path: root/philo_three/Makefile
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2021-01-03 14:42:46 +0100
committerCharles Cabergs <me@cacharle.xyz>2021-01-03 14:47:11 +0100
commitcc2adbf09541c0d9309d66f719c86e7fe5d351d7 (patch)
treef9d61b11e57dcdfebc9092554df1a64d0d4958c5 /philo_three/Makefile
parente874ad94a31a8259b8eb7ad2865767c081bcd279 (diff)
downloadphilosophers-cc2adbf09541c0d9309d66f719c86e7fe5d351d7.tar.gz
philosophers-cc2adbf09541c0d9309d66f719c86e7fe5d351d7.tar.bz2
philosophers-cc2adbf09541c0d9309d66f719c86e7fe5d351d7.zip
Updated philo directories for correctionrendu
Diffstat (limited to 'philo_three/Makefile')
-rw-r--r--philo_three/Makefile30
1 files changed, 12 insertions, 18 deletions
diff --git a/philo_three/Makefile b/philo_three/Makefile
index 17c5b46..050e2d5 100644
--- a/philo_three/Makefile
+++ b/philo_three/Makefile
@@ -6,39 +6,39 @@
# 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/03 14:40:14 by cacharle ### ########.fr #
# #
# **************************************************************************** #
RM = rm -f
MAKE = make --no-print-directory
-COMMON_DIR = ../common
-
CC = gcc
-CCFLAGS = -I$(COMMON_DIR) -O2 -std=c99 -Wall -Wextra #-Werror
-LDFLAGS = -lpthread -L$(COMMON_DIR) -lphilocommon
+CCFLAGS = -I. -O2 -std=c99 -Wall -Wextra -Werror
+LDFLAGS = -lpthread
NAME = philo_three
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/child.c src/event.c src/main.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 $(COMMON_DIR) all
-
-common_clean:
- $(MAKE) -C $(COMMON_DIR) clean
-
-.PHONY: all prebuild clean fclean re common_all common_clean
+.PHONY: all prebuild clean fclean re