X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=0e31fa641dcb62dd9a0279fb9012133e78841206;hp=76b79e3309fba524767f6f646e24089a559bd090;hb=f6387bc4a0f5aa75160095a876b103758ea807c7;hpb=89afb563a8fea1e1c6d4bbcc6b1c51aa6cc8f045

diff --git a/Makefile b/Makefile
index 76b79e33..0e31fa64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,50 @@
 # Hacky makefile to compile everything and run the tests in some kind of sane order.
 # V=--verbose for verbose tests.
 
-CFLAGS=-O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I.
+CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -I.
 
-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))
+ALL_LIBS=$(patsubst %, ccan/%.o, $(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`
+libccan.a: $(ALL_LIBS)
+	$(AR) r $@ $^
+
+check: $(ALL_DIRS:%=test-%)
 
 distclean: clean
 	rm -f */_info
 	rm -f $(ALL_DEPENDS)
 
-$(ALL_DEPENDS): %/.depends: %/_info
-	@$< depends > $@ || ( rm -f $@; exit 1 )
+$(ALL_DEPENDS): $(ALL_DIRS:=/_info)
+
+$(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
+test-ccan/%: tools/run_tests ccan/%.o
 	@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
+
+ccanlint: tools/ccanlint/ccanlint
+
+clean: tools-clean
+	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
+	$(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 > $@
 
-ccanlint: ccan_tools/ccanlint/ccanlint
+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 > $@
 
-clean: ccan_tools-clean
-	rm -f `find . -name '*.o'`
+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 ccan_tools/Makefile
+include tools/Makefile
+-include inter-depends
+-include test-depends
+-include lib-depends