X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2FMakefile;h=5a266796e3206b4da6e367a2719f14165afcaef4;hp=e7c21d6f4bdfa3366860c3f6201ed0d5a224ce05;hb=f94261729ff13eb4e1f3341167c0e54afaa6a73a;hpb=501b31cddfaa3e8a4374dc84f6f75d07dd2d0abb

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index e7c21d6f..5a266796 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,24 +1,50 @@
-TEST_CFILES := $(wildcard tools/ccanlint/compulsory_tests/*.c) \
-	$(wildcard tools/ccanlint/tests/*.c)
+TEST_CFILES := $(wildcard tools/ccanlint/tests/*.c)
 TEST_OBJS := $(TEST_CFILES:.c=.o)
 
-CORE_OBJS := tools/ccanlint/ccanlint.o \
+CORE_OBJS := \
+	ccan/asort/asort.o \
+	ccan/autodata/autodata.o \
+	ccan/dgraph/dgraph.o \
+	ccan/foreach/foreach.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/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 \
-	ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o \
-	ccan/talloc/talloc.o ccan/noerr/noerr.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-init-tests: $(TEST_CFILES)
-	cat $(TEST_CFILES) | grep ^REGISTER_TEST > $@
-
-$(TEST_OBJS): tools/ccanlint/generated-init-tests
+$(CORE_OBJS): config.h
 
 tools/ccanlint/ccanlint: $(OBJS)
 
 ccanlint-clean:
-	$(RM) tools/ccanlint/generated-init-tests
-	$(RM) tools/ccanlint/ccanlint
-
+	rm -f tools/ccanlint/ccanlint