X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=13aa195dd0e379187a34d5470d927177f89c7c13;hp=c73569a5ae77cc4364015cf60a44119848d189de;hb=4fc1f40b58ec470a89d95e8790956a4967a87cb1;hpb=758ab1f402b4af3cccac09548b709deca17ef930

diff --git a/Makefile b/Makefile
index c73569a5..13aa195d 100644
--- 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