From 22de4eb11ac490753bc0fec96b09b978cc37715e Mon Sep 17 00:00:00 2001 From: airone01 <21955960+airone01@users.noreply.github.com> Date: Sat, 24 Jan 2026 17:12:11 +0100 Subject: [PATCH] refactor: move to framework dit --- Makefile | 31 ++++++++++++-------- libunit.c => framework/libunit.c | 0 libunit.h => framework/libunit.h | 0 libunit_util.c => framework/libunit_util.c | 0 libunit_util2.c => framework/libunit_util2.c | 0 5 files changed, 19 insertions(+), 12 deletions(-) rename libunit.c => framework/libunit.c (100%) rename libunit.h => framework/libunit.h (100%) rename libunit_util.c => framework/libunit_util.c (100%) rename libunit_util2.c => framework/libunit_util2.c (100%) diff --git a/Makefile b/Makefile index 0e0557c..a4d146f 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,27 @@ -NAME = libunit +NAME = libunit.a +TNAME = libunit +AR = ar rcs CXX = cc CXXFLAGS = -Wall -Wextra -Werror -MMD -MP CXXFLAGS += -g3 -CXXFLAGS += -I $(LIBFT_DIR) -I. -LDFLAGS = -Llibft -lft +CXXFLAGS += -I$(LIBFT_DIR) -I. -Iframework +LDFLAGS = -Llibft -lunit -lft -L. LIBFT_DIR = libft LIBFT_A = $(LIBFT_DIR)/libft.a -SRC = libunit_util.c libunit_util2.c libunit.c main.c -SRC += real_tests/ft_strlen/00_launcher.c real_tests/ft_strlen/01_basic.c real_tests/ft_strlen/02_null.c real_tests/ft_strlen/03_large.c -SRC += tests/libunit/00_launcher.c tests/libunit/01_ok.c tests/libunit/02_ko.c tests/libunit/03_sigsegv.c tests/libunit/04_sigbus.c +SRC = framework/libunit_util.c framework/libunit_util2.c framework/libunit.c +TSRC = main.c real_tests/ft_strlen/00_launcher.c real_tests/ft_strlen/01_basic.c real_tests/ft_strlen/02_null.c real_tests/ft_strlen/03_large.c +TSRC += tests/libunit/00_launcher.c tests/libunit/01_ok.c tests/libunit/02_ko.c tests/libunit/03_sigsegv.c tests/libunit/04_sigbus.c OBJ = $(SRC:.c=.o) +TOBJ = $(TSRC:.c=.o) all: $(NAME) $(NAME): $(OBJ) | $(LIBFT_A) - $(CXX) $(CXXFLAGS) $(OBJ) $(LDFLAGS) -o $(NAME) + $(AR) $(NAME) $(OBJ) + +$(TNAME): $(NAME) $(TOBJ) | $(LIBFT_A) $(NAME) + $(CXX) $(CXXFLAGS) $(TOBJ) $(LDFLAGS) -o $(TNAME) %.o: %.c Makefile $(CXX) $(CXXFLAGS) -c $< -o $@ @@ -24,18 +30,19 @@ $(LIBFT_A): $(MAKE) -C $(LIBFT_DIR) clean: - $(RM) $(OBJ) $(SRC:.c=.d) + $(MAKE) -C $(LIBFT_DIR) fclean + $(RM) $(OBJ) $(TOBJ) $(SRC:.c=.d) $(TSRC:.c=.d) fclean: clean - $(RM) $(NAME) + $(RM) $(NAME) $(TNAME) re: fclean $(MAKE) all -test: all - ./$(NAME) +test: $(TNAME) + ./$(TNAME) --include $(SRC:.c=.d) +-include $(SRC:.c=.d) $(TSRC:.c=.d) .PHONY: all clean fclean re diff --git a/libunit.c b/framework/libunit.c similarity index 100% rename from libunit.c rename to framework/libunit.c diff --git a/libunit.h b/framework/libunit.h similarity index 100% rename from libunit.h rename to framework/libunit.h diff --git a/libunit_util.c b/framework/libunit_util.c similarity index 100% rename from libunit_util.c rename to framework/libunit_util.c diff --git a/libunit_util2.c b/framework/libunit_util2.c similarity index 100% rename from libunit_util2.c rename to framework/libunit_util2.c