X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=makefile;h=069dcba4c4b4568c1807199fd197e5dcc3d752a7;hb=HEAD;hp=2e05fcb30aac0d1d09057f7c39e18e4e9711fe19;hpb=a2b7edd4e8fb7a8ae9b561701b1cc75b677baa22;p=hexdump.git

diff --git a/makefile b/makefile
index 2e05fcb..069dcba 100644
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@
 
 CC = gcc
 
-INCLUDES = -I../debug -D__MEMORY_ALLOCATION__ 
+INCLUDES = -I../debug -D__MEMORY_ALLOCATION__
 OFLAGS  = -O4 -Os
 #OFLAGS  = -O4 -ffast-math -finline-functions
 #OFLAGS  = -O4 -finline-functions
@@ -10,15 +10,18 @@ OFLAGS  = -O4 -Os
 #OFLAGS += -minline-all-stringops -fsingle-precision-constant
 #OFLAGS += -malign-double
 CFLAGS += -W -Wall -Wextra -g
-CFLAGS += -std=c99 -D_XOPEN_SOURCE=500
-CFLAGS += $(OFLAGS) $(INCLUDES) $(GCOV)
-LDFLAGS += -g $(GCOV)
+#CFLAGS += -std=c99 -D_XOPEN_SOURCE=500
+CFLAGS += $(OFLAGS) $(INCLUDES) $(OPTIONS)
+LDFLAGS += -g $(OPTIONS)
+
+ifeq ($(OS),Windows_NT)
+#LDLIBS += -lws2_32
+endif
 
 # Targets
 
 ALLEXE  =
 ALLEXE += hexdump
-#ALLEXE += skel
 
 SHELL = bash
 
@@ -50,7 +53,7 @@ count:
 clean:
 	$(call TITLE, "Cleaning")
 	touch clean
-	rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_*)
+	rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_* gmon.out)
 	$(call PASS, SUCCESS)
 
 depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE))
@@ -58,19 +61,22 @@ depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE))
 gcovs:
 	$(MAKE) $(addprefix gcov_,$(ALLEXE))
 
+gprofs:
+	$(MAKE) $(addprefix gprof_,$(ALLEXE))
+
 purge: clean
 	$(call TITLE, "Purging")
 	touch purge
 	rm -f purge $(ALLEXE:%=%.exe)
 	$(call PASS, SUCCESS)
 
-valgrinds:
+valgrinds: all
 	$(MAKE) $(addprefix valgrind_,$(ALLEXE))
 
 wipe: purge
 	$(call TITLE, "Wiping")
 	touch wipe
-	rm -f wipe $(wildcard *.gcda *.gcno *.gcov)
+	rm -f wipe $(wildcard *.gcda *.gcno *.gcov *.glog)
 	$(call PASS, SUCCESS)
 
 tests: all
@@ -83,55 +89,75 @@ include $(wildcard *.ld)
 
 gcov_%:
 	$(MAKE) purge
-	GCOV="-fprofile-arcs -ftest-coverage -O0" $(MAKE)
+	OPTIONS="-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
+
+gprof_%:
+	$(MAKE) purge
+	$(MAKE) depends
+	OPTIONS="-pg" $(MAKE) ${@:gprof_%=%}.exe
+	$(MAKE) ${@:gprof_%=%}.test
+	IFS=$$'\n'; id=1; \
+		for test in `cat ${@:gprof_%=%}.test | sed 's,${@:gprof_%=%}.exe,./${@:gprof_%=%}.exe,g'`; do \
+		log=${@:gprof_%=%}.prof-$$id.glog; \
+		$(call TITLE, test: $$test); \
+		echo $$test > $$log; \
+		eval $$test >> $$log; \
+		[ $$? -eq 0 ] \
+			&& echo -e "\033[1;32mSUCCESS\033[0;0m" \
+			|| echo -e "\033[1;31mFAILED\033[0;0m"; \
+		[ -f gmon.out ] && { gprof ${@:gprof_%=%}.exe gmon.out >> $$log; rm gmon.out; }; \
+		let id++; \
+	done;
+	$(MAKE) purge
 
 %.test: %.c
 	$(call TITLE, "Building $@")
 #	awk '/\/\* *test:.*\*\// { sub(/^.*\/\* *test: */, ""); sub(/ *\*\/.*$$/, ""); print }' $< > $@
-	./getcomments.pl -p='test:\s' -f='%' $< > $@
+	perl -- getcomments.pl -p='test:\s' -f='%' $< > $@
 	$(call PASS, SUCCESS)
 
 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_%: %.exe
-	VALGRIND="valgrind -v --leak-check=full --show-reachable=yes --log-fd=2"; \
+	VALGRIND="valgrind -v --leak-check=full --log-fd=3"; \
 	export VALGRIND; \
-	$(MAKE) $(@:valgrind_%=test_%)
+	$(MAKE) $(@:valgrind_%=test_%) 3>$@.log
 
 %.d: %.c
 	$(call TITLE, "Building $@")
 	$(CC) $(INCLUDES) -MM $< -o $@~
-	echo ${<:.c=.o}: $(shell ./getcomments.pl -p='depend:\s' -f='%' $<) >> $@~
+	echo ${<:.c=.o}: $(shell perl -- getcomments.pl -p='depend:\s' -f='%' $<) >> $@~
 	mv $@~ $@
 	$(call PASS, SUCCESS)
 
 %.ld: %.c
 	$(call TITLE, "Building $@")
-	echo ${<:.c=.exe}: $(shell ./getcomments.pl -p='linker:\s' -f='%' $< | awk '{for (i=1;i<=NF;i++) if ($$(i) ~ /.o$$/) printf " %s", $$(i)}') > $@
+	echo ${<:.c=.exe}: $(shell perl -- getcomments.pl -p='linker:\s' -f='%' $< | awk '{for (i=1;i<=NF;i++) if ($$(i) ~ /.o$$/) printf " %s", $$(i)}') > $@
 	$(call PASS, SUCCESS)
 
 %.o: %.c
 	$(call TITLE, "Building $@")
-	$(CC) $(CFLAGS) $(INCLUDES) $(shell ./getcomments.pl -p='cflags:\s' -f='%' $<) -c $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDES) $(shell perl -- getcomments.pl -p='cflags:\s' -f='%' $<) -c $< -o $@
 	$(call PASS, SUCCESS)
 
 
 %.exe: %.o %.d
 	$(call TITLE, "Building $@")
-	$(CC) $(LDFLAGS) $(shell ./getcomments.pl -p='linker:\s' -f='%' ${<:.o=.c}) $< -o $@
+	$(CC) $(LDFLAGS) $< $(shell perl -- getcomments.pl -p='linker:\s' -f='%' ${<:.o=.c}) $(LDLIBS) -o $@
 	$(call PASS, SUCCESS)
 
 ## Phony