grab_file: move ccan/str_alloc to testdepends

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index c73569a5ae77cc4364015cf60a44119848d189de..13aa195dd0e379187a34d5470d927177f89c7c13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ check-%: tools/ccanlint/ccanlint
        tools/ccanlint/ccanlint ccan/$*
 
 fastcheck-%: tools/ccanlint/ccanlint
-       tools/ccanlint/ccanlint -t $(FASTTIMEOUT) ccan/$*
+       tools/ccanlint/ccanlint --timeout $(FASTTIMEOUT) ccan/$*
 
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
@@ -122,8 +122,9 @@ inter-depends: $(ALL_DEPENDS) Makefile
 test-depends: $(ALL_DEPENDS) Makefile
        for f in $(ALL_DEPENDS); do echo check-`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check-\1,p' < $$f`; done > $@
 
+# Ensure we don't end up with empty file if configurator fails!
 config.h: tools/configurator/configurator Makefile Makefile-ccan
-       @tools/configurator/configurator $(CC) $(CCAN_CFLAGS) > config.h
+       tools/configurator/configurator $(CC) $(CCAN_CFLAGS) > $@ || rm -f $@
 
 include tools/Makefile
 -include inter-depends