X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=888afcad8ac98ad07d3e989023cba96e5149e511;hp=2e12ce83cbe4cc10897d29f8f88cedaec9f29cca;hb=e5ee09b20d276ea2e86d0a5c7e9b1469f83f0ac1;hpb=7bbd49fdb03503688dd34ab860e0e02e852ed267

diff --git a/Makefile b/Makefile
index 2e12ce83..888afcad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,54 @@
-# 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.
+# 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))
+ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
+ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
 
-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`
+include Makefile-ccan
+
+check: $(ALL_DIRS:%=test-%)
+	echo $(ALL_DIRS)
 
 distclean: clean
-	rm -f */_info
 	rm -f $(ALL_DEPENDS)
 
-$(ALL_DEPENDS): %/.depends: %/_info
-	@$< depends > $@ || ( rm -f $@; exit 1 )
+# Override implicit attempt to link directory.
+$(ALL_DIRS):
+	@touch $@
+
+$(ALL_DEPENDS): %/.depends: 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
 
-test-%: ccan_tools/run_tests
+# Some don't have object files.
+test-ccan/%:: tools/run_tests
 	@echo Testing $*...
-	@if ccan_tools/run_tests $(V) $* | grep ^'not ok'; then exit 1; else exit 0; fi
+	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+
+clean: tools-clean
+	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
+	$(RM) inter-depends lib-depends test-depends
+
+# 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 > $@
 
-clean: ccan_tools-clean
-	rm -f `find . -name '*.o'`
+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 > $@
 
-include ccan_tools/Makefile
+include tools/Makefile
+-include inter-depends
+-include test-depends
+-include Makefile-web