X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2FMakefile;h=c263d0d616d19220ba419b8ca3b73119140846a8;hb=c438ec17d7b2efe76e56e5fc5ab88bd4a02735e8;hp=11d09e87339b24db5760cae53e1084f0f8413023;hpb=60824f8a0f758dc7808eb31cc83434ea78f44ed1;p=ccan

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index 11d09e87..c263d0d6 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -3,7 +3,8 @@ 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 \
@@ -14,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 \
@@ -31,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