Browse Source

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

Rusty Russell 17 years ago
parent
commit
e956db66e8
3 changed files with 14 additions and 9 deletions
  1. 12 6
      Makefile
  2. 1 1
      web/staticall.php
  3. 1 2
      web/staticupload.php

+ 12 - 6
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.
 # This can be overridden on cmdline to generate pages elsewhere.
 WEBDIR=~/www/html/ccan/
 WEBDIR=~/www/html/ccan/
@@ -40,8 +48,8 @@ $(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2
 $(ALL_DIRS):
 $(ALL_DIRS):
 	@touch $@
 	@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 $*...
 	@echo Testing $*...
 	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
 	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
 
 
-ccanlint: tools/ccanlint/ccanlint
-
 clean: tools-clean
 clean: tools-clean
 	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
 	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
 	$(RM) inter-depends lib-depends test-depends
 	$(RM) inter-depends lib-depends test-depends

+ 1 - 1
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>
 </p>
 
 
 <table align="center" width="80%" border="0" cellpadding="3" cellspacing="1">
 <table align="center" width="80%" border="0" cellpadding="3" cellspacing="1">

+ 1 - 2
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.
 by uploading here; .tar.gz, .zip or even single C files.
 </p>
 </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
 main repository.  Otherwise, it'll go into our "junkcode" area where
 people can browse and download it.
 people can browse and download it.
 </p>
 </p>