Dev (#2)
* Restart from scratch
branched out on dev
removed all previous source files
started test on new env2lst function
* norm: splitted functions in main into appropriate file
Moved lstdelenvelem & env2lst to ms_env.c
Normed out files
* Feat(WIP): Added possibility to cmd_env to execute commands with
altered env.
Added dummy function for cd, echo, setenv & unsetenv
Started work on env copy feature
* feature: switched env from ft_list to specific list
* feature: added execution of commands from path
* feature: added env, setenv & unsetenv builtins
added -i option & command execution to env
added setenv & unsetenv builtins
* Clean-up: normed out files
* Changed comportment on error for check_path functions
* feature: added completion for ~ and ${}
WIP leaks detected on ${} completion
* fix leak on ext need test
* feature: added echo cmd
changed printf ref to ft_printf
* feature: add cd built-in
* Simple norm-out
* moved env functions to libft
* fixed out-of-memory access in extension
* Resolved infinite loop in extension revolving
WIP norming in cd
* Normedout cmd_cd.c
* Normed out functions in cmd_cd
* Normed out funtions
sorting out needed
* removed -fsanitize from Makefile
* corrected env -i crash & SHLVL
* Delete norm.txt
* added put_error_cd2 in put_error_cd.c
* added inline environment
This commit is contained in:
tvdu29
GitHub
118
Makefile
118
Makefile
@@ -5,45 +5,107 @@
|
||||
# +:+ +:+ +:+ #
|
||||
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2018/11/22 14:43:33 by tmaze #+# #+# #
|
||||
# Updated: 2019/02/01 10:20:18 by tmaze ### ########.fr #
|
||||
# Created: 2019/03/27 16:51:02 by tmaze #+# #+# #
|
||||
# Updated: 2020/01/30 12:00:42 by tmaze ### ########.fr #
|
||||
# #
|
||||
#******************************************************************************#
|
||||
|
||||
CC := gcc
|
||||
CCFLAGS := -Wall -Werror -Wextra -g
|
||||
CCSTD :=
|
||||
NAME = minishell
|
||||
|
||||
NAME := minishell
|
||||
# Make options
|
||||
MAKEFLAGS += --no-print-directory
|
||||
|
||||
SRCS := main.c exec.c cmd_echo.c cmd_cd.c cmd_env.c cmd_setenv.c cmd_unsetenv.c ms_env.c ms_env2.c
|
||||
OBJS_DIR := objs
|
||||
OBJS := $(SRCS:.c=.o)
|
||||
INCLS := -Iincludes -Ilibft
|
||||
LIBS := -Llibft -lft
|
||||
# Output
|
||||
UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Darwin)
|
||||
ECHO = @echo
|
||||
endif
|
||||
|
||||
.PHONY = all clean fclean re
|
||||
ifeq ($(UNAME), Linux)
|
||||
ECHO = @echo -e
|
||||
endif
|
||||
|
||||
all: $(NAME)
|
||||
# Compilator
|
||||
CC = gcc
|
||||
FLAGS = -Wall -Wextra -Werror
|
||||
|
||||
$(NAME): $(OBJS) libft/libft.a
|
||||
$(CC) $(CCFLAGS) $(CCSTD) $(INCLS) $(OBJS) -o $(NAME) $(LIBS)
|
||||
# Folders
|
||||
LIBDIR = libft
|
||||
SRCDIR = srcs
|
||||
OBJDIR = objs
|
||||
INCDIR = includes libft/includes
|
||||
|
||||
%.o: srcs/%.c includes/minishell.h
|
||||
$(CC) $(CCFLAGS) $(CCSTD) $(INCLS) -c $< -o $@
|
||||
# Source files
|
||||
SRC = main.c \
|
||||
cmd_env.c \
|
||||
cmd_setenv.c \
|
||||
cmd_unsetenv.c \
|
||||
cmd_cd.c \
|
||||
cmd_echo.c \
|
||||
ms_exec.c \
|
||||
ms_ext.c \
|
||||
put_error_cd.c
|
||||
|
||||
$(OBJS_DIR):
|
||||
mkdir $(OBJS_DIR)
|
||||
OBJ = $(SRC:.c=.o)
|
||||
|
||||
libft/libft.a:
|
||||
$(MAKE) -Clibft all
|
||||
LIB = ft
|
||||
LIBFILE = libft.a
|
||||
|
||||
clean:
|
||||
rm -rf $(OBJS)
|
||||
$(MAKE) -Clibft clean
|
||||
# Prefixes
|
||||
OBJP = $(addprefix $(OBJDIR)/, $(SRC:.c=.o))
|
||||
INCP = $(foreach dir, $(INCDIR), -I$(dir))
|
||||
|
||||
fclean: clean
|
||||
rm -f $(NAME)
|
||||
$(MAKE) -Clibft fclean
|
||||
# Default Rule
|
||||
DRULE = all
|
||||
|
||||
re: fclean all
|
||||
# Main rules
|
||||
default :
|
||||
@$(ECHO) -e "$(PUR)===> $(GRE)$(NAME) : $(PUR) START RULE : $(DRULE) <===$(DEF)"
|
||||
@make $(DRULE)
|
||||
@$(ECHO) -e "$(PUR)===> $(GRE)$(NAME) : $(PUR) END RULE : $(DRULE) <===$(DEF)"
|
||||
|
||||
all : $(NAME)
|
||||
|
||||
# Compilation rules
|
||||
|
||||
$(OBJDIR)/%.o : $(SRCDIR)/%.c includes/minishell.h
|
||||
@mkdir -p $(OBJDIR)
|
||||
$(CC) $(FLAGS) -c -o $@ $< $(INCP)
|
||||
|
||||
$(LIBDIR)/$(LIBFILE) :
|
||||
@$(ECHO) "$(YEL)===> $(GRE)$(NAME) : $(YEL) Librairy Compilation <===$(DEF)"
|
||||
$(MAKE) -C $(LIBDIR) all
|
||||
|
||||
$(NAME) : $(OBJP) $(LIBDIR)/$(LIBFILE)
|
||||
@$(ECHO) "$(YEL)===> $(GRE)$(NAME) : $(YEL) Binary Compilation <===$(DEF)"
|
||||
$(CC) $(FLAGS) -o $@ $^ $(INCP) -L$(LIBDIR) -l$(LIB)
|
||||
|
||||
# Cleaner rules
|
||||
clean :
|
||||
@$(ECHO) "$(RED)===> $(GRE)$(NAME) : $(RED) Delete Object Files <===$(DEF)"
|
||||
@$(RM) -rf $(OBJDIR)
|
||||
@$(MAKE) -C $(LIBDIR) clean
|
||||
|
||||
fclean : clean
|
||||
@$(ECHO) "$(RED)===> $(GRE)$(NAME) : $(RED) Delete Binary File <===$(DEF)"
|
||||
@$(RM) -f $(NAME) $(NAME2)
|
||||
@$(RM) -rf *.dSYM
|
||||
@$(MAKE) -C $(LIBDIR) fclean
|
||||
|
||||
re : fclean default
|
||||
|
||||
# Phony
|
||||
.PHONY = default all re clean fclean
|
||||
# Color
|
||||
DEF = \033[0m
|
||||
BLA = \033[30m
|
||||
BLI = \033[5m
|
||||
BLU = \033[34m
|
||||
CYA = \033[36m
|
||||
GRA = \033[1m
|
||||
GRE = \033[32m
|
||||
PUR = \033[35m
|
||||
RED = \033[31m
|
||||
SOU = \033[4m
|
||||
WHI = \033[37m
|
||||
YEL = \033[33m
|
||||
|
||||
Reference in New Issue
Block a user