merge conflit (j'aime pas les headers)

This commit is contained in:
2024-02-16 21:26:10 +01:00
4 changed files with 63 additions and 4 deletions

View File

@ -6,7 +6,7 @@
# By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2023/07/28 00:35:01 by tomoron #+# #+# #
# Updated: 2024/02/16 16:28:16 by tomoron ### ########.fr #
# Updated: 2024/02/16 21:24:47 by tomoron ### ########.fr #
# #
# **************************************************************************** #
@ -22,10 +22,13 @@ SRCS = main.c\
parsing.c\
debug.c\
env_to_char_tab.c\
parsing_var.c
parsing_var.c\
minishellrc.c
OBJS = $(SRCS:.c=.o)
OBJS_DIR = objs
FLAGS = -Wall -Wextra -Werror -g
LIBFT = libft/libft.a
@ -35,6 +38,7 @@ NAME = minishell
all: $(NAME)
$(NAME) : $(LIBFT) $(OBJS)
mkdir $(OBJS_DIR)
$(CC) $(FLAGS) $(OBJS) $(LIBFT) -lreadline -o $(NAME)
$(LIBFT):