From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 10 Nov 2008 06:06:14 +0000 (+1100)
Subject: Fix linking for tools, and add tools: target.
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=015fe7cbd9409e33bf4a398e88e2ff5eff59bc60;ds=sidebyside

Fix linking for tools, and add tools: target.
---

diff --git a/tools/Makefile b/tools/Makefile
index a03cc9a4..254d0996 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,18 +1,23 @@
-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/create_dep_tar
 
-tools/run_tests: tools/run_tests.o tools/depends.o ccan/tap/tap.o ccan/string/string.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+.PHONY: tools
+tools: $(ALL_TOOLS)
 
-tools/doc_extract: tools/doc_extract.o ccan/string/string.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+tools/ccan_depends: tools/ccan_depends.o tools/depends.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/noerr/noerr.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/create_dep_tar: tools/create_dep_tar.o tools/depends.o ccan/string/string.o ccan/noerr/noerr.o ccan/talloc/talloc.o tools/_infotojson/sqlite3_database.o tools/_infotojson/utils.o
+tools/doc_extract: tools/doc_extract.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 ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+
+tools/create_dep_tar: tools/create_dep_tar.o tools/depends.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/noerr/noerr.o ccan/talloc/talloc.o tools/_infotojson/sqlite3_database.o tools/_infotojson/utils.o
 	$(CC) $(LDFLAGS) -o $@ $^ -lsqlite3
 
 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