Include Makefile, config.h, tools in all tarball.

diff --git a/Makefile b/Makefile
index 222a9b22146c516476d9ae2ae816a00636c5ad25..8a4077287a3181b39f3606e3e1fe2223381f5de8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
-# Hacky makefile to compile everything and run the tests in some kind of sane order.
-# V=--verbose for verbose tests.
+# Hacky makefile to compile everything and run the tests in some kind
+# of sane order.
+
+# Main targets:
+# 
+# check: run tests on all ccan modules (use 'make check V=--verbose' for more)
+#        Includes building libccan.a.
+# tools: build useful tools in tools/ dir.
+#        Especially tools/ccanlint/ccanlint and tools/namespacize.
+# distclean: destroy everything back to pristine state

 
 # This can be overridden on cmdline to generate pages elsewhere.
 WEBDIR=~/www/html/ccan/
 
 # This can be overridden on cmdline to generate pages elsewhere.
 WEBDIR=~/www/html/ccan/


@@ -40,8 +48,8 @@ $(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2
 $(ALL_DIRS):
        @touch $@
 
 $(ALL_DIRS):
        @touch $@
 

-$(WEBDIR)/ccan.tar.bz2:
-       tar cvfj $@ `bzr ls --versioned --kind=file ccan`
+$(WEBDIR)/ccan.tar.bz2: config.h Makefile Makefile-ccan $(shell bzr ls --versioned --kind=file ccan) $(shell bzr ls --versioned --kind=file tools)
+       tar cvfj $@ $^

 
 $(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
 
 
 $(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
 


@@ -88,8 +96,6 @@ test-ccan/%:: tools/run_tests
        @echo Testing $*...
        @if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
 
        @echo Testing $*...
        @if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
 

-ccanlint: tools/ccanlint/ccanlint
-

 clean: tools-clean
        $(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
        $(RM) inter-depends lib-depends test-depends
 clean: tools-clean
        $(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
        $(RM) inter-depends lib-depends test-depends

diff --git a/web/staticall.php b/web/staticall.php
index 60f7fa77b419e66fb8c70da4b7ab7818e2336a64..d93a26f27ac005e048f36e05588d7f3ef76e4743 100644 (file)
--- a/web/staticall.php
+++ b/web/staticall.php
@@ -16,7 +16,7 @@ download.
 </p>
 
 <p>
 </p>
 
 <p>

-Or you can just download the <a href="ccan.tar.bz2">tarball of everything (<?=$tarballsize?>K)</a>.
+Or you can just download the <a href="ccan.tar.bz2">tarball of everything including CCAN tools (<?=$tarballsize?>K)</a>.

 </p>
 
 <table align="center" width="80%" border="0" cellpadding="3" cellspacing="1">
 </p>
 
 <table align="center" width="80%" border="0" cellpadding="3" cellspacing="1">

diff --git a/web/staticupload.php b/web/staticupload.php
index d1252e16b7cd97a5d0fea2d804d1d7f567a0003e..998ca21cb7945cd7f931f88eb01481a7686f0f6d 100644 (file)
--- a/web/staticupload.php
+++ b/web/staticupload.php
@@ -16,8 +16,7 @@ Got C code sitting around which might help someone?  Put it to work
 by uploading here; .tar.gz, .zip or even single C files.
 </p>
 
 by uploading here; .tar.gz, .zip or even single C files.
 </p>
 

-<p>
-If it has a valid _info.c file and a testsuite, it'll go into the
+<p>If it has a valid _info.c file and a testsuite (see <a href="http://ccan.ozlabs.org/Wiki/ModuleGuide">the module creation guide</a>), it'll go into the

 main repository.  Otherwise, it'll go into our "junkcode" area where
 people can browse and download it.
 </p>
 main repository.  Otherwise, it'll go into our "junkcode" area where
 people can browse and download it.
 </p>