X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=8d53cbc68449ed475f4847c6ae511094f25108ce;hp=03d0b82b2c9867caed2cc5f039cad8ecbe153492;hb=ac0e87d7ecf790c187ce3c5d837b971fdd016b57;hpb=37ca11df87fa3cc97aca321a76e564e4058d6900

diff --git a/Makefile b/Makefile
index 03d0b82b..8d53cbc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,50 +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.
+
+# 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
+
+# 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/))
 
-CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -I.
+default: libccan.a
 
-ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
-ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
-ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
-ALL_LIBS=$(patsubst %, ccan/lib%.a, $(ALL))
+include Makefile-ccan
 
-test: $(ALL_DIRS:%=test-%)
+check: $(ALL_TESTS:%=check-%)
 
 distclean: clean
-	rm -f */_info
 	rm -f $(ALL_DEPENDS)
 
-$(ALL_DEPENDS): $(ALL_DIRS:=/_info)
-
-$(ALL_DEPENDS): %/.depends: tools/ccan_depends
-	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
-
-foo:
-	echo $(ALL_LIBS)
+$(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
+	@tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-$(ALL_LIBS):
-	$(AR) r $@ $^
-
-test-ccan/%: tools/run_tests ccan/lib%.a
+# Actual dependencies are created in inter-depends
+check-%: tools/run_tests ccan/%/info
 	@echo Testing $*...
-	@if tools/run_tests $(V) ccan/$* | 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 $<
 
-ccanlint: tools/ccanlint/ccanlint
+libccan.a(%.o): ccan/%.o
+	$(AR) r $@ $<
 
 clean: tools-clean
-	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`
+	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name info` `find . -name '*.d'`
 	$(RM) inter-depends lib-depends test-depends
 
-inter-depends: $(ALL_DEPENDS)
-	for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),ccan/lib\1.a,p' < $$f`; done > $@
-
-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 > $@
+# 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 > $@
 
-lib-depends: $(foreach D,$(ALL),$(wildcard $D/*.[ch]))
-	for c in $(ALL); do echo ccan/lib$$c.a: `ls ccan/$$c/*.c | grep -v /_info.c | sed 's/.c$$/.o/'`; 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 lib-depends
+-include Makefile-web