X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2FMakefile;h=b8871be0845c4b58d7adc5e37c4db9d3d4302e3e;hp=4f6f699abbef92d1443d89d8c7c2676f96ee07e1;hb=624871f35e94510b9924ba733f2b878ecf2cc6cc;hpb=80cb7a616d74ebae86d10de068b33becda621180

diff --git a/tools/Makefile b/tools/Makefile
index 4f6f699a..b8871be0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,15 +1,32 @@
-tools/ccan_depends: tools/ccan_depends.o tools/depends.o tools/split.o tools/grab_file.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/split.o tools/grab_file.o ccan/tap/tap.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/read_config_header.o \
+	tools/compile.o \
+	tools/depends.o \
+	tools/tools.o
 
-tools/doc_extract: tools/doc_extract.c ccan/talloc/talloc.o
+.PHONY: tools
+tools: $(ALL_TOOLS)
 
-tools/namespacize: tools/namespacize.c tools/split.o tools/grab_file.o tools/depends.o ccan/talloc/talloc.o
+tools/ccan_depends: tools/ccan_depends.o $(DEP_OBJS)
 
-tools/run_tests.o tools/namespacize.o tools/split.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 run_tests doc_extract namespacize
+	$(RM) $(ALL_TOOLS)
 
 include tools/ccanlint/Makefile
-include tools/_infotojson/Makefile