From bb43c3b95a704a6ed9864e54e6997c4642d10ed2 Mon Sep 17 00:00:00 2001 From: gbrochar Date: Mon, 11 Mar 2024 15:32:39 +0100 Subject: [PATCH] chore: comply with subject --- Makefile | 30 ++++++++++--------- ft_atoi_base.s => ft_atoi_base_bonus.s | 0 ft_list_print.c | 9 ------ ...push_front.s => ft_list_push_front_bonus.s | 0 ...t_remove_if.s => ft_list_remove_if_bonus.s | 0 ft_list_size.s => ft_list_size_bonus.s | 0 ft_list_sort.s => ft_list_sort_bonus.s | 0 7 files changed, 16 insertions(+), 23 deletions(-) rename ft_atoi_base.s => ft_atoi_base_bonus.s (100%) delete mode 100644 ft_list_print.c rename ft_list_push_front.s => ft_list_push_front_bonus.s (100%) rename ft_list_remove_if.s => ft_list_remove_if_bonus.s (100%) rename ft_list_size.s => ft_list_size_bonus.s (100%) rename ft_list_sort.s => ft_list_sort_bonus.s (100%) diff --git a/Makefile b/Makefile index 5a20432..5f2b39d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ NAME = libasm +MAKE = make --no-print-directory + SRC = \ ft_strlen.s \ ft_strcpy.s \ @@ -7,34 +9,34 @@ SRC = \ ft_write.s \ ft_read.s \ ft_strdup.s \ - ft_list_size.s \ - ft_list_push_front.s \ - ft_list_sort.s \ - ft_list_remove_if.s \ - ft_atoi_base.s \ + +SRCBONUS = \ + ft_list_size_bonus.s \ + ft_list_push_front_bonus.s \ + ft_list_sort_bonus.s \ + ft_list_remove_if_bonus.s \ + ft_atoi_base_bonus.s \ OBJ = $(SRC:.s=.o) +OBJBONUS = $(SRCBONUS:.s=.o) %.o:%.s nasm -f elf64 $< -o $@ all: $(NAME) -bonus: all +bonus: $(OBJ) $(OBJBONUS) + ar rcs libasm.a $(OBJ) $(OBJBONUS) $(NAME): $(OBJ) ar rcs libasm.a $(OBJ) -test: $(NAME) - gcc -Wall -Werror -Wextra -g ft_list_print.c main.c -L. -lasm -o libasm_unit_tests - clean: - rm $(OBJ) + rm -fv $(OBJ) $(OBJBONUS) -fclean: - rm libasm.a - rm libasm_unit_tests +fclean: clean + rm -fv libasm.a re: fclean all -.PHONY: all test +.PHONY: all bonus clean fclean re diff --git a/ft_atoi_base.s b/ft_atoi_base_bonus.s similarity index 100% rename from ft_atoi_base.s rename to ft_atoi_base_bonus.s diff --git a/ft_list_print.c b/ft_list_print.c deleted file mode 100644 index 632ea9c..0000000 --- a/ft_list_print.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "libasm.h" -#include - -void ft_list_print(t_list *begin_list) { - while (begin_list) { - printf("%s", (char *)begin_list->data); - begin_list = begin_list->next; - } -} diff --git a/ft_list_push_front.s b/ft_list_push_front_bonus.s similarity index 100% rename from ft_list_push_front.s rename to ft_list_push_front_bonus.s diff --git a/ft_list_remove_if.s b/ft_list_remove_if_bonus.s similarity index 100% rename from ft_list_remove_if.s rename to ft_list_remove_if_bonus.s diff --git a/ft_list_size.s b/ft_list_size_bonus.s similarity index 100% rename from ft_list_size.s rename to ft_list_size_bonus.s diff --git a/ft_list_sort.s b/ft_list_sort_bonus.s similarity index 100% rename from ft_list_sort.s rename to ft_list_sort_bonus.s