X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=146a516ac97f0ba9f1028a9ec2bf80664fde178f;hp=6329f05b46b9515d05bfe84d72f9f56ff76d817f;hb=3fb9ac9349703401a6b2c3e969f3bc9bdb9d1eae;hpb=a13257dd9b06ccd236092ccb7df8e1239ba79fa6

diff --git a/Makefile b/Makefile
index 6329f05b..146a516a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,53 @@
-# 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=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -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 ccan/%/test, %, $(wildcard ccan/*/test))
 ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
-ALL_LIBS=$(patsubst %, ccan/%.o, $(ALL))
 
-libccan.a: $(ALL_LIBS)
-	$(AR) r $@ $^
+include Makefile-ccan
 
 check: $(ALL_DIRS:%=test-%)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
 
+# Override implicit attempt to link directory.
+$(ALL_DIRS):
+	@touch $@
+
 $(ALL_DEPENDS): %/.depends: tools/ccan_depends
 	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-$(ALL_LIBS):
-	$(LD) -r -o $@ $^ /dev/null
-
-test-ccan/%: tools/run_tests ccan/%.o
+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
 
-ccanlint: tools/ccanlint/ccanlint
+# Some don't have object files.
+test-ccan/%:: tools/run_tests
+	@echo Testing $*...
+	@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\``: `sed -n 's,ccan/\(.*\),ccan/\1.o,p' < $$f`; done > $@
+	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 > $@
 
 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 > $@
 
-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 > $@
-
 include tools/Makefile
 -include inter-depends
 -include test-depends
--include lib-depends
+-include Makefile-web