X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=8d53cbc68449ed475f4847c6ae511094f25108ce;hp=6329f05b46b9515d05bfe84d72f9f56ff76d817f;hb=2622d34405aa838770d9c72c523db4ed8defadaa;hpb=a13257dd9b06ccd236092ccb7df8e1239ba79fa6

diff --git a/Makefile b/Makefile
index 6329f05b..8d53cbc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,58 @@
-# Hacky makefile to compile everything and run the tests in some kind of sane order.
-# V=--verbose for verbose tests.
-
-CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -I.
-
-ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
-ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
+# 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))
-ALL_LIBS=$(patsubst %, ccan/%.o, $(ALL))
+# Not all modules have tests.
+ALL_TESTS=$(patsubst ccan/%/test/, %, $(wildcard ccan/*/test/))
+
+default: libccan.a
 
-libccan.a: $(ALL_LIBS)
-	$(AR) r $@ $^
+include Makefile-ccan
 
-check: $(ALL_DIRS:%=test-%)
+check: $(ALL_TESTS:%=check-%)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
 
-$(ALL_DEPENDS): %/.depends: tools/ccan_depends
-	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
+$(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
+	@tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-$(ALL_LIBS):
-	$(LD) -r -o $@ $^ /dev/null
-
-test-ccan/%: tools/run_tests ccan/%.o
+# 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'`  `find . -name _info`
+	$(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/\1.o,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/$$c.o: `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