merge

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index 2e12ce83cbe4cc10897d29f8f88cedaec9f29cca..8d53cbc68449ed475f4847c6ae511094f25108ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,58 @@
-# Hacky makefile to compile everything and run the tests in some kind of sane order.
-# V=--verbose for verbose tests.
+# Hacky makefile to compile everything and run the tests in some kind
+# of sane order.
 
-CFLAGS=-O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I.
+# 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
 
-ALL=$(patsubst %/test, %, $(wildcard */test))
-ALL_DEPENDS=$(patsubst %, %/.depends, $(ALL))
+# Anything with an _info file is a module.
+ALL=$(patsubst ccan/%/_info, %, $(wildcard ccan/*/_info))
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
+# Not all modules have tests.
+ALL_TESTS=$(patsubst ccan/%/test/, %, $(wildcard ccan/*/test/))
 
-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`
+default: libccan.a
+
+include Makefile-ccan
+
+check: $(ALL_TESTS:%=check-%)
 
 distclean: clean
-       rm -f */_info
        rm -f $(ALL_DEPENDS)
 
-$(ALL_DEPENDS): %/.depends: %/_info
-       @$< depends > $@ || ( rm -f $@; exit 1 )
+$(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
+       @tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-test-%: ccan_tools/run_tests
+# Actual dependencies are created in inter-depends
+check-%: tools/run_tests ccan/%/info
        @echo Testing $*...
-       @if ccan_tools/run_tests $(V) $* | grep ^'not ok'; then exit 1; else exit 0; fi
+       @if tools/run_tests $(V) $$(for f in `ccan/$*/info libs`; do echo --lib=$$f; done) `[ ! -f ccan/$*.o ] || echo --apiobj=ccan/$*.o` ccan/$* $(filter-out ccan/$*.o, $(filter %.o, $^)) | grep ^'not ok'; then exit 1; else exit 0; fi
+
+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
+
+# 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 > $@
 
-clean: ccan_tools-clean
-       rm -f `find . -name '*.o'`
+# 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 ccan_tools/Makefile
+include tools/Makefile
+-include inter-depends
+-include test-depends
+-include Makefile-web