X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2FMakefile;h=5a266796e3206b4da6e367a2719f14165afcaef4;hp=40c26a83978c5049e57258ac373e480b535e294d;hb=89fcdf8c701183e56d370876ec16a04ebbf921fb;hpb=779d83085d6c6d37f6c4030130efe649a005696a

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index 40c26a83..5a266796 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,32 +1,50 @@
-OBJS := tools/ccanlint/no_info.o \
-	tools/ccanlint/has_main_header.o \
-	tools/ccanlint/has_tests.o \
-	tools/ccanlint/trailing_whitespace.o \
-	tools/ccanlint/idempotent.o \
+TEST_CFILES := $(wildcard tools/ccanlint/tests/*.c)
+TEST_OBJS := $(TEST_CFILES:.c=.o)
 
-FUTURE:=tools/ccanlint/if_have_not_ifdef.o \
-	tools/ccanlint/needs_depends.o \
-	tools/ccanlint/has_info_documentation.o \
-	tools/ccanlint/has_header_documentation.o \
-	tools/ccanlint/has_tests.o \
-	tools/ccanlint/builds_ok.o \
-	tools/ccanlint/builds_ok_all_have_variants.o \
-	tools/ccanlint/run_tests.o \
-	tools/ccanlint/test_coverage.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 \
+	tools/manifest.o \
+	tools/read_config_header.o \
+	tools/tools.o
 
-tools/ccanlint/generated-init-tests: $(OBJS)
-	cat $(OBJS:.o=.c) | sed -n 's/^struct ccanlint \([A-Za-z0-9_]*\) = {/{ extern struct ccanlint \1; list_add(\&tests, \&\1.list); }/p' >$@
+OBJS := $(CORE_OBJS) $(TEST_OBJS)
 
-tools/ccanlint/ccanlint.o: tools/ccanlint/generated-init-tests
+$(CORE_OBJS): config.h
 
-tools/ccanlint/ccanlint: \
-	$(OBJS)			\
-	tools/ccanlint/ccanlint.o \
-	tools/ccanlint/get_file_lines.o \
-	tools/ccanlint/file_analysis.o \
-	ccan/string/string.o ccan/talloc/talloc.o ccan/noerr/noerr.o
+tools/ccanlint/ccanlint: $(OBJS)
 
 ccanlint-clean:
-	$(RM) tools/ccanlint/generated-init-tests
-	$(RM) tools/ccanlint/ccanlint
-
+	rm -f tools/ccanlint/ccanlint