X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2FMakefile;h=ad6b12fb71a5fa6e042d4a20653ae5c2b7587566;hp=6bec8c4a90dbb84c5ea68965a2eb1990cb113118;hb=dc8042b42500f79f613b1197df6cdf739615a89f;hpb=e67de75f0d64096956ad40ecb09462dac6fc5f03

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index 6bec8c4a..ad6b12fb 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,42 +1,48 @@
-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 := tools/ccanlint/ccanlint.o \
-	tools/ccanlint/file_analysis.o \
-	tools/ccanlint/licenses.o \
-	tools/doc_extract-core.o \
-	tools/depends.o \
-	tools/tools.o \
-	tools/compile.o \
-	ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o \
-	ccan/str/str.o ccan/str/debug.o \
+CORE_OBJS := \
 	ccan/asort/asort.o \
-	ccan/btree/btree.o \
-	ccan/talloc/talloc.o ccan/noerr/noerr.o \
-	ccan/talloc_link/talloc_link.o ccan/noerr/noerr.o \
+	ccan/autodata/autodata.o \
+	ccan/dgraph/dgraph.o \
 	ccan/foreach/foreach.o \
-	ccan/hash/hash.o ccan/htable/htable.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/opt/opt.o ccan/opt/usage.o ccan/opt/helpers.o ccan/opt/parse.o
+	ccan/str/str.o ccan/str/debug.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-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
-