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

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index e7c21d6f..ee371e05 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,24 +1,52 @@
-TEST_CFILES := $(wildcard tools/ccanlint/compulsory_tests/*.c) \
-	$(wildcard tools/ccanlint/tests/*.c)
-TEST_OBJS := $(TEST_CFILES:.c=.o)
+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 := tools/ccanlint/ccanlint.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/lbalance/lbalance.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 \
+	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 > $@
+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-init-tests
+$(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
 
 tools/ccanlint/ccanlint: $(OBJS)
 
 ccanlint-clean:
-	$(RM) tools/ccanlint/generated-init-tests
+	$(RM) tools/ccanlint/generated-compulsory-tests
+	$(RM) tools/ccanlint/generated-normal-tests
 	$(RM) tools/ccanlint/ccanlint