From 487a66394061f2d14a2fa421302966b5442d643f Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Mon, 27 Jul 2020 18:55:07 +0200 Subject: I couldn't see shit --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1eb996b..0ae293d 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ SRCS_NAME += m_argv SRCS_NAME += m_comm SRCS_NAME += m_funptr SRCS_NAME += m_loop +SRCS_NAME += m_minishell SRCS_NAME += m_prompt SRCS_NAME += m_redirs SRCS_NAME += s_destroy @@ -49,17 +50,14 @@ SRCS_NAME += p_lcom_next SRCS_NAME += u_utils SRCS_NAME += u_vars #------------------------------------------------------------------------------# -SRCS = $(addprefix ${SRCS_DIR}, $(addprefix ft_, \ - $(addsuffix .c, ${SRCS_NAME}))) -SRCS += ${SRCS_DIR}minishell.c +SRCS = $(addprefix ${SRCS_DIR}, $(addsuffix .c, ${SRCS_NAME})) #------------------------------------------------------------------------------# INCS_NAME = b_builtins INCS_NAME += d_enum INCS_NAME += d_define INCS_NAME += s_struct #------------------------------------------------------------------------------# -INCS = $(addprefix ${SRCS_DIR}, $(addprefix ft_, \ - $(addsuffix .h, ${INCS_NAME}))) +INCS = $(addprefix ${SRCS_DIR}, $(addsuffix .h, ${INCS_NAME})) INCS += $(patsubst %.c,%.h,${SRCS}) #------------------------------------------------------------------------------# OBJS = $(patsubst ${SRCS_DIR}%.c,${OBJS_DIR}%.o,${SRCS}) -- cgit v1.2.3 From 004eef9a3fd3403d6634ca658336d9a1e9766685 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Mon, 27 Jul 2020 21:19:29 +0200 Subject: In progress --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0ae293d..50854cf 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,7 @@ SRCS_NAME += p_lcom SRCS_NAME += p_lcom_next SRCS_NAME += u_utils SRCS_NAME += u_vars +SRCS_NAME += u_vars_next #------------------------------------------------------------------------------# SRCS = $(addprefix ${SRCS_DIR}, $(addsuffix .c, ${SRCS_NAME})) #------------------------------------------------------------------------------# -- cgit v1.2.3 From 4fe88a37306072c5eacf24ab4dd1913cc9c30d3c Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Thu, 30 Jul 2020 18:30:35 +0200 Subject: SHLVL boyy --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 50854cf..0868859 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ SRCS_NAME += b_echo SRCS_NAME += b_env SRCS_NAME += b_exit SRCS_NAME += b_export +# SRCS_NAME += b_export_next SRCS_NAME += b_pwd SRCS_NAME += b_type SRCS_NAME += b_unset -- cgit v1.2.3 From c19bd35afdb45e49cebdfd96e7adb1e6fe477f0c Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Thu, 30 Jul 2020 20:30:58 +0200 Subject: Double exit no more --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0868859..cd96f76 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ SRCS_NAME += e_externs_pipes SRCS_NAME += e_lcom SRCS_NAME += e_pipes SRCS_NAME += f_chdir +SRCS_NAME += f_com SRCS_NAME += f_errno SRCS_NAME += f_fail SRCS_NAME += f_redir -- cgit v1.2.3 From b776f92ee534e42e22175e4f2bcccec83d9cfcc2 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sat, 1 Aug 2020 21:14:17 +0200 Subject: Makefile update --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cd96f76..23115fa 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ default: all #--------------------------------- SHELL --------------------------------------# #==============================================================================# SHELL := /bin/sh +OS = $(shell uname) #==============================================================================# #------------------------------ DIRECTORIES -----------------------------------# #==============================================================================# @@ -71,7 +72,15 @@ LFT_SRCS = $(shell find ${LFT_SRCS_DIR} -name "*.c") #==============================================================================# #-------------------------------- COMPILER ------------------------------------# #==============================================================================# +ifeq (${OS}, FreeBSD) +CC = /usr/bin/cc +endif +ifeq (${OS}, Linux) +CC = /usr/bin/clang-9 +endif +ifeq (${OS}, Darwin) CC = clang +endif CFLAGS = -std=c89 CFLAGS += -Wall CFLAGS += -Wextra -- cgit v1.2.3 From 8680737a802539f3c21a295ad45eb9be72c73f5f Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sat, 1 Aug 2020 21:25:09 +0200 Subject: More UNIX friendly libft --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 23115fa..5630947 100644 --- a/Makefile +++ b/Makefile @@ -3,14 +3,14 @@ default: all #--------------------------------- SHELL --------------------------------------# #==============================================================================# SHELL := /bin/sh -OS = $(shell uname) +OS = $(shell uname) #==============================================================================# #------------------------------ DIRECTORIES -----------------------------------# #==============================================================================# SRCS_DIR = src/ OBJS_DIR = obj/ LFT_DIR = libft/ -LFT_INCS_DIR = ${LFT_DIR}inc/ +LFT_INCS_DIR = ${LFT_DIR}include/ LFT_SRCS_DIR = ${LFT_DIR}src/ #==============================================================================# #--------------------------------- FILES --------------------------------------# @@ -30,6 +30,7 @@ SRCS_NAME += e_externs_next SRCS_NAME += e_externs_pipes SRCS_NAME += e_lcom SRCS_NAME += e_pipes +SRCS_NAME += f_alloc SRCS_NAME += f_chdir SRCS_NAME += f_com SRCS_NAME += f_errno -- cgit v1.2.3 From 6ca882c8feb9fb88cf8e1421e882fb7e9efb97f8 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Mon, 3 Aug 2020 16:50:32 +0200 Subject: In progress --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5630947..d74ecf3 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ SRCS_NAME += b_echo SRCS_NAME += b_env SRCS_NAME += b_exit SRCS_NAME += b_export -# SRCS_NAME += b_export_next +SRCS_NAME += b_export_next SRCS_NAME += b_pwd SRCS_NAME += b_type SRCS_NAME += b_unset -- cgit v1.2.3