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

Updated Makefile to properly align and make linking pop out

Browse source
This commit is contained in:
Maix0 2024-07-03 22:41:19 +02:00
parent d2a59f770e
commit 776ccfa9c0
7 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Minishell.mk
View file

@ -72,18 +72,18 @@ bonus: $(OBJ) $(LIBS_FILES)
@mkdir -p $(BUILD_DIR) @mkdir -p $(BUILD_DIR)
@mkdir -p $(BUILD_DIR)/$(SRCDIRNAME) @mkdir -p $(BUILD_DIR)/$(SRCDIRNAME)
@echo -e '$(GREY) Be Carefull ur in $(END)$(GREEN)Debug Mode$(END)' @echo -e '$(GREY) Be Carefull ur in $(END)$(GREEN)Debug Mode$(END)'
@echo -e '$(GREY) Linking\t$(END)$(GREEN)$(NAME)$(END)' @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)'
@$(CC) $(CFLAGS) -DDEBUG=1 -o $(NAME) $(OBJ) -L$(BUILD_DIR) $(call link_group,$(LIBS_FLAGS)) @$(CC) $(CFLAGS) -DDEBUG=1 -o $(NAME) $(OBJ) -L$(BUILD_DIR) $(call link_group,$(LIBS_FLAGS))
# Dependences for all # Dependences for all
$(NAME): $(OBJ) $(LIBS_FILES) $(NAME): $(OBJ) $(LIBS_FILES)
@echo -e '$(GREY) Linking\t$(END)$(GREEN)$(NAME)$(END)' @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)'
@$(CC) $(CFLAGS) -o $(NAME) $(OBJ) -L$(BUILD_DIR) $(call link_group,$(LIBS_FLAGS)) @$(CC) $(CFLAGS) -o $(NAME) $(OBJ) -L$(BUILD_DIR) $(call link_group,$(LIBS_FLAGS))
# Creating the objects # Creating the objects
$(BUILD_DIR)/sh/%.o: %.c $(BUILD_DIR)/sh/%.o: %.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo -e '$(GREY) Compiling\t$(END)$(GREEN)$<$(END)' @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)'
@$(CC) $(CFLAGS) -o $@ -c $< @$(CC) $(CFLAGS) -o $@ -c $<
-include ${OBJ:.o=.d} -include ${OBJ:.o=.d}

11
allocator/Makefile
View file

@ -6,7 +6,7 @@
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ # # By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# #
# Updated: 2024/05/30 16:02:45 by maiboyer ### ########.fr # # Updated: 2024/07/03 22:39:16 by maiboyer ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -37,11 +37,12 @@ DEPS = $(addsuffix .d,$(addprefix $(BUILD_DIR)/aq/,$(SRC_FILES)))
LIBS = $(addprefix $(LIBS_DIR)/,$(LIBS_NAME)) LIBS = $(addprefix $(LIBS_DIR)/,$(LIBS_NAME))
INCLUDES = $(addprefix -I,$(foreach P,$(INCLUDE_DIR) $(LIBS) $(addsuffix /include,$(LIBS)) vendor $(addsuffix /vendor,$(LIBS)),$(realpath $(P)))) INCLUDES = $(addprefix -I,$(foreach P,$(INCLUDE_DIR) $(LIBS) $(addsuffix /include,$(LIBS)) vendor $(addsuffix /vendor,$(LIBS)),$(realpath $(P))))
COL_GRAY = \033[90m
COL_WHITE = \033[37m
COL_GREEN = \033[32m
COL_BOLD = \033[1m COL_BOLD = \033[1m
COL_GOLD = \033[33m
COL_GRAY = \033[90m
COL_GREEN = \033[32m
COL_RESET = \033[0m COL_RESET = \033[0m
COL_WHITE = \033[37m
# TODO: REMOVE FOR RENDU !!!!! # TODO: REMOVE FOR RENDU !!!!!
CFLAGS += -DPRINT_BACKTRACE CFLAGS += -DPRINT_BACKTRACE
@ -54,7 +55,7 @@ all: $(NAME)
$(NAME): $(TARGET) $(NAME): $(TARGET)
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
@echo -e '$(COL_GRAY) Linking\t$(COL_GREEN)$(TARGET)$(COL_RESET)' @echo -e '$(COL_GRAY) Linking \t$(COL_GOLD)$(TARGET)$(COL_RESET)'
@ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ)
$(BUILD_DIR)/aq/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/aq/%.o: $(SRC_DIR)/%.c

5
ast/Makefile
View file

@ -6,7 +6,7 @@
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ # # By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# #
# Updated: 2024/06/17 13:12:53 by maiboyer ### ########.fr # # Updated: 2024/07/03 22:39:28 by maiboyer ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -38,6 +38,7 @@ DEPS = $(addsuffix .d,$(addprefix $(BUILD_DIR)/ast/,$(SRC_FILES)))
LIBS = $(addprefix $(LIBS_DIR)/,$(LIBS_NAME)) LIBS = $(addprefix $(LIBS_DIR)/,$(LIBS_NAME))
INCLUDES = $(addprefix -I,$(foreach P,$(INCLUDE_DIR) $(LIBS) $(addsuffix /include,$(LIBS)) vendor $(addsuffix /vendor,$(LIBS)),$(realpath $(P)))) INCLUDES = $(addprefix -I,$(foreach P,$(INCLUDE_DIR) $(LIBS) $(addsuffix /include,$(LIBS)) vendor $(addsuffix /vendor,$(LIBS)),$(realpath $(P))))
COL_GOLD = \033[33m
COL_GRAY = \033[90m COL_GRAY = \033[90m
COL_WHITE = \033[37m COL_WHITE = \033[37m
COL_GREEN = \033[32m COL_GREEN = \033[32m
@ -55,7 +56,7 @@ all: $(NAME)
$(NAME): $(TARGET) $(NAME): $(TARGET)
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
@echo -e '$(COL_GRAY) Linking\t$(COL_GREEN)$(TARGET)$(COL_RESET)' @echo -e '$(COL_GRAY) Linking \t$(COL_GOLD)$(TARGET)$(COL_RESET)'
@ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ)
$(BUILD_DIR)/ast/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/ast/%.o: $(SRC_DIR)/%.c

2
math/Makefile
View file

@ -90,7 +90,7 @@ $(NAME): $(OBJ) $(LIB_OBJ)
# Creating the objects # Creating the objects
$(OBJDIRNAME)/%.o: %.c $(OBJDIRNAME)/%.o: %.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@printf '$(GREY) Compiling $(END)$(GREEN)$<$(END)\n' @printf '$(GREY) Building $(END)$(GREEN)$<$(END)\n'
@cc $(CFLAGS) -o $@ -c $< @cc $(CFLAGS) -o $@ -c $<
# Header # Header

4
parser/Grammar.mk
View file

@ -50,12 +50,12 @@ all: $(NAME)
$(NAME): $(TARGET) $(NAME): $(TARGET)
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
@echo -e '$(GREY) Linking\t$(END)$(GREEN)$(NAME)$(END)' @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)'
@ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ)
$(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo -e '$(GREY) Compiling\t$(END)$(GREEN)$<$(END)' @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)'
@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
clean: clean:

4
parser/Parser.mk
View file

@ -46,12 +46,12 @@ $(NAME): $(TARGET)
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
@#echo "ar rcs $(BUILD_DIR)/$(NAME) <OBJS...>" @#echo "ar rcs $(BUILD_DIR)/$(NAME) <OBJS...>"
@echo -e '$(GREY) Linking\t$(END)$(GREEN)$(NAME)$(END)' @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)'
@ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ)
$(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo -e '$(GREY) Compiling\t$(END)$(GREEN)$<$(END)' @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)'
@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
clean: clean:

5
stdme/Makefile
View file

@ -6,7 +6,7 @@
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ # # By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# #
# Updated: 2024/05/25 16:28:21 by maiboyer ### ########.fr # # Updated: 2024/07/03 22:39:36 by maiboyer ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -49,6 +49,7 @@ COL_WHITE = \033[37m
COL_GREEN = \033[32m COL_GREEN = \033[32m
COL_BOLD = \033[1m COL_BOLD = \033[1m
COL_RESET = \033[0m COL_RESET = \033[0m
COL_GOLD = \033[33m
# TODO: REMOVE FOR RENDU !!!!! # TODO: REMOVE FOR RENDU !!!!!
CFLAGS += -DPRINT_BACKTRACE CFLAGS += -DPRINT_BACKTRACE
@ -61,7 +62,7 @@ all: $(NAME)
$(NAME): $(TARGET) $(NAME): $(TARGET)
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
@echo -e '$(COL_GRAY) Linking\t$(COL_GREEN)$(TARGET)$(COL_RESET)' @echo -e '$(COL_GRAY) Linking \t$(COL_GOLD)$(TARGET)$(COL_RESET)'
@#$(CC) $(INCLUDES) $(OBJ) $(CFLAGS) -o $(NAME) @#$(CC) $(INCLUDES) $(OBJ) $(CFLAGS) -o $(NAME)
@ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ)