tools: move config.h reading to its own file

[ccan] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 8301ba52abab595f0d6e2d0db188e9e49d6e2f6f..b8871be0845c4b58d7adc5e37c4db9d3d4302e3e 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,19 +1,30 @@
-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
+
+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
 
 .PHONY: tools
 tools: $(ALL_TOOLS)
 
 tools/ccan_depends: tools/ccan_depends.o $(DEP_OBJS)
 
-tools/run_tests: tools/run_tests.o ccan/tap/tap.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)