ccanlint: use ccan/autodata

[ccan] / tools / ccanlint / Makefile

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index f079f8da438ce5a3475fedf26f3eedeae5a18365..c263d0d616d19220ba419b8ca3b73119140846a8 100644 (file)
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -3,6 +3,7 @@ TEST_OBJS := $(TEST_CFILES:.c=.o)
 
 CORE_OBJS := \
        ccan/asort/asort.o \
+       ccan/autodata/autodata.o \
        ccan/dgraph/dgraph.o \
        ccan/foreach/foreach.o \
        ccan/grab_file/grab_file.o \
@@ -14,6 +15,7 @@ CORE_OBJS := \
        ccan/opt/opt.o \
        ccan/opt/parse.o \
        ccan/opt/usage.o \
+       ccan/ptr_valid/ptr_valid.o \
        ccan/read_write_all/read_write_all.o \
        ccan/str/str.o ccan/str/debug.o \
        ccan/str_talloc/str_talloc.o \
@@ -32,17 +34,9 @@ CORE_OBJS := \
 
 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