From f3a69da6e531a3eb5e179e1e2ecdc5194bd5857b Mon Sep 17 00:00:00 2001 From: Lukas Jiriste Date: Tue, 16 Jan 2024 10:22:22 +0100 Subject: [PATCH] Update Libft Update Libft (not needed?). Change Makefile to reflect changes in Libft structure. Add debug target to Makefile which compiles with -g and propagates to Libft. --- Libft | 2 +- Makefile | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Libft b/Libft index cfccb90..988bd41 160000 --- a/Libft +++ b/Libft @@ -1 +1 @@ -Subproject commit cfccb906992539b81ed8443dae11cbfefe72b450 +Subproject commit 988bd412d9b3d0681457c4c169d398c273d0c6ff diff --git a/Makefile b/Makefile index 4cfd9ba..510eea5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ CC := gcc -CFLAGS := -Wall -Wextra -Werror -g -INCGRAPH := -Iminilibx-linux -I/usr/include -ILibft +CFLAGS := -std=c99 -Wall -Wextra -Werror -Wpedantic +INCGRAPH := -Iminilibx-linux -I/usr/include -ILibft/inc LINKGRAPH := -Lminilibx-linux -lmlx -L/usr/lib -lXext -lX11 -lm -lbsd -LLibft -lft NAME := fractol @@ -15,6 +15,9 @@ OBJS := $(SRCS:%.c=%.o) all : $(NAME) +debug : CFLAGS += -g +debug : $(NAME) + $(NAME) : $(OBJS) $(LFT) $(MLX) $(CC) $(CFLAGS) $(OBJS) -o $@ $(LINKGRAPH) @@ -25,7 +28,11 @@ $(MLX) : $(MAKE) -C $(MLXDIR) $(LFT) : +ifneq (,$(findstring debug, $(MAKECMDGOALS))) + $(MAKE) -C $(LFTDIR) debug +else $(MAKE) -C $(LFTDIR) +endif clean : $(RM) $(OBJS) @@ -35,4 +42,7 @@ clean : fclean : $(RM) $(OBJS) $(NAME) $(MAKE) -C $(LFTDIR) fclean - $(MAKE) -C $(MLXDIR) fclean + $(MAKE) -C $(MLXDIR) clean + +re : fclean + $(MAKE) -- 2.30.2