X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2FMakefile;h=f3575b3dda6dde08948beb44960521a844e2c00d;hp=a312e5dd17153387f450f782dd0a2b430201911b;hb=088b2a9f4a7dedf357d90e5e420062461f78a13b;hpb=f6387bc4a0f5aa75160095a876b103758ea807c7

diff --git a/tools/Makefile b/tools/Makefile
index a312e5dd..f3575b3d 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,15 +1,19 @@
-tools/ccan_depends: tools/ccan_depends.o tools/depends.o ccan/string/string.o ccan/talloc/talloc.o ccan/noerr/noerr.o
+ALL_TOOLS = tools/ccan_depends tools/run_tests tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
 
-tools/run_tests: tools/run_tests.o tools/depends.o ccan/tap/tap.o ccan/string/string.o ccan/talloc/talloc.o
+.PHONY: tools
+tools: $(ALL_TOOLS)
 
-tools/doc_extract: tools/doc_extract.o ccan/string/string.o ccan/talloc/talloc.o
+tools/ccan_depends: tools/ccan_depends.o tools/depends.o tools/tools.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/talloc/talloc.o ccan/noerr/noerr.o
 
-tools/namespacize: tools/namespacize.o tools/depends.o ccan/string/string.o ccan/talloc/talloc.o
+tools/run_tests: tools/run_tests.o tools/depends.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/tap/tap.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+
+tools/doc_extract: tools/doc_extract.o tools/doc_extract-core.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+
+tools/namespacize: tools/namespacize.o tools/depends.o tools/tools.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/noerr/noerr.o ccan/talloc/talloc.o
 
 tools/run_tests.o tools/namespacize.o tools/depends.o: tools/tools.h
 
 tools-clean: ccanlint-clean
-	rm -f tools/ccan_depends tools/run_tests tools/doc_extract tools/namespacize
+	rm -f $(ALL_TOOLS)
 
 include tools/ccanlint/Makefile
-include tools/_infotojson/Makefile