-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 \
-
-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 \
-
-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' >$@
-
-tools/ccanlint/ccanlint.o: tools/ccanlint/generated-init-tests
-
-tools/ccanlint/ccanlint: \
- $(OBJS) \
+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)
+
+CORE_OBJS := \
+ ccan/asort/asort.o \
+ ccan/btree/btree.o \
+ ccan/foreach/foreach.o \
+ ccan/grab_file/grab_file.o \
+ ccan/hash/hash.o \
+ ccan/htable/htable.o \
+ ccan/noerr/noerr.o \
+ ccan/opt/helpers.o \
+ ccan/opt/opt.o \
+ ccan/opt/parse.o \
+ ccan/opt/usage.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/time/time.o \