Merge branch 'rfc822'

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index 146a516ac97f0ba9f1028a9ec2bf80664fde178f..9c70f2ba823fddd99ca1864bbdd2346a41fb427c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,47 +5,90 @@
 # 
 # check: run tests on all ccan modules (use 'make check V=--verbose' for more)
 #        Includes building libccan.a.
+# libccan.a: A library with all the ccan modules in it.
 # tools: build useful tools in tools/ dir.
 #        Especially tools/ccanlint/ccanlint and tools/namespacize.
 # distclean: destroy everything back to pristine state
 
-ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
-ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
-ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
+# Where make scores puts the results
+SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
+
+default: libccan.a
+
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS_NORMAL) $(MODS_EXTERNAL))
 
 include Makefile-ccan
 
-check: $(ALL_DIRS:%=test-%)
+fastcheck: $(MODS_NORMAL:%=summary-fastcheck-%)
+
+check: $(MODS_NORMAL:%=summary-check-%)
 
 distclean: clean
        rm -f $(ALL_DEPENDS)
 
-# Override implicit attempt to link directory.
-$(ALL_DIRS):
-       @touch $@
+scores: $(SCOREDIR)/SUMMARY
+
+$(SCOREDIR)/SUMMARY: $(MODS:%=$(SCOREDIR)/%.score)
+       git describe --always > $@
+       uname -a >> $@
+       $(CC) -v >> $@
+       cat $^ | grep 'Total score:' >> $@
 
-$(ALL_DEPENDS): %/.depends: tools/ccan_depends
+$(SCOREDIR)/%.score: ccan/%/_info tools/ccanlint/ccanlint $(OBJFILES)
+       mkdir -p `dirname $@`
+       tools/ccanlint/ccanlint -v -s ccan/$* > $@ || true
+
+$(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
        tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-test-ccan/%: tools/run_tests libccan.a(%.o)
-       @echo Testing $*...
-       @if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+# Actual dependencies are created in inter-depends
+check-%: tools/ccanlint/ccanlint
+       tools/ccanlint/ccanlint ccan/$*
+
+fastcheck-%: tools/ccanlint/ccanlint
+       tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage ccan/$*
+
+# Doesn't test dependencies, doesn't print verbose fail results.
+summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
+       tools/ccanlint/ccanlint -s ccan/$*
 
-# Some don't have object files.
-test-ccan/%:: tools/run_tests
-       @echo Testing $*...
-       @if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
+       tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/$*
+
+# FIXME: Horrible hacks because % doesn't match /
+summary-fastcheck-antithread/%: tools/ccanlint/ccanlint $(OBJFILES)
+       tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/antithread/$*
+
+summary-fastcheck-tal/%: tools/ccanlint/ccanlint $(OBJFILES)
+       tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/tal/$*
+
+ccan/%/info: ccan/%/_info
+       $(CC) $(CCAN_CFLAGS) -o $@ -x c $<
+
+libccan.a(%.o): ccan/%.o
+       $(AR) r $@ $<
 
 clean: tools-clean
-       $(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
-       $(RM) inter-depends lib-depends test-depends
+       $(RM) `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'`  `find * -name info` `find * -name '*.d'`
+       $(RM) inter-depends lib-depends test-depends ccan/*-Makefile
+
+# Creates a dependency from the tests to the object files which it needs.
+inter-depends: $(ALL_DEPENDS) Makefile
+       for f in $(ALL_DEPENDS); do echo check-$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f) $$(dirname $$f); do [ "$$(echo $$dir/*.c)" = "$$dir/*.c" ] || echo ccan/"$$(basename $$dir)".o; done); done > $@
+
+# Creates dependencies between tests, so if foo depends on bar, bar is tested
+# first 
+test-depends: $(ALL_DEPENDS) Makefile
+       for f in $(ALL_DEPENDS); do echo check-`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check-\1,p' < $$f`; done > $@
+
+TAGS: FORCE
+       find * -name '*.[ch]' | xargs etags
 
-# Only list a dependency if there are object files to build.
-inter-depends: $(ALL_DEPENDS)
-       for f in $(ALL_DEPENDS); do echo test-ccan/$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f); do [ "$$(echo $$dir/[a-z]*.c)" = "$$dir/[a-z]*.c" ] || echo libccan.a\("$$(basename $$dir)".o\); done); done > $@
+FORCE:
 
-test-depends: $(ALL_DEPENDS)
-       for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),test-ccan/\1,p' < $$f`; done > $@
+# Ensure we don't end up with empty file if configurator fails!
+config.h: tools/configurator/configurator Makefile Makefile-ccan
+       tools/configurator/configurator $(CC) $(CCAN_CFLAGS) > $@.tmp && mv $@.tmp $@
 
 include tools/Makefile
 -include inter-depends