X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2FMakefile;h=1ab69c928e625c6ddabb0d31d0160b83a2a2171a;hp=e9574760b12924d9445555e7e70b7273ea7c5c24;hb=2179b06e713677476a5a37acbf179b8d5be8693b;hpb=37ca11df87fa3cc97aca321a76e564e4058d6900

diff --git a/tools/Makefile b/tools/Makefile
index e9574760..1ab69c92 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,14 +1,41 @@
-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
+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/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
 
-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
+.PHONY: tools
+tools: $(ALL_TOOLS)
 
-tools/doc_extract: tools/doc_extract.c ccan/talloc/talloc.o
+tools/ccan_depends.o: config.h
 
-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