From: Rusty Russell Date: Mon, 8 Dec 2008 08:10:46 +0000 (+1030) Subject: Move web stuff to separate Makefile-web, so no bzr errors when user gets Makefile... X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=e5ee09b20d276ea2e86d0a5c7e9b1469f83f0ac1 Move web stuff to separate Makefile-web, so no bzr errors when user gets Makefile and runs "make tools". --- diff --git a/Makefile b/Makefile index 8a407728..888afcad 100644 --- a/Makefile +++ b/Makefile @@ -9,19 +9,9 @@ # 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/ - 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)/junkcode $(WEBDIR)/tarballs/with-deps $(WEBDIR)/info -JUNKDIRS=$(wildcard junkcode/*) -JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html) -JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2) include Makefile-ccan @@ -30,60 +20,11 @@ check: $(ALL_DIRS:%=test-%) 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 $(JUNKPAGES) $(JUNKBALLS) - -$(WEB_SUBDIRS): - mkdir -p $@ - -$(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode - tar cvfj $@ `bzr ls --versioned --kind=file $<` - -$(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2 - cd $(WEBDIR) && tar xfj junkcode/$*.tar.bz2 - php5 web/staticjunkcode.php junkcode/$* $* > $@ # Override implicit attempt to link directory. $(ALL_DIRS): @touch $@ -$(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 - -$(WEBDIR)/list.html: web/staticall.php tools/doc_extract $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(JUNKBALLS) - php5 web/staticall.php ccan/ junkcode/ $(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 ) @@ -110,3 +51,4 @@ test-depends: $(ALL_DEPENDS) include tools/Makefile -include inter-depends -include test-depends +-include Makefile-web diff --git a/Makefile-web b/Makefile-web new file mode 100644 index 00000000..7093a48d --- /dev/null +++ b/Makefile-web @@ -0,0 +1,61 @@ +# This can be overridden on cmdline to generate pages elsewhere. +WEBDIR=~/www/html/ccan/ + +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)/junkcode $(WEBDIR)/tarballs/with-deps $(WEBDIR)/info +JUNKDIRS=$(wildcard junkcode/*) +JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html) +JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2) + +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 $(JUNKPAGES) $(JUNKBALLS) + +$(WEB_SUBDIRS): + mkdir -p $@ + +$(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode + tar cvfj $@ `bzr ls --versioned --kind=file $<` + +$(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2 + cd $(WEBDIR) && tar xfj junkcode/$*.tar.bz2 + php5 web/staticjunkcode.php junkcode/$* $* > $@ + +$(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 + +$(WEBDIR)/list.html: web/staticall.php tools/doc_extract $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(JUNKBALLS) + php5 web/staticall.php ccan/ junkcode/ $(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) + +distclean: distclean-web + rm -rf $(WEBDIR)