X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2FMakefile;h=c263d0d616d19220ba419b8ca3b73119140846a8;hp=16c4bfd2b3324daab2c6462af18341d7528601a8;hb=0621cac3bf1b5cf4c90de56e0e43b0acde0c94f1;hpb=3c81225fc0a4fb99d10282ebf11b7ec6ae1eabdd

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index 16c4bfd2..c263d0d6 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,27 +1,42 @@
-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/grab_file/grab_file.o \
+	ccan/hash/hash.o \
+	ccan/htable/htable.o \
+	ccan/lbalance/lbalance.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/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 \
+	tools/ccanlint/async.o \
+	tools/ccanlint/ccanlint.o \
 	tools/ccanlint/file_analysis.o \
+	tools/ccanlint/licenses.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/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
-
-# Otherwise, ccanlint.c et al. may fail to build
-$(CORE_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
-