Merge remote-tracking branch 'origin/Krisp' into tobi_experimental

makefile

@@ -25,32 +25,49 @@ doble_initial:
 # --------------------------
 # Selbst implementiertes Programm bauen
 # --------------------------
+# alle Objektdateien
 program_obj_files = stack.o bintree.o numbers.o timer.o highscore.o
-
+# alle ausführbaren Dateien zu ausführbarem Programm linken
 doble : main.o $(program_obj_files)
 	$(CC) $(FLAGS) $^ -o doble
-
+# Regel Kompilieren allgemein
 $(program_obj_files): %.o: %.c
 	$(CC) -c $(FLAGS) $^ -o $@
 
 # --------------------------
 # Unit Tests
 # --------------------------
-unitTests:
-TEST_BIN = runTests
 
-unitTests: stack.o test_stack.o
-	$(CC) $(FLAGS) $(ASAN_FLAGS) -I$(unityfolder) -o $(TEST_BIN) stack.o test_stack.o $(unityfolder)/unity.c
+STACK_TEST_BIN   = runStackTests
+NUMBERS_TEST_BIN = runNumbersTests
+BINARY_TEST_BIN  = runBinaryTests
+
+# --- Stack Tests ---
+stackTests: stack.o test_stack.o
+	$(CC) $(FLAGS) -I$(unityfolder) -o $(STACK_TEST_BIN) stack.o test_stack.o $(unityfolder)/unity.c
 
 test_stack.o: test_stack.c
 	$(CC) $(FLAGS) -I$(unityfolder) -c test_stack.c -o test_stack.o
 
+
+# --- Numbers Tests ---
+numbersTests: numbers.o bintree.o stack.o test_numbers.o
+	$(CC) $(FLAGS) -I$(unityfolder) -o $(NUMBERS_TEST_BIN) numbers.o bintree.o stack.o test_numbers.o $(unityfolder)/unity.c
+
+test_numbers.o: test_numbers.c
+	$(CC) $(FLAGS) -I$(unityfolder) -c test_numbers.c -o test_numbers.o
+
+
+# --- Binary Tree Tests ---
+binaryTests: bintree.o stack.o test_binary.o
+	$(CC) $(FLAGS) -I$(unityfolder) -o $(BINARY_TEST_BIN) bintree.o stack.o test_binary.o $(unityfolder)/unity.c
+
+test_binary.o: test_binary.c
+	$(CC) $(FLAGS) -I$(unityfolder) -c test_binary.c -o test_binary.o
+
+
 # --------------------------
 # Clean
 # --------------------------
 clean:
-ifeq ($(OS),Windows_NT)
-	rm -f *.o doble
-else
-	rm -f *.o doble
-endif
+	rm -f *.o doble $(STACK_TEST_BIN) $(NUMBERS_TEST_BIN) $(BINARY_TEST_BIN)