X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=888afcad8ac98ad07d3e989023cba96e5149e511;hp=d3e05e9fcd256390642547ea701829fa0823705d;hb=e5ee09b20d276ea2e86d0a5c7e9b1469f83f0ac1;hpb=963fa5ca9303d146d635e2fba04814f4f791c559

diff --git a/Makefile b/Makefile
index d3e05e9f..888afcad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,90 +1,49 @@
-# 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.
 
-# This can be overridden on cmdline to generate pages elsewhere.
-WEBDIR=~/www/html/ccan/
-
-CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -I.
+# 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
 
 ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
 ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
-ALL_PAGES=$(patsubst ccan/%, $(WEBDIR)/info/%.html, $(ALL_DIRS))
-DIRECT_TARBALLS=$(patsubst ccan/%, $(WEBDIR)/tarballs/%.tar.bz2, $(ALL_DIRS))
-DEPEND_TARBALLS=$(patsubst ccan/%, $(WEBDIR)/tarballs/with-deps/%.tar.bz2, $(ALL_DIRS))
-WEB_SUBDIRS=$(WEBDIR)/tarballs $(WEBDIR)/tarballs/with-deps $(WEBDIR)/info
 
 include Makefile-ccan
 
 check: $(ALL_DIRS:%=test-%)
+	echo $(ALL_DIRS)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
-	rm -rf $(WEBDIR)
-
-webpages: $(WEB_SUBDIRS) $(WEBDIR)/junkcode $(ALL_PAGES) $(WEBDIR)/list.html $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan
-
-$(WEB_SUBDIRS):
-	mkdir -p $@
-
-$(WEBDIR)/junkcode:
-	cp -a junkcode $@
 
 # Override implicit attempt to link directory.
 $(ALL_DIRS):
 	@touch $@
 
-$(WEBDIR)/ccan.tar.bz2:
-	tar cvfj $@ `bzr ls --versioned --kind=file ccan`
-
-$(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
-
-$(WEBDIR)/list.html: web/staticall.php tools/doc_extract $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2
-	php5 web/staticall.php ccan/ $(WEBDIR) > $@
-
-$(WEBDIR)/upload.html: web/staticupload.php
-	php5 web/staticupload.php > $@
-
-# cpp inserts gratuitous linebreaks at start of file, makes for php problems.
-$(WEBDIR)/uploader.php: web/uploader.php.cpp
-	cpp -w -C -P $< | grep . > $@
-
-$(WEBDIR)/index.html: web/staticindex.php
-	php5 web/staticindex.php > $@
-
-$(WEBDIR)/example-config.h: config.h
-	cp $< $@
-
-$(WEBDIR)/Makefile-ccan: Makefile-ccan
-	cp $< $@
-
-$(WEBDIR)/ccan.jpg: web/ccan.jpg
-	cp $< $@
-
-$(WEBDIR)/info/%.html: ccan/% ccan/%/test $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
-	URLPREFIX=../ php5 web/staticmoduleinfo.php ccan/$* > $@
-
-$(WEBDIR)/tarballs/%.tar.bz2: ccan/% ccan/%/test
-	tar -c -v -j -f $@ `bzr ls --versioned --kind=file ccan/$*`
-
-$(WEBDIR)/tarballs/with-deps/%.tar.bz2: ccan/% ccan/%/test tools/ccan_depends
-	tar cvfj $@ $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) | xargs -n 1 bzr ls --versioned --kind=file)
-
 $(ALL_DEPENDS): %/.depends: tools/ccan_depends
 	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-test-ccan/%: tools/run_tests ccan/%.o
+test-ccan/%: tools/run_tests libccan.a(%.o)
 	@echo Testing $*...
 	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
 
-ccanlint: tools/ccanlint/ccanlint
+# Some don't have object files.
+test-ccan/%:: tools/run_tests
+	@echo Testing $*...
+	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
 
 clean: tools-clean
 	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
 	$(RM) inter-depends lib-depends test-depends
 
+# Only list a dependency if there are object files to build.
 inter-depends: $(ALL_DEPENDS)
-	for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),ccan/\1.o,p' < $$f`; done > $@
+	for f in $(ALL_DEPENDS); do echo test-ccan/$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f); do [ "$$(echo $$dir/[a-z]*.c)" = "$$dir/[a-z]*.c" ] || echo libccan.a\("$$(basename $$dir)".o\); done); done > $@
 
 test-depends: $(ALL_DEPENDS)
 	for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),test-ccan/\1,p' < $$f`; done > $@
@@ -92,3 +51,4 @@ test-depends: $(ALL_DEPENDS)
 include tools/Makefile
 -include inter-depends
 -include test-depends
+-include Makefile-web