X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=0e31fa641dcb62dd9a0279fb9012133e78841206;hp=a8a6103ae9cdf88f1975dfde2799e649a0cc5b53;hb=794a6678aa37e8864845c72b14213ca44b9e159e;hpb=fdfcdafbfa7957b6ca393bb4000fbaad3813a61a

diff --git a/Makefile b/Makefile
index a8a6103a..0e31fa64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,50 @@
-CFLAGS=-O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I.
+# Hacky makefile to compile everything and run the tests in some kind of sane order.
+# V=--verbose for verbose tests.
 
-ALL=$(patsubst %/test, %, $(wildcard */test))
-ALL_DEPENDS=$(patsubst %, %/.depends, $(ALL))
+CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -I.
 
-default: test-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 $@ $^
 
-$(ALL_DEPENDS): %/.depends: %/_info
-	@$< depends > $@ || ( rm -f $@; exit 1 )
+check: $(ALL_DIRS:%=test-%)
 
-test-%: FORCE run_tests
+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 )
+
+$(ALL_LIBS):
+	$(LD) -r -o $@ $^ /dev/null
+
+test-ccan/%: tools/run_tests ccan/%.o
 	@echo Testing $*...
-	@if ./run_tests $* | 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 > $@
 
-FORCE:
+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 > $@
 
-run_tests: run_tests.o tap/tap.o talloc/talloc.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 > $@
 
-clean:
-	rm -f run_tests run_tests.o
+include tools/Makefile
+-include inter-depends
+-include test-depends
+-include lib-depends