X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2FMakefile;h=a981e4049def9bfcd06027aaf7f8afee46feb17c;hp=9c322e6801b1127df300de49fd21317711a6666b;hb=8badbce50fdf6f49f8178c064c73f5e0f39174a9;hpb=7beaa3448fa8e6015798c1609f33d96e8986063d

diff --git a/tools/Makefile b/tools/Makefile
index 9c322e68..a981e404 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,20 +1,21 @@
-ALL_TOOLS = tools/ccan_depends tools/run_tests tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
+ALL_TOOLS = tools/configurator/configurator tools/ccan_depends tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
+
+DEP_OBJS = tools/depends.o tools/compile.o tools/tools.o ccan/str_talloc/str_talloc.o ccan/str/str.o ccan/grab_file/grab_file.o ccan/talloc/talloc.o ccan/noerr/noerr.o ccan/read_write_all/read_write_all.o
 
 .PHONY: tools
 tools: $(ALL_TOOLS)
 
-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/ccan_depends: tools/ccan_depends.o $(DEP_OBJS)
 
-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 $(DEP_OBJS)
 
-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 $(DEP_OBJS)
 
-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/namespacize.o tools/depends.o: tools/tools.h
 
-tools/run_tests.o tools/namespacize.o tools/depends.o: tools/tools.h
+tools/configurator/configurator: tools/configurator/configurator.c
 
 tools-clean: ccanlint-clean
-	rm -f $(ALL_TOOLS)
+	$(RM) $(ALL_TOOLS)
 
 include tools/ccanlint/Makefile
-include tools/_infotojson/Makefile