ccanlint: keep separate array of compiled versions.

[ccan] / tools / ccanlint / Makefile

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index 16c4bfd2b3324daab2c6462af18341d7528601a8..846adf627dc86277327477fe8b3c65507dc6cc3d 100644 (file)
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,27 +1,50 @@
-TEST_CFILES := $(wildcard tools/ccanlint/compulsory_tests/*.c) \
-       $(wildcard tools/ccanlint/tests/*.c)
-TEST_OBJS := $(TEST_CFILES:.c=.o)
-
-CORE_OBJS := tools/ccanlint/ccanlint.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 := \
+       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 \
+       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-init-tests
+$(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