X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=makefile;fp=makefile;h=08034deb07d4070f32d79d5180237effb6f8b683;hb=8a33b741c6609a4a07fcd3a80779e4290c908a20;hp=f5e19b9bf3cf3464218cfbfba33ae02eb6d2366c;hpb=4ee92d9d9d2e3b6ea89005cd95c0f165de2d03b4;p=calc.git

diff --git a/makefile b/makefile
index f5e19b9..08034de 100644
--- 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
 
@@ -69,7 +70,7 @@ valgrinds:
 wipe: purge
 	$(call TITLE, "Wiping")
 	touch wipe
-	rm -f wipe $(wildcard *.gcda *.gcno)
+	rm -f wipe $(wildcard *.gcda *.gcno *.gcov)
 	$(call PASS, SUCCESS)
 
 tests: all
@@ -82,7 +83,7 @@ include $(wildcard *.ld)
 
 gcov_%:
 	$(MAKE) purge
-	CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs -ftest-coverage" $(MAKE)
+	GCOV="-fprofile-arcs -ftest-coverage -O0" $(MAKE)
 	$(MAKE) test_$(@:gcov_%=%)
 	gcov `sed -e 's/\.exe:/.c/;s/\.o/.c/g' $(@:gcov_%=%.ld)`
 	touch gcov
@@ -103,7 +104,7 @@ test_%: %.test %.exe
 	  [ $$? -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_%: %.exe
 	VALGRIND="valgrind -v --leak-check=full --show-reachable=yes --log-fd=2"; \