X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=makefile;h=48382b25d7b29d5c7885454b86285dac1812eaec;hb=a3f2e6cf008678cfa2b1a868e38fefbe81009971;hp=772aca4a9a1888fff18b1e8b20152f6ded4e6d99;hpb=01f02c415322b4de051a616b58de5d69a08a3a7f;p=calc.git

diff --git a/makefile b/makefile
index 772aca4..48382b2 100644
--- a/makefile
+++ b/makefile
@@ -11,19 +11,20 @@ OFLAGS  = -O4 -Os
 #OFLAGS += -malign-double
 CFLAGS += -W -Wall -Wextra -g
 CFLAGS += -std=c99 -D_XOPEN_SOURCE=500
-CFLAGS += $(OFLAGS) $(INCLUDES)
-LDFLAGS += -g
+CFLAGS += $(OFLAGS) $(INCLUDES) $(GCOV)
+LDFLAGS += -g $(GCOV)
 
 # Targets
 
 ALLEXE  =
 ALLEXE += calc
-ALLEXE += skel
+#ALLEXE += skel
 
 SHELL = bash
 
-MAKE = mingw32-make
+#MAKE = mingw32-make
 MAKEFLAGS += -s
+include $(wildcard .makefile)
 
 # Functions
 
@@ -43,11 +44,6 @@ VALID = $(call TITLE, $(1)) && $(2) && $(call PASS, SUCCESS) || { $(call FAIL, F
 all: depends
 	$(MAKE) $(ALLEXE:%=%.exe)
 
-alltests: all
-	$(MAKE) $(addprefix test_,$(ALLEXE:%.exe=%))
-
-depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE))
-
 count:
 	wc $(wildcard *.c *.h) $(MAKEFILE_LIST)
 
@@ -57,17 +53,44 @@ clean:
 	rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_*)
 	$(call PASS, SUCCESS)
 
+depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE))
+
+gcovs:
+	$(MAKE) $(addprefix gcov_,$(ALLEXE))
+
 purge: clean
 	$(call TITLE, "Purging")
 	touch purge
-	rm -f purge $(ALLEXE) $(shell [ -f .targets ] && { cat .targets | sort | uniq; echo .targets; })
+	rm -f purge $(ALLEXE:%=%.exe)
 	$(call PASS, SUCCESS)
 
+valgrinds:
+	$(MAKE) $(addprefix valgrind_,$(ALLEXE))
+
+wipe: purge
+	$(call TITLE, "Wiping")
+	touch wipe
+	rm -f wipe $(wildcard *.gcda *.gcno *.gcov)
+	$(call PASS, SUCCESS)
+
+tests: all
+	$(MAKE) $(addprefix test_,$(ALLEXE))
+
 ## Main rules
 
 include $(wildcard *.d)
 include $(wildcard *.ld)
 
+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
+	grep '#####' *.c.gcov || true
+
 %.test: %.c
 	$(call TITLE, "Building $@")
 #	awk '/\/\* *test:.*\*\// { sub(/^.*\/\* *test: */, ""); sub(/ *\*\/.*$$/, ""); print }' $< > $@
@@ -76,18 +99,18 @@ include $(wildcard *.ld)
 
 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 $@")
@@ -109,12 +132,12 @@ 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
 
-.PHONY: clean count purge
+.PHONY: all clean count depends gcovs purge tests
 
 ## Precious