X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=2ce014586fe1b23a70a9635823185dc717d7ba6b;hp=b885875a4d6b3fcfa73c1c0b839c0f0db9ceee05;hb=ee77e470b467cf85dc533cee8c08e08bd4c9be06;hpb=d873aaec1339baf45c37db7cbaa2d687656343ba

diff --git a/Makefile b/Makefile
index b885875a..2ce01458 100644
--- a/Makefile
+++ b/Makefile
@@ -12,65 +12,64 @@
 
 # Where make scores puts the results
 SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
+CCANLINT=tools/ccanlint/ccanlint --deps-fail-ignore
+CCANLINT_FAST=$(CCANLINT) -x tests_pass_valgrind -x tests_compile_coverage
 
 default: libccan.a
 
-ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS_NORMAL) $(MODS_EXTERNAL))
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS))
+
+# By default, we skip modules with external deps (or plaform specific)
+MODS_EXCLUDE:=altstack generator jmap jset nfs ogg_to_pcm tal/talloc wwviaudio
+# This randomly fails, and reliably fails under Jenkins :(
+MODS_FLAKY:=altstack
+MODS_RELIABLE=$(filter-out $(MODS_FLAKY),$(MODS))
 
 include Makefile-ccan
 
-fastcheck: $(MODS_NORMAL:%=summary-fastcheck-%)
+fastcheck: $(MODS_RELIABLE:%=summary-fastcheck/%)
 
-check: $(MODS_NORMAL:%=summary-check-%)
+check: $(MODS_RELIABLE:%=summary-check/%)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
 
 scores: $(SCOREDIR)/SUMMARY
 
-$(SCOREDIR)/SUMMARY: $(MODS:%=$(SCOREDIR)/score-%)
+$(SCOREDIR)/SUMMARY: $(MODS:%=$(SCOREDIR)/%.score)
 	git describe --always > $@
 	uname -a >> $@
 	$(CC) -v >> $@
 	cat $^ | grep 'Total score:' >> $@
 
-$(SCOREDIR)/score-%: ccan/%/_info tools/ccanlint/ccanlint $(OBJFILES)
-	mkdir -p $(SCOREDIR)
-	tools/ccanlint/ccanlint -v -s ccan/$* > $@ || true
+$(SCOREDIR)/%.score: ccan/%/_info tools/ccanlint/ccanlint $(OBJFILES)
+	mkdir -p `dirname $@`
+	$(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 ccan/$*
+check/%: tools/ccanlint/ccanlint
+	$(CCANLINT) ccan/$*
 
-fastcheck-%: tools/ccanlint/ccanlint
-	tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage ccan/$*
+fastcheck/%: tools/ccanlint/ccanlint
+	$(CCANLINT_FAST) ccan/$*
 
 # Doesn't test dependencies, doesn't print verbose fail results.
-summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
-	tools/ccanlint/ccanlint -s ccan/$*
-
-summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
-	tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/$*
+summary-check/%: tools/ccanlint/ccanlint $(OBJFILES)
+	$(CCANLINT) -s ccan/$*
 
-# FIXME: Horrible hacks because % doesn't match /
-summary-fastcheck-antithread/%: tools/ccanlint/ccanlint $(OBJFILES)
-	tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/antithread/$*
-
-summary-fastcheck-tal/%: tools/ccanlint/ccanlint $(OBJFILES)
-	tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/tal/$*
+summary-fastcheck/%: tools/ccanlint/ccanlint $(OBJFILES)
+	$(CCANLINT_FAST) -s ccan/$*
 
 ccan/%/info: ccan/%/_info
 	$(CC) $(CCAN_CFLAGS) -o $@ -x c $<
 
-libccan.a(%.o): ccan/%.o
-	$(AR) r $@ $<
-
 clean: tools-clean
-	$(RM) `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'`  `find * -name info` `find * -name '*.d'`
-	$(RM) inter-depends lib-depends test-depends ccan/*-Makefile
+	rm -f `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'`  `find * -name info` `find * -name '*.d'` `find ccan -name '*-Makefile'`
+	rm -f config.h
+	rm -f inter-depends lib-depends test-depends
 
 # Creates a dependency from the tests to the object files which it needs.
 inter-depends: $(ALL_DEPENDS) Makefile
@@ -79,7 +78,7 @@ inter-depends: $(ALL_DEPENDS) Makefile
 # Creates dependencies between tests, so if foo depends on bar, bar is tested
 # first 
 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 > $@
+	for f in $(ALL_DEPENDS); do echo check/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check/\1,p' < $$f`; done > $@
 
 TAGS: FORCE
 	find * -name '*.[ch]' | xargs etags