X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2FMakefile;h=c942bdeeb501a933e98aa05374622ccf956b010e;hp=3c7fb7fa60dc57d0afaf28d8b92fef2045185a68;hb=91436a25574597dbd1fd2de5bcd5826a234100d6;hpb=779d83085d6c6d37f6c4030130efe649a005696a

diff --git a/tools/Makefile b/tools/Makefile
index 3c7fb7fa..c942bdee 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,15 +1,31 @@
-tools/ccan_depends: tools/ccan_depends.o tools/depends.o tools/grab_file.o ccan/string/string.o ccan/talloc/talloc.o
+ALL_TOOLS = tools/configurator/configurator tools/ccan_depends tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
 
-tools/run_tests: tools/run_tests.o tools/depends.o tools/grab_file.o ccan/tap/tap.o ccan/string/string.o ccan/talloc/talloc.o
+DEP_OBJS = ccan/grab_file/grab_file.o \
+	ccan/noerr/noerr.o \
+	ccan/read_write_all/read_write_all.o \
+	ccan/str/debug.o \
+	ccan/str/str.o \
+	ccan/str_talloc/str_talloc.o \
+	ccan/talloc/talloc.o \
+	ccan/time/time.o \
+	tools/compile.o \
+	tools/depends.o \
+	tools/tools.o
 
-tools/doc_extract: tools/doc_extract.o ccan/string/string.o ccan/talloc/talloc.o
+.PHONY: tools
+tools: $(ALL_TOOLS)
 
-tools/namespacize: tools/namespacize.o tools/grab_file.o tools/depends.o ccan/string/string.o ccan/talloc/talloc.o
+tools/ccan_depends: tools/ccan_depends.o $(DEP_OBJS)
 
-tools/run_tests.o tools/namespacize.o tools/grab_file.o tools/depends.o: tools/tools.h
+tools/doc_extract: tools/doc_extract.o tools/doc_extract-core.o $(DEP_OBJS)
+
+tools/namespacize: tools/namespacize.o $(DEP_OBJS)
+
+tools/namespacize.o tools/depends.o: tools/tools.h
+
+tools/configurator/configurator: tools/configurator/configurator.c
 
 tools-clean: ccanlint-clean
-	rm -f tools/ccan_depends tools/run_tests tools/doc_extract tools/namespacize
+	$(RM) $(ALL_TOOLS)
 
 include tools/ccanlint/Makefile
-include tools/_infotojson/Makefile