new makefile (thx william) and src-->srcs

libftasm/Makefile

@@ -1,30 +1,24 @@
-# **************************************************************************** #
+#* ************************************************************************** *#
-#                                                                              #
+#*                                                                            *#
-#                                                         :::      ::::::::    #
+#*                                                        :::      ::::::::   *#
-#    Makefile                                           :+:      :+:    :+:    #
+#*   Makefile                                           :+:      :+:    :+:   *#
-#                                                     +:+ +:+         +:+      #
+#*                                                    +:+ +:+         +:+     *#
-#    By: jhalford <jack@crans.org>                  +#+  +:+       +#+         #
+#*   By: wescande <wescande@student.42.fr>          +#+  +:+       +#+        *#
-#                                                 +#+#+#+#+#+   +#+            #
+#*                                                +#+#+#+#+#+   +#+           *#
-#    Created: 2017/02/07 16:09:36 by jhalford          #+#    #+#              #
+#*   Created: 2016/08/29 21:32:58 by wescande          #+#    #+#             *#
-#    Updated: 2017/03/26 15:35:32 by jhalford         ###   ########.fr        #
+#*   Updated: 2016/12/24 02:14:21 by wescande         ###   ########.fr       *#
-#                                                                              #
+#*                                                                            *#
-# **************************************************************************** #
+#* ************************************************************************** *#
 
 NAME		=	libft.a
 
 CC			=	gcc
-AR			=	ar -rc
+FLAGS		=	-Wall -Wextra -Werror -O3
-MKDIR		=	mkdir -p
-RM			=	/bin/rm -rf
 
-W_FLAGS		=	-Wall -Wextra
+LEN_NAME	=	`printf "%s" $(NAME) |wc -c`
-D_FLAGS		=
+DELTA		=	$$(echo "$$(tput cols)-31-$(LEN_NAME)"|bc)
-V_FLAGS		=	-fvisibility=hidden
-FLAGS		=	$(W_FLAGS) $(D_FLAGS) $(V_FLAGS)
 
-DELTA		=	$$(echo "$$(tput cols)-47"|bc)
+SRC_DIR		=	srcs/
-
-SRC_DIR		=	src/
 INC_DIR		=	includes/
 OBJ_DIR		=	objs/
 
@@ -202,39 +196,43 @@ OBJS		=	$(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o))
 NB			=	$(words $(SRC_BASE))
 INDEX		=	0
 
-all:
+all :
-	@make -j $(NAME)
+	@$(MAKE) -j $(NAME)
 
-$(NAME): $(OBJ_DIR) $(OBJS)
+$(NAME) :		$(OBJ_DIR) $(OBJS)
-	@$(AR) $(NAME) $(OBJS)
+	@ar rcs $(NAME) $(OBJS)
-	@ranlib $(NAME)
+	@printf "\r\033[38;5;117m✓ MAKE $(NAME)\033[0m\033[K\n"
-	@#strip -x $(NAME)
-	@printf "\r\033[48;5;15;38;5;25m✅ MAKE $(NAME)\033[0m\033[K\n"
 
-$(OBJ_DIR)%.o: $(SRC_DIR)%.c | $(OBJ_DIR)
+$(OBJ_DIR) :
+	@mkdir -p $(OBJ_DIR)
+	@mkdir -p $(dir $(OBJS))
+
+$(OBJ_DIR)%.o :	$(SRC_DIR)%.c | $(OBJ_DIR)
 	@$(eval DONE=$(shell echo $$(($(INDEX)*20/$(NB)))))
 	@$(eval PERCENT=$(shell echo $$(($(INDEX)*100/$(NB)))))
-	@$(eval COLOR=$(shell echo $$(($(PERCENT)%35+196))))
+	@$(eval TO_DO=$(shell echo $$((20-$(INDEX)*20/$(NB) - 1))))
-	@$(eval TO_DO=$(shell echo $$((20-$(INDEX)*20/$(NB)))))
+	@$(eval COLOR=$(shell list=(160 196 202 208 215 221 226 227 190 154 118 82 46); index=$$(($(PERCENT) * $${#list[@]} / 100)); echo "$${list[$$index]}"))
-	@printf "\r\033[38;5;11m⌛ MAKE %10.10s : %2d%% \033[48;5;%dm%*s\033[0m%*s\033[48;5;255m \033[0m \033[38;5;11m %*.*s\033[0m\033[K" $(NAME) $(PERCENT) $(COLOR) $(DONE) "" $(TO_DO) "" $(DELTA) $(DELTA) "$@"
+	@printf "\r\033[38;5;%dm⌛ [%s]: %2d%% `printf '█%.0s' {0..$(DONE)}`%*s❙%*.*s\033[0m\033[K" $(COLOR) $(NAME) $(PERCENT) $(TO_DO) "" $(DELTA) $(DELTA) "$(shell echo "$@" | sed 's/^.*\///')"
 	@$(CC) $(FLAGS) -MMD -c $< -o $@\
 		-I $(INC_DIR)
 	@$(eval INDEX=$(shell echo $$(($(INDEX)+1))))
 
-$(OBJ_DIR):
+clean :
-	@$(MKDIR) $(OBJ_DIR)
+	@if [ -e $(OBJ_DIR) ]; \
-	@$(MKDIR) $(dir $(OBJS))
+	then \
+		rm -rf $(OBJ_DIR); \
+		printf "\r\033[38;5;202m✗ clean $(NAME).\033[0m\033[K\n"; \
+	fi;
 
-clean:
+fclean :		clean
-	@$(RM) $(OBJ_DIR)
+	@if [ -e $(NAME) ]; \
-	@printf "\r\033[38;5;202m✖ clean $(NAME).\033[0m\033[K\n"
+	then \
+		rm -rf $(NAME); \
+		printf "\r\033[38;5;196m✗ fclean $(NAME).\033[0m\033[K\n"; \
+	fi;
 
-fclean: clean
+re :			fclean all
-	@$(RM) $(NAME)
-	@printf "\r\033[38;5;196m❌ fclean $(NAME).\033[0m\033[K\n"
 
-re: fclean all
+.PHONY :		fclean clean re
-
-.PHONY: all clean fclean re
 
 -include $(OBJS:.o=.d)