tdb: fix test to remove warning, and don't fail when tdb_check() barfs.

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index a8a6103ae9cdf88f1975dfde2799e649a0cc5b53..e427c5d27b055412262ea6d044d34590aa3af410 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,65 @@
-CFLAGS=-O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I.
+# Hacky makefile to compile everything and run the tests in some kind
+# of sane order.
 
-ALL=$(patsubst %/test, %, $(wildcard */test))
-ALL_DEPENDS=$(patsubst %, %/.depends, $(ALL))
+# Main targets:
+# 
+# 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
 
-default: test-all
+# Trying to build the whole repo is usually a lose; there will be some
+# dependencies you don't have.
+EXCLUDE=ccan/wwviaudio ccan/ogg_to_pcm
 
-test-all: $(ALL_DEPENDS)
-       @$(MAKE) `for f in $(ALL); do echo test-$$f test-$$f; while read d; do echo test-$$d test-$$f; done < $$f/.depends; done | tsort`
+# Anything with an _info file is a module.
+ALL=$(filter-out $(EXCLUDE), $(patsubst ccan/%/_info, %, $(wildcard ccan/*/_info)))
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
+# Not all modules have tests.
+ALL_TESTS=$(patsubst ccan/%/test/, %, $(foreach dir, $(ALL), $(wildcard ccan/$(dir)/test/)))
 
-$(ALL_DEPENDS): %/.depends: %/_info
-       @$< depends > $@ || ( rm -f $@; exit 1 )
+default: libccan.a
 
-test-%: FORCE run_tests
-       @echo Testing $*...
-       @if ./run_tests $* | grep ^'not ok'; then exit 1; else exit 0; fi
+include Makefile-ccan
 
-FORCE:
+check: $(ALL_TESTS:%=summary-check-%)
 
-run_tests: run_tests.o tap/tap.o talloc/talloc.o 
+distclean: clean
+       rm -f $(ALL_DEPENDS)
 
-clean:
-       rm -f run_tests run_tests.o
+$(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
+       @tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
+
+# Actual dependencies are created in inter-depends
+check-%: tools/ccanlint/ccanlint
+       @tools/ccanlint/ccanlint -d ccan/$*
+
+# Doesn't test dependencies, doesn't print verbose fail results.
+summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
+       @tools/ccanlint/ccanlint -s -d ccan/$*
+
+ccan/%/info: ccan/%/_info
+       $(CC) $(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` `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 > $@
+
+include tools/Makefile
+-include inter-depends
+-include test-depends
+-include Makefile-web