raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Makefile stuff

Browse source
This commit is contained in:
Maieul BOYER 2024-04-28 19:56:16 +02:00
parent 9c60e63fb9
commit 96215449bd
No known key found for this signature in database
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shcat_c/Makefile
View file

@ -6,7 +6,7 @@
# By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ # # By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/12 11:05:05 by rparodi #+# #+# # # Created: 2023/11/12 11:05:05 by rparodi #+# #+# #
# Updated: 2024/04/28 17:50:28 by maiboyer ### ########.fr # # Updated: 2024/04/28 19:53:00 by maiboyer ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -22,6 +22,8 @@ END = \033[0m
# Rules # Rules
NAME = minishell
# All (make all) # All (make all)
all: all:
@$(MAKE) --no-print-directory header OBJDIRNAME=$(OBJDIRNAME) @$(MAKE) --no-print-directory header OBJDIRNAME=$(OBJDIRNAME)
@ -71,13 +73,13 @@ pull:
# Clean (make clean) # Clean (make clean)
clean: clean:
@printf '$(GREY) Removing $(END)$(RED)Objects$(END)\n' @echo -e '$(GREY) Removing $(END)$(RED)Objects$(END)'
@printf '$(GREY) Removing $(END)$(RED)Objects Folder$(END)\n' @echo -e '$(GREY) Removing $(END)$(RED)Objects Folder$(END)'
@$(RM) -r $(OBJDIRNAME) @$(RM) -r $(OBJDIRNAME)
# Clean (make fclean) # Clean (make fclean)
fclean: clean fclean: clean
@printf '$(GREY) Removing $(END)$(RED)Program$(END)\n' @echo -e '$(GREY) Removing $(END)$(RED)Program$(END)'
@$(RM) $(NAME) @$(RM) $(NAME)
@echo "" @echo ""

18
shcat_c/Minishell.mk
View file

@ -6,7 +6,7 @@
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ # # By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/04/28 17:28:30 by maiboyer #+# #+# # # Created: 2024/04/28 17:28:30 by maiboyer #+# #+# #
# Updated: 2024/04/28 18:56:27 by maiboyer ### ########.fr # # Updated: 2024/04/28 19:52:08 by maiboyer ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -54,9 +54,14 @@ RED = \033[0;31m
GOLD = \033[38;5;220m GOLD = \033[38;5;220m
END = \033[0m END = \033[0m
.PHONY: $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a .PHONY: all bonus
all: $(NAME) all:
@$(MAKE) -C ./stdme/ LIB_NAME="$(shell realpath ./stdme)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libme.a
@$(MAKE) -C ./parser/ LIB_NAME="$(shell realpath ./parser)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a
@$(MAKE) -f./Minishell.mk $(NAME)
__build_final: $(NAME)
# Bonus (make bonus) # Bonus (make bonus)
bonus: $(OBJ) $(LIB_OBJ) $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a bonus: $(OBJ) $(LIB_OBJ) $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a
@ -67,7 +72,7 @@ bonus: $(OBJ) $(LIB_OBJ) $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a
@cc $(CFLAGS) -D DEBUG=42 -o $(NAME) $(OBJ) -L$(OBJDIRNAME) -lme -lgmr @cc $(CFLAGS) -D DEBUG=42 -o $(NAME) $(OBJ) -L$(OBJDIRNAME) -lme -lgmr
# Dependences for all # Dependences for all
$(NAME): $(OBJ) $(LIB_OBJ) $(OBJDIRNAME)/libme.a $(OBJDIRNAME)/libgmr.a $(NAME): $(OBJ) $(LIB_OBJ)
@mkdir -p $(OBJDIRNAME) @mkdir -p $(OBJDIRNAME)
@mkdir -p $(OBJDIRNAME)/$(LIBDIRNAME) @mkdir -p $(OBJDIRNAME)/$(LIBDIRNAME)
@mkdir -p $(OBJDIRNAME)/$(SRCDIRNAME) @mkdir -p $(OBJDIRNAME)/$(SRCDIRNAME)
@ -78,10 +83,5 @@ $(OBJDIRNAME)/%.o: %.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@printf '$(GREY) Compiling $(END)$(GREEN)$<$(END)\n' @printf '$(GREY) Compiling $(END)$(GREEN)$<$(END)\n'
@cc $(CFLAGS) -o $@ -c $< @cc $(CFLAGS) -o $@ -c $<
$(OBJDIRNAME)/libme.a:
@$(MAKE) --no-print-directory -C ./stdme/ LIB_NAME="$(realpath ./$(stdme))/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libme.a
$(OBJDIRNAME)/libgmr.a:
@$(MAKE) --no-print-directory -C ./parser/ LIB_NAME="$(realpath ./$(stdme))/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a
-include ${OBJ:.o=.d} -include ${OBJ:.o=.d}

2
shcat_c/stdme

@ -1 +1 @@
Subproject commit 559fefe22084dc18707c8244c26b69e307762226 Subproject commit 1812a562f473f0ad218fe4b1055ed377f5a020d3