ccanlint: parse --verbose before anything else.

[ccan] / tools / ccanlint / Makefile

diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index 846adf627dc86277327477fe8b3c65507dc6cc3d..11d09e87339b24db5760cae53e1084f0f8413023 100644 (file)
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -1,6 +1,5 @@
-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)
+TEST_CFILES := $(wildcard tools/ccanlint/tests/*.c)
+TEST_OBJS := $(TEST_CFILES:.c=.o)
 
 CORE_OBJS := \
        ccan/asort/asort.o \
@@ -9,6 +8,7 @@ CORE_OBJS := \
        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 \
@@ -20,6 +20,7 @@ CORE_OBJS := \
        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 \
@@ -31,20 +32,16 @@ CORE_OBJS := \
 OBJS := $(CORE_OBJS) $(TEST_OBJS)
 
 # FIXME: write a trivial C program to do this
-tools/ccanlint/generated-normal-tests: $(NORMAL_TEST_CFILES)
-       cat $^ | grep ^REGISTER_TEST > $@
-tools/ccanlint/generated-compulsory-tests: $(COMPULSORY_TEST_CFILES)
+tools/ccanlint/generated-testlist: $(TEST_CFILES)
        cat $^ | grep ^REGISTER_TEST > $@
 
-$(TEST_OBJS): tools/ccanlint/generated-normal-tests tools/ccanlint/generated-compulsory-tests
+$(TEST_OBJS): tools/ccanlint/generated-testlist
 
 # Otherwise, ccanlint.c et al. may fail to build
-$(CORE_OBJS): tools/ccanlint/generated-normal-tests tools/ccanlint/generated-compulsory-tests config.h
+$(CORE_OBJS): tools/ccanlint/generated-testlist config.h
 
 tools/ccanlint/ccanlint: $(OBJS)
 
 ccanlint-clean:
-       $(RM) tools/ccanlint/generated-compulsory-tests
-       $(RM) tools/ccanlint/generated-normal-tests
+       $(RM) tools/ccanlint/generated-testlist
        $(RM) tools/ccanlint/ccanlint
-