X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2FMakefile;h=c942bdeeb501a933e98aa05374622ccf956b010e;hp=254d09960a6242398ebb214bc672881559f72898;hb=c59407178991758de6541740f912578e33c7e50b;hpb=015fe7cbd9409e33bf4a398e88e2ff5eff59bc60

diff --git a/tools/Makefile b/tools/Makefile
index 254d0996..c942bdee 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,23 +1,31 @@
-ALL_TOOLS = tools/ccan_depends tools/run_tests tools/doc_extract tools/namespacize tools/create_dep_tar
+ALL_TOOLS = tools/configurator/configurator tools/ccan_depends tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
+
+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
 
 .PHONY: tools
 tools: $(ALL_TOOLS)
 
-tools/ccan_depends: tools/ccan_depends.o tools/depends.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/talloc/talloc.o ccan/noerr/noerr.o
+tools/ccan_depends: tools/ccan_depends.o $(DEP_OBJS)
 
-tools/run_tests: tools/run_tests.o tools/depends.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/tap/tap.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+tools/doc_extract: tools/doc_extract.o tools/doc_extract-core.o $(DEP_OBJS)
 
-tools/doc_extract: tools/doc_extract.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+tools/namespacize: tools/namespacize.o $(DEP_OBJS)
 
-tools/namespacize: tools/namespacize.o tools/depends.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/noerr/noerr.o ccan/talloc/talloc.o
+tools/namespacize.o tools/depends.o: tools/tools.h
 
-tools/create_dep_tar: tools/create_dep_tar.o tools/depends.o ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o ccan/noerr/noerr.o ccan/talloc/talloc.o tools/_infotojson/sqlite3_database.o tools/_infotojson/utils.o
-	$(CC) $(LDFLAGS) -o $@ $^ -lsqlite3
-
-tools/run_tests.o tools/namespacize.o tools/depends.o: tools/tools.h
+tools/configurator/configurator: tools/configurator/configurator.c
 
 tools-clean: ccanlint-clean
-	rm -f $(ALL_TOOLS)
+	$(RM) $(ALL_TOOLS)
 
 include tools/ccanlint/Makefile
-include tools/_infotojson/Makefile