Commit dca59645 authored by Rusty Russell's avatar Rusty Russell

Fix EXCLUDE logic for makefiles, add fastcheck

parent 20077630
......@@ -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 $<
......
......@@ -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)
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment