X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2FMakefile;h=ddd6545fc694b9d91e9d5a3ec9014aa1c49acb8d;hp=a03cc9a4c113e9abaaa40e72c3f96998e877ab01;hb=9fc07111603c6e892ed768f900465282314b2982;hpb=41069549813a04a2875063cb12e8057f5d54d7f1

diff --git a/tools/Makefile b/tools/Makefile
index a03cc9a4..ddd6545f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,18 +1,42 @@
-tools/ccan_depends: tools/ccan_depends.o tools/depends.o ccan/string/string.o ccan/talloc/talloc.o ccan/noerr/noerr.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
 
-tools/run_tests: tools/run_tests.o tools/depends.o ccan/tap/tap.o ccan/string/string.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+.PHONY: tools
+tools: $(ALL_TOOLS)
 
-tools/doc_extract: tools/doc_extract.o ccan/string/string.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+tools/ccan_depends.o: config.h
 
-tools/namespacize: tools/namespacize.o tools/depends.o ccan/string/string.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+tools/ccan_depends: tools/ccan_depends.o $(DEP_OBJS)
 
-tools/create_dep_tar: tools/create_dep_tar.o tools/depends.o ccan/string/string.o ccan/noerr/noerr.o ccan/talloc/talloc.o tools/_infotojson/sqlite3_database.o tools/_infotojson/utils.o
-	$(CC) $(LDFLAGS) -o $@ $^ -lsqlite3
+tools/doc_extract: tools/doc_extract.o tools/doc_extract-core.o $(DEP_OBJS)
 
-tools/run_tests.o tools/namespacize.o tools/depends.o: tools/tools.h
+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