diff --git a/.gitignore b/.gitignore index 845cda6..6a13e31 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ dkms.conf # debug information files *.dwo + +libunit + diff --git a/Makefile b/Makefile index 313f580..cce932f 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,8 @@ NAME = libunit CXX = cc CXXFLAGS = -Wall -Wextra -Werror -MMD -MP CXXFLAGS += -g3 -CXXFLAGS += -I $(LIBFT_DIR) -lft -Llibft +CXXFLAGS += -I $(LIBFT_DIR) +LDFLAGS = -Llibft -lft SRC = util_unit.c OBJ = $(SRC:.cpp=.o) LIBFT_DIR = libft @@ -10,15 +11,15 @@ LIBFT_A = $(LIBFT_DIR)/libft.a all: $(NAME) -$(LIBFT_A): - $(MAKE) -C $(LIBFT_DIR) - -$(NAME): $(OBJ) - $(CXX) $(CXXFLAGS) -o $(NAME) $(OBJ) +$(NAME): $(OBJ) | $(LIBFT_A) + $(CXX) $(CXXFLAGS) $(OBJ) $(LDFLAGS) -o $(NAME) %.o: %.c Makefile $(CXX) $(CXXFLAGS) -c $< -o $@ +$(LIBFT_A): + $(MAKE) -C $(LIBFT_DIR) + clean: $(RM) $(OBJ) $(SRC:.c=.d) diff --git a/util_unit.c b/util_unit.c index 7f5a5c9..9c44035 100644 --- a/util_unit.c +++ b/util_unit.c @@ -4,7 +4,7 @@ int dummy(void) { return 1; } int main(void) { - t_unit_test *testlist; + t_unit_test *testlist = NULL; load_test(&testlist, "hi", &dummy); }