From d970e74ce36fc5de126726135d6b0a8433ac68bd Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@proton.me>
Date: Mon, 29 Apr 2024 19:45:45 +0200
Subject: [PATCH] clean up (?) the makefiles

---
 Makefile      |  9 +++++++--
 test/Makefile | 25 +++++++++++--------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 17dc562..d652008 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PROG = $(addprefix $(SRC)/, $(_PROG))
 
 OBJ = $(addprefix $(BIN)/, $(_PROG:.cpp=.o))
 
-.PHONY: all clean
+.PHONY: all clean test
 
 all: dirs $(NAME)
 
@@ -53,4 +53,9 @@ $(PREPROCESSED)/%.cpp: $(SRC)/%.cpp
 	$(CXX) -DPP_DEBUG $(CXXFLAGS) -E $< > $@
 	clang-format -i $@
 
-include test/Makefile
+test:
+	@CXX="$(CXX)" \
+	CXXFLAGS="$(CXXFLAGS)" \
+	BIN="$(BIN)/test" \
+	INCLUDE="$(INCLUDE)" \
+	make -f test/Makefile
diff --git a/test/Makefile b/test/Makefile
index b3e289b..50a9d26 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,29 +1,26 @@
-INCLUDE_TEST = include test
-CXXFLAGS += $(addprefix -I, $(INCLUDE_TEST))
+INCLUDE += test
+CXXFLAGS += $(addprefix -I, $(INCLUDE))
 
 TEST = test
-BIN_TEST = $(BIN)/$(TEST)
 
 _TESTS = example.cpp
 TESTS = $(addprefix $(TEST)/, $(_TESTS))
 
-OBJ_TEST = $(addprefix $(BIN_TEST)/, $(_TESTS:.cpp=))
+OBJ = $(addprefix $(BIN)/, $(_TESTS:.cpp=))
 
-.PHONY: test
+.PHONY: all
 
-dirs_test:
-	mkdir -p $(BIN_TEST)
-
-test_start:
+all: dirs_test $(OBJ)
 	@echo
 	@echo "---------- STARTING TESTS ----------"
 	@echo
-
-test: dirs_test test_start $(OBJ_TEST)
-	$(foreach _test,$(OBJ_TEST),@./$(_test))
+	$(foreach test,$(OBJ),@./$(test))
 	@echo
 	@echo "---------- FINISHED TESTS ----------"
 	@echo
 
-$(BIN_TEST)/%: $(TEST)/%.cpp
-	@$(CXX) $< $(CXXFLAGS) -o $@
+dirs_test:
+	mkdir -p $(BIN)
+
+$(BIN)/%: $(TEST)/%.cpp
+	$(CXX) $< $(CXXFLAGS) -o $@