X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2FMakefile;h=691f270890e0f352edc3f2815c97a01ab59428ad;hp=ee371e054c87bf084eb32e3c290a611fe63492b1;hb=9e207bca5bf5e0a1e3653a91649414fab793c801;hpb=0ce66a11534211efcddc6f7f1be0ccad38d2258f

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index ee371e05..691f2708 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,52 +1,50 @@
-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 \
 	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/grab_file/grab_file.o \
+	ccan/tal/link/link.o \
+	ccan/tal/path/path.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-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
-