From 97859113df8f38247928c51fbab5857cd09a21b2 Mon Sep 17 00:00:00 2001 From: Gregory Date: Sun, 26 Mar 2017 00:16:50 +0200 Subject: [PATCH] fix Makefile --- Makefile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index b134854..96d12c6 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,9 @@ OBJ_FILES = $(SRC_FILES:.c=.o) SRC = $(addprefix $(SRC_DIR), $(SRC_FILES)) OBJ = $(addprefix $(OBJ_DIR), $(OBJ_FILES)) -FDF_HEADER = fdf.h - # header files +FDF_HEADER = fdf.h FDF_INC = ./inc/ INC = -I $(LIBFT_DIR)includes/ \ -I $(MLX_DIR) \ @@ -61,13 +60,17 @@ INC = -I $(LIBFT_DIR)includes/ \ LIBFT_FLAGS = -lft -L $(LIBFT_DIR) MLX_FLAGS = -lmlx -lXext -lX11 -L $(MLX_DIR) OTHER_FLAGS = -lm -CC_FLAGS = -Werror -Wextra -Wall -O3 +CC_FLAGS = -Werror -Wextra -Wall DEBUG = -g OPT = -O3 -FLAGS := $(CC_FLAGS) $(LIBFT_FLAGS) $(MLX_FLAGS) $(OTHER_FLAGS) \ - $(OPT) \ +COMP_FLAGS := $(CC_FLAGS) \ + $(OPT) \ $(DEBUG) +LINK_FLAGS := $(LIBFT_FLAGS) \ + $(MLX_FLAGS) \ + $(OTHER_FLAGS) + # compiler CC = gcc @@ -76,14 +79,14 @@ CC = gcc all: $(NAME) -$(NAME): $(OBJ) $(LIBFT_DIR)$(LIBFT) $(MLX_DIR)$(MLX) $(FDF_INC)$(FDF_HEADER) +$(NAME): $(LIBFT_DIR)$(LIBFT) $(MLX_DIR)$(MLX) $(OBJ) @echo "$(CYAN)Linking fdf binary...$(NORMAL)" - @$(CC) $(OBJ) $(FLAGS) -o $(NAME) + @$(CC) $(OBJ) $(LINK_FLAGS) -o $(NAME) @echo "$(GREEN)Done!$(NORMAL)" -$(OBJ_DIR)%.o : $(SRC_DIR)%.c +$(OBJ_DIR)%.o: $(SRC_DIR)%.c $(FDF_INC)$(FDF_HEADER) @echo "$(CYAN)Compiling object files: $(BLUE)$@$(NORMAL)" - @$(CC) $(FLAGS) $(INC) -c $< -o $@ + @$(CC) $(COMP_FLAGS) $(INC) -c $< -o $@ $(LIBFT_DIR)$(LIBFT): @echo "$(CYAN)Compiling libft library...$(NORMAL)"