X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2FMakefile;h=ddd6545fc694b9d91e9d5a3ec9014aa1c49acb8d;hp=8301ba52abab595f0d6e2d0db188e9e49d6e2f6f;hb=6aa2f4e347e5d66a392b879fe901bc582099a552;hpb=3612661714e86333ceacca7314959a5ed938dc6a

diff --git a/tools/Makefile b/tools/Makefile
index 8301ba52..ddd6545f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,19 +1,40 @@
-ALL_TOOLS = tools/ccan_depends tools/run_tests 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/grab_file/grab_file.o ccan/talloc/talloc.o ccan/noerr/noerr.o ccan/read_write_all/read_write_all.o
+ALL_TOOLS = tools/configurator/configurator tools/ccan_depends tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
+LDLIBS = -lrt
+DEP_OBJS = ccan/err/err.o \
+	ccan/foreach/foreach.o \
+	ccan/list/list.o \
+	ccan/noerr/noerr.o \
+	ccan/rbuf/rbuf.o \
+	ccan/read_write_all/read_write_all.o \
+	ccan/str/debug.o \
+	ccan/str/str.o \
+	ccan/take/take.o \
+	ccan/tal/tal.o \
+	ccan/tal/grab_file/grab_file.o \
+	ccan/tal/link/link.o \
+	ccan/tal/path/path.o \
+	ccan/tal/str/str.o \
+	ccan/time/time.o \
+	tools/read_config_header.o \
+	tools/ccan_dir.o \
+	tools/compile.o \
+	tools/depends.o \
+	tools/tools.o
 
 .PHONY: tools
 tools: $(ALL_TOOLS)
 
-tools/ccan_depends: tools/ccan_depends.o $(DEP_OBJS)
+tools/ccan_depends.o: config.h
 
-tools/run_tests: tools/run_tests.o ccan/tap/tap.o $(DEP_OBJS)
+tools/ccan_depends: tools/ccan_depends.o $(DEP_OBJS)
 
 tools/doc_extract: tools/doc_extract.o tools/doc_extract-core.o $(DEP_OBJS)
 
 tools/namespacize: tools/namespacize.o $(DEP_OBJS)
 
-tools/run_tests.o tools/namespacize.o tools/depends.o: tools/tools.h
+tools/namespacize.o tools/depends.o: tools/tools.h
+
+tools/configurator/configurator: tools/configurator/configurator.c
 
 tools-clean: ccanlint-clean
 	$(RM) $(ALL_TOOLS)