refactor: remove the hard coded readline library path for macos in Makefile

move srcs to helpers/

Author: elkaboussi

Makefile

@@ -4,35 +4,36 @@ RM			= rm -rf
 MKDIR		= mkdir -p
 USERS		= $(USER)
 
-OS              =       $(shell uname -s)
+OS           := $(shell uname -s)
 ifeq ($(OS),Linux)
-	LINK 		= -lreadline
+    READLINE_LINK := -lreadline
 else
-	COMP        = -L/goinfre/$(USERS)/.brew/opt/readline/lib
-	LINK 		= -I/goinfre/$(USERS)/.brew/opt/readline/include
+    READLINE_DIR  := $(shell brew --prefix readline)
+    READLINE_COMP := -L$(READLINE_DIR)/lib
+    READLINE_LINK := -I$(READLINE_DIR)/include
 endif
 
-SRCS		= srcs/ft_close.c srcs/ft_dups.c srcs/ft_execve.c srcs/ft_fork.c srcs/ft_open.c srcs/ft_pipe.c srcs/ft_waits.c builtins/cd.c builtins/echo.c builtins/env.c builtins/export.c builtins/helpers.c builtins/pwd.c builtins/shell_exit.c builtins/unset.c builtins/utils.c execution/environment.c execution/execute.c execution/heredoc.c execution/misc.c execution/paths.c execution/shell.c execution/signals.c parsing/commands.c parsing/commands_list.c parsing/env.c parsing/expand.c parsing/expand_env.c parsing/free.c parsing/heredoc.c parsing/lexer.c parsing/operator.c parsing/parser.c parsing/heredoc_expansion.c parsing/parsing_utils.c parsing/token_list.c parsing/word_spliting.c utils/alpha.c utils/contains.c utils/fatal.c utils/ft_atoi.c utils/ft_calloc.c utils/ft_exit.c utils/ft_free.c utils/ft_itoa.c utils/ft_memcpy.c utils/ft_split.c utils/ft_strcmp.c utils/ft_strdup.c utils/ft_strjoins.c utils/ft_strlen.c utils/ft_substr.c utils/prints.c main.c
+SRCS		= helpers/ft_close.c helpers/ft_dups.c helpers/ft_execve.c helpers/ft_fork.c helpers/ft_open.c helpers/ft_pipe.c helpers/ft_waits.c builtins/cd.c builtins/echo.c builtins/env.c builtins/export.c builtins/helpers.c builtins/pwd.c builtins/shell_exit.c builtins/unset.c builtins/utils.c execution/environment.c execution/execute.c execution/heredoc.c execution/misc.c execution/paths.c execution/shell.c execution/signals.c parsing/commands.c parsing/commands_list.c parsing/env.c parsing/expand.c parsing/expand_env.c parsing/free.c parsing/heredoc.c parsing/lexer.c parsing/operator.c parsing/parser.c parsing/heredoc_expansion.c parsing/parsing_utils.c parsing/token_list.c parsing/word_spliting.c utils/alpha.c utils/contains.c utils/fatal.c utils/ft_atoi.c utils/ft_calloc.c utils/ft_exit.c utils/ft_free.c utils/ft_itoa.c utils/ft_memcpy.c utils/ft_split.c utils/ft_strcmp.c utils/ft_strdup.c utils/ft_strjoins.c utils/ft_strlen.c utils/ft_substr.c utils/prints.c main.c
 SRCS_DIRS	= $(dir $(SRCS))
 
-BIN_DIR		= bin/
+BIN_DIR		= build/
 
 OBJS		= $(SRCS:%.c=$(BIN_DIR)%.o)
 OBJS_DIRS	= $(dir $(OBJS))
 
-INCLUDES	= includes/builtin.h includes/execution.h includes/minishell.h includes/parsing.h includes/srcs.h includes/utils.h
+INCLUDES	= includes/builtin.h includes/execution.h includes/minishell.h includes/parsing.h includes/helpers.h includes/utils.h
 
 NAME		= minishell
 
 
 all: $(NAME)
 
 $(NAME): $(OBJS)
-	@$(CC) $(OBJS) -o $(NAME) $(LINK) 
+	@$(CC) $(OBJS) -o $(NAME) $(READLINE_LINK)
 
 $(BIN_DIR)%.o: %.c $(INCLUDES)
 	@$(MKDIR) $(OBJS_DIRS)
-	$(CC) $(COMP) $(CFLAGS)  -c $< -o $@ 
+	$(CC) $(READLINE_COMP) $(CFLAGS)  -c $< -o $@
 
 clean:
 	@$(RM) $(BIN_DIR)

srcs/ft_close.c helpers/ft_close.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "srcs.h"
+#include "helpers.h"
 
 void	ft_close(int fd)
 {

srcs/ft_dups.c helpers/ft_dups.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "srcs.h"
+#include "helpers.h"
 
 void	ft_dup(int fd)
 {

srcs/ft_execve.c helpers/ft_execve.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "srcs.h"
+#include "helpers.h"
 
 void	ft_execve(char *path, char **argv)
 {

srcs/ft_fork.c helpers/ft_fork.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "srcs.h"
+#include "helpers.h"
 
 int	ft_fork(void)
 {

srcs/ft_open.c helpers/ft_open.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "srcs.h"
+#include "helpers.h"
 
 int	ft_open(char *path, int flags, int mode)
 {

srcs/ft_pipe.c helpers/ft_pipe.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "srcs.h"
+#include "helpers.h"
 
 void	ft_pipe(int fd[2])
 {

srcs/ft_waits.c helpers/ft_waits.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "srcs.h"
+#include "helpers.h"
 
 void	ft_waitpid(pid_t pid)
 {

includes/srcs.h includes/helpers.h

@@ -1,7 +1,7 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   srcs.h                                             :+:      :+:    :+:   */
+/*   helpers.h                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: relkabou <[email protected]>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */

includes/minishell.h

@@ -28,7 +28,7 @@
 # include "builtin.h"
 # include "parsing.h"
 # include "execution.h"
-# include "srcs.h"
+# include "helpers.h"
 # include "utils.h"
 
 # define TRUE 1