From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 9 Apr 2010 04:30:02 +0000 (+0930)
Subject: Fix EXCLUDE logic for makefiles, add fastcheck
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=dca596459198ea77f35e4b6e767453fa5a7e1318;hp=20077630db617903098f44ac49d5816f421e4cc5

Fix EXCLUDE logic for makefiles, add fastcheck
---

diff --git a/Makefile b/Makefile
index e427c5d2..0f1d9421 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 
 # Trying to build the whole repo is usually a lose; there will be some
 # dependencies you don't have.
-EXCLUDE=ccan/wwviaudio ccan/ogg_to_pcm
+EXCLUDE=wwviaudio ogg_to_pcm
 
 # Anything with an _info file is a module.
 ALL=$(filter-out $(EXCLUDE), $(patsubst ccan/%/_info, %, $(wildcard ccan/*/_info)))
@@ -24,6 +24,8 @@ default: libccan.a
 
 include Makefile-ccan
 
+fastcheck: $(ALL_TESTS:%=summary-fastcheck-%)
+
 check: $(ALL_TESTS:%=summary-check-%)
 
 distclean: clean
@@ -36,10 +38,16 @@ $(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
 check-%: tools/ccanlint/ccanlint
 	@tools/ccanlint/ccanlint -d ccan/$*
 
+fastcheck-%: tools/ccanlint/ccanlint
+	@tools/ccanlint/ccanlint -t -d ccan/$*
+
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
 	@tools/ccanlint/ccanlint -s -d ccan/$*
 
+summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
+	@tools/ccanlint/ccanlint -t -s -d ccan/$*
+
 ccan/%/info: ccan/%/_info
 	$(CC) $(CFLAGS) -o $@ -x c $<
 
diff --git a/Makefile-ccan b/Makefile-ccan
index e188e8a4..59d540b4 100644
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -12,7 +12,7 @@ DEPGEN=-MD
 -include ccan/*/*.d
 
 # Every directory with .c files is included.
-DIRS=$(filter-out $(EXCLUDE), $(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/*.c)))))
+DIRS=$(filter-out $(foreach d,$(EXCLUDE),ccan/$d), $(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/*.c)))))
 
 # Generate everyone's separate Makefiles.
 -include $(foreach dir, $(DIRS), $(dir)-Makefile)
diff --git a/Makefile-web b/Makefile-web
index b0d51793..1d63d1bd 100644
--- a/Makefile-web
+++ b/Makefile-web
@@ -12,7 +12,7 @@ JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
 JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2)
 BZRBROWSE=$(WEBDIR)/bzrbrowse.cgi $(WEBDIR)/file.png $(WEBDIR)/folder.png
 
-upload: check webpages
+upload: fastcheck webpages
 	bzr push
 	send-web # Rusty's upload script.