ccanlint: use ccan/autodata

[ccan] / tools / ccanlint / Makefile

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index ee371e054c87bf084eb32e3c290a611fe63492b1..c263d0d616d19220ba419b8ca3b73119140846a8 100644 (file)
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,10 +1,10 @@
-COMPULSORY_TEST_CFILES := $(wildcard tools/ccanlint/compulsory_tests/*.c)
-NORMAL_TEST_CFILES := $(wildcard tools/ccanlint/tests/*.c)
-TEST_OBJS := $(NORMAL_TEST_CFILES:.c=.o) $(COMPULSORY_TEST_CFILES:.c=.o)
+TEST_CFILES := $(wildcard tools/ccanlint/tests/*.c)
+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 \
@@ -15,9 +15,11 @@ 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 \
+       ccan/strmap/strmap.o \
        ccan/talloc/talloc.o \
        ccan/talloc_link/talloc_link.o \
        ccan/time/time.o \
@@ -32,21 +34,9 @@ CORE_OBJS := \
 
 OBJS := $(CORE_OBJS) $(TEST_OBJS)
 
-# FIXME: write a trivial C program to do this
-tools/ccanlint/generated-normal-tests: $(NORMAL_TEST_CFILES)
-       cat $^ | grep ^REGISTER_TEST > $@
-tools/ccanlint/generated-compulsory-tests: $(COMPULSORY_TEST_CFILES)
-       cat $^ | grep ^REGISTER_TEST > $@
-
-$(TEST_OBJS): tools/ccanlint/generated-normal-tests tools/ccanlint/generated-compulsory-tests
-
-# Otherwise, ccanlint.c et al. may fail to build
-$(CORE_OBJS): tools/ccanlint/generated-normal-tests tools/ccanlint/generated-compulsory-tests config.h
+$(CORE_OBJS): config.h
 
 tools/ccanlint/ccanlint: $(OBJS)
 
 ccanlint-clean:
-       $(RM) tools/ccanlint/generated-compulsory-tests
-       $(RM) tools/ccanlint/generated-normal-tests
        $(RM) tools/ccanlint/ccanlint
-