tdb2: copy tdb1's changed expansion logic.
[ccan] / Makefile
index de219725ea7301c96743e1e4064bc91eed6965b8..570793c711aaf7634bf4215dd52eedc8f8420a01 100644 (file)
--- a/Makefile
+++ b/Makefile
 
 # Trying to build the whole repo is usually a lose; there will be some
 # dependencies you don't have.
-EXCLUDE=wwviaudio ogg_to_pcm jmap jbitset nfs
+EXCLUDE=wwviaudio ogg_to_pcm jmap jset nfs
 
 # Where make scores puts the results
-SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)
+SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
 
 ALL=$(filter-out $(EXCLUDE), $(REALLY_ALL))
 
@@ -84,24 +84,24 @@ $(SCOREDIR)/SUMMARY: $(patsubst ccan/%/_info, $(SCOREDIR)/score-%, $(wildcard cc
 
 $(SCOREDIR)/score-%: ccan/%/_info tools/ccanlint/ccanlint $(OBJFILES)
        mkdir -p $(SCOREDIR)
-       tools/ccanlint/ccanlint -v -s -d ccan/$* > $@ || true
+       tools/ccanlint/ccanlint -v -s ccan/$* > $@ || true
 
 $(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
        tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
 # Actual dependencies are created in inter-depends
 check-%: tools/ccanlint/ccanlint
-       tools/ccanlint/ccanlint -d ccan/$*
+       tools/ccanlint/ccanlint ccan/$*
 
 fastcheck-%: tools/ccanlint/ccanlint
-       tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -d ccan/$*
+       tools/ccanlint/ccanlint --timeout $(FASTTIMEOUT) ccan/$*
 
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
-       tools/ccanlint/ccanlint -s -d ccan/$*
+       tools/ccanlint/ccanlint -s ccan/$*
 
 summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
-       tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -s -d ccan/$*
+       tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/$*
 
 ccan/%/info: ccan/%/_info
        $(CC) $(CCAN_CFLAGS) -o $@ -x c $<