Merge pull request #1 from Sigmanificient/makefile-fixup

Fixup the Makefile; remove criterion sources

Author: Miou-zora

Makefile

@@ -3,46 +3,48 @@
 ## general makefile
 ##
 
-SRC	=	$(shell find exercises -name "*.c")
-TEST_SRC	                           =	$(shell find tests -name "*.c")
-OBJ	=	$(SRC:.c=.o)
-TEST_OBJ	=	$(TEST_SRC:.c=.o)
-COV		                           	                           =	 	                           ./*.gcda ./*.gcno
+.SUFFIXES: .o
 
-NAME	                           	                           	                           	=	superlib.a
-TEST_FILE_NAME		                           	                           	                           =tests.out
+CC ?= gcc
 
-all:	$(NAME)
+SRC	:= $(shell find exercises -name "*.c")
+TEST_SRC := $(shell find tests -name "*.c")
 
-$(NAME):	$(OBJ)
-	ar rc $(NAME) $(OBJ)
-	echo "Library compiled successfully"
+OBJ	:= $(SRC:.c=.o)
+TEST_OBJ := $(TEST_SRC:.c=.o)
 
+NAME := superlib.a
+TEST_FILENAME := tests.out
+
+.PHONY: all
+all: $(NAME)
+
+$(NAME): $(OBJ)
+	$(AR) rc $@ $^
+
+.PHONY: clean
 clean:
-	rm -f $(OBJ)
-	echo "Cleaned .o"
+	$(RM) $(OBJ) $(TEST_OBJ)
 
+.PHONY: fclean
 fclean: clean
-	rm -f $(NAME)
-	echo "Cleaned '$(NAME)'"
-	rm -f $(TEST_FILE_NAME)
-	rm -f $(TEST_OBJ)
-	rm -rf *.gcno *.gcda
-	echo "Cleaned '$(TEST_FILE_NAME)' binary & residual files"
+	$(RM) $(NAME) $(TEST_FILENAME)
+	$(RM) $(wildcard $(TEST_FILENAME)-*.gc??) $(TEST_SRC:.c=.gcno)
 
+.PHONY: re
+.NOTPARALLEL: re
 re:	fclean all
 
-test: $(TEST_OBJ)
-	gcc -fprofile-arcs -ftest-coverage -o $(TEST_FILE_NAME) $(TEST_OBJ) $(SRC) -lcriterion
+$(TEST_FILENAME): CFLAGS += -fprofile-arcs -ftest-coverage
+$(TEST_FILENAME): $(TEST_OBJ) $(SRC)
+	$(CC) $(CFLAGS) -o $@ $^ -lcriterion
 
-run:	fclean test
-	./$(TEST_FILE_NAME) --verbose
+.PHONY: run
+.NOTPARALLEL: run
+run: fclean $(TEST_FILENAME)
+	./$(TEST_FILENAME) --verbose
 
-runc: test
+.PHONY: runc
+runc: run
 	gcovr -e tests
 	gcovr -e tests -bu
-
-norm:
-	./csc.sh exercises . 
-
-.PHONY: all clean fclean re test run runc norm

README.md

@@ -23,7 +23,6 @@ The final Makefile, located in `/`, executes (and if they all pass, verifies) al
 - A terminal (Bash, Zsh, etc.)
 - A brain (optional)
 
-A [static Criterion install](https://github.com/Snaipe/Criterion) is located in `/criterion/`.  
 **Please open an issue if it results in the impossibility to compile/run the tests.**  
 Criterion tests for each exercise are run with the command `make run`.