check parenthesis

[calc.git] / makefile

diff --git a/makefile b/makefile
index 090167546568a9e47e12ff1688f0d3003d59d68c..48382b25d7b29d5c7885454b86285dac1812eaec 100644 (file)
--- a/makefile
+++ b/makefile
@@ -11,8 +11,8 @@ OFLAGS  = -O4 -Os
 #OFLAGS += -malign-double
 CFLAGS += -W -Wall -Wextra -g
 CFLAGS += -std=c99 -D_XOPEN_SOURCE=500
-CFLAGS += $(OFLAGS) $(INCLUDES) $(GCOVER)
-LDFLAGS += -g
+CFLAGS += $(OFLAGS) $(INCLUDES) $(GCOV)
+LDFLAGS += -g $(GCOV)
 
 # Targets
 
@@ -24,6 +24,7 @@ SHELL = bash
 
 #MAKE = mingw32-make
 MAKEFLAGS += -s
+include $(wildcard .makefile)
 
 # Functions
 
@@ -63,10 +64,13 @@ purge: clean
        rm -f purge $(ALLEXE:%=%.exe)
        $(call PASS, SUCCESS)
 
+valgrinds:
+       $(MAKE) $(addprefix valgrind_,$(ALLEXE))
+
 wipe: purge
-       $(call TITLE, "wiping")
+       $(call TITLE, "Wiping")
        touch wipe
-       rm -f wipe $(wildcard *.gcda *.gcno)
+       rm -f wipe $(wildcard *.gcda *.gcno *.gcov)
        $(call PASS, SUCCESS)
 
 tests: all
@@ -78,13 +82,14 @@ include $(wildcard *.d)
 include $(wildcard *.ld)
 
 gcov_%:
-       make purge
-       CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs -ftest-coverage" make
-       make test_$(@:gcov_%=%)
+       $(MAKE) purge
+       GCOV="-coverage -O0" $(MAKE)
+       $(MAKE) test_$(@:gcov_%=%)
        gcov `sed -e 's/\.exe:/.c/;s/\.o/.c/g' $(@:gcov_%=%.ld)`
        touch gcov
        rm -f gcov $(wildcard *.gcda *.gcno)
-       make purge
+       $(MAKE) purge
+       grep '#####' *.c.gcov || true
 
 %.test: %.c
        $(call TITLE, "Building $@")
@@ -94,18 +99,18 @@ gcov_%:
 
 test_%: %.test %.exe
        IFS=$$'\n'; RC=0; \
-       for test in `cat $< | sed 's,${<:.test=.exe},./${<:.test=.exe},g'`; do \
+       for test in `cat $< | sed 's,${<:.test=.exe},$(VALGRIND) ./${<:.test=.exe},g'`; do \
          echo "=== $$test ==="; \
-         eval $(VALGRIND) $$test; \
+         eval $$test; \
          [ $$? -eq 0 ] && echo -e "\033[1;32mSUCCESS\033[0;0m" \
                        || { echo -e "\033[1;31mFAILED\033[0;0m"; RC=1; }; \
        done; \
-       test "$$RC" -ne 1 
+       test "$$RC" -ne 1
 
-valgrind_%: %
-       VALGRIND="valgrind -v --leak-check=full --show-reachable=yes --log-fd=2"; \
+valgrind_%: %.exe
+       VALGRIND="valgrind -v --leak-check=full --log-fd=3"; \
        export VALGRIND; \
-       $(MAKE) test_$<
+       $(MAKE) $(@:valgrind_%=test_%) 3>$@.log
 
 %.d: %.c
        $(call TITLE, "Building $@")
@@ -127,7 +132,7 @@ valgrind_%: %
 
 %.exe: %.o %.d
        $(call TITLE, "Building $@")
-       $(CC) $(LDFLAGS) $(shell ./getcomments.pl -p='linker:\s' -f='%' ${<:.o=.c}) $< -o $@
+       $(CC) $(LDFLAGS) $< $(shell ./getcomments.pl -p='linker:\s' -f='%' ${<:.o=.c}) -o $@
        $(call PASS, SUCCESS)
 
 ## Phony