X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=Makefile;h=c50894d7a79771d27919ceb12aa9e8c799e86802;hb=3785a28e52ed66f24355bf12c1d0f7b1908cd7e2;hp=0101fe0653b5601bb9c30888a99b57f1718fa799;hpb=fdc7a4c95dbf2177b757771434415e27bd482c83;p=ccan

diff --git a/Makefile b/Makefile
index 0101fe06..c50894d7 100644
--- a/Makefile
+++ b/Makefile
@@ -10,20 +10,9 @@
 #        Especially tools/ccanlint/ccanlint and tools/namespacize.
 # distclean: destroy everything back to pristine state
 
-# 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 jset nfs
-
 # Where make scores puts the results
 SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
 
-ALL=$(filter-out $(EXCLUDE), $(REALLY_ALL))
-
-ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(REALLY_ALL))
-
-# Not all modules have tests.
-ALL_TESTS=$(patsubst ccan/%/test/, %, $(foreach dir, $(ALL), $(wildcard ccan/$(dir)/test/)))
-
 # Here's my rough logarithmic timeout graph for my laptop:
 #
 # 302                                                  -     
@@ -65,18 +54,20 @@ FASTTIMEOUT=750
 
 default: libccan.a
 
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS_NORMAL) $(MODS_EXTERNAL))
+
 include Makefile-ccan
 
-fastcheck: $(ALL_TESTS:%=summary-fastcheck-%)
+fastcheck: $(MODS_NORMAL:%=summary-fastcheck-%)
 
-check: $(ALL_TESTS:%=summary-check-%)
+check: $(MODS_NORMAL:%=summary-check-%)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
 
 scores: $(SCOREDIR)/SUMMARY
 
-$(SCOREDIR)/SUMMARY: $(patsubst ccan/%/_info, $(SCOREDIR)/score-%, $(wildcard ccan/*/_info))
+$(SCOREDIR)/SUMMARY: $(MODS:%=$(SCOREDIR)/score-%)
 	git describe --always > $@
 	uname -a >> $@
 	$(CC) -v >> $@
@@ -129,7 +120,7 @@ FORCE:
 
 # 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) > $@ || rm -f $@
+	tools/configurator/configurator $(CC) $(CCAN_CFLAGS) > $@.tmp && mv $@.tmp $@
 
 include tools/Makefile
 -include inter-depends