tools: use tal instead of talloc.

[ccan] / tools / ccanlint / Makefile

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index 11d09e87339b24db5760cae53e1084f0f8413023..ad6b12fb71a5fa6e042d4a20653ae5c2b7587566 100644 (file)
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -3,45 +3,46 @@ TEST_OBJS := $(TEST_CFILES:.c=.o)
 
 CORE_OBJS := \
        ccan/asort/asort.o \
-       ccan/btree/btree.o \
+       ccan/autodata/autodata.o \
+       ccan/dgraph/dgraph.o \
        ccan/foreach/foreach.o \
-       ccan/grab_file/grab_file.o \
        ccan/hash/hash.o \
        ccan/htable/htable.o \
+       ccan/ilog/ilog.o \
        ccan/lbalance/lbalance.o \
+       ccan/list/list.o \
        ccan/noerr/noerr.o \
        ccan/opt/helpers.o \
        ccan/opt/opt.o \
        ccan/opt/parse.o \
        ccan/opt/usage.o \
+       ccan/ptr_valid/ptr_valid.o \
+       ccan/rbuf/rbuf.o \
        ccan/read_write_all/read_write_all.o \
        ccan/str/str.o ccan/str/debug.o \
-       ccan/str_talloc/str_talloc.o \
-       ccan/talloc/talloc.o \
-       ccan/talloc_link/talloc_link.o \
+       ccan/strmap/strmap.o \
+       ccan/take/take.o \
+       ccan/tal/tal.o \
+       ccan/tal/link/link.o \
+       ccan/tal/str/str.o \
        ccan/time/time.o \
        tools/ccanlint/async.o \
        tools/ccanlint/ccanlint.o \
        tools/ccanlint/file_analysis.o \
        tools/ccanlint/licenses.o \
+       tools/ccan_dir.o \
        tools/compile.o \
        tools/depends.o \
        tools/doc_extract-core.o \
+       tools/manifest.o \
+       tools/read_config_header.o \
        tools/tools.o
 
 OBJS := $(CORE_OBJS) $(TEST_OBJS)
 
-# FIXME: write a trivial C program to do this
-tools/ccanlint/generated-testlist: $(TEST_CFILES)
-       cat $^ | grep ^REGISTER_TEST > $@
-
-$(TEST_OBJS): tools/ccanlint/generated-testlist
-
-# Otherwise, ccanlint.c et al. may fail to build
-$(CORE_OBJS): tools/ccanlint/generated-testlist config.h
+$(CORE_OBJS): config.h
 
 tools/ccanlint/ccanlint: $(OBJS)
 
 ccanlint-clean:
-       $(RM) tools/ccanlint/generated-testlist
        $(RM) tools/ccanlint/ccanlint