Mercurial > forge

changeset 1288:99603aab8239 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revise build system to include www-dist target; add matpow.eps for pdf; include links to source and html tarballs on octave-forge home
author pkienzle
date Thu, 12 Feb 2004 20:32:39 +0000
parents 081bf93ae918
children 76994c41f8d9
files doc/coda/Makefile doc/coda/oct/matpow.png doc/coda/out/matpow.eps doc/coda/out/matpow.png doc/octave-forge-home.html
diffstat 5 files changed, 22 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/doc/coda/Makefile	Thu Feb 12 07:58:33 2004 +0000
+++ b/doc/coda/Makefile	Thu Feb 12 20:32:39 2004 +0000
@@ -1,6 +1,6 @@
 # Makefile for coda
 
-outputdir:=./out
+outputdir:=out
 dbflags:=-o $(outputdir) 
 #-V %root-filename%=coda
 autoidx:=$(outputdir)/HTML.index # Defined in "dbparam.dsl"
@@ -15,11 +15,11 @@
 src=$(src_appendices:%=appendices/%.sgml) $(src_oct:%=oct/%.sgml) \
 	$(src_standalone:%=standalone/%.sgml) $(src_base:%=%.sgml)
 
-htmlimages=oct/matpow.png
-pdfimages=oct/matpow.eps
+htmlimages=$(outputdir)/matpow.png
+pdfimages=$(outputdir)/matpow.eps
 
 .phony: all
-all: html pdf targz
+all: pdf html
 
 .phony: check
 check: $(src)
@@ -29,18 +29,23 @@
 .phony: clean
 clean:
 	$(RM) index.sgml
-	cd $(outputdir) && $(RM) *.html *.ps HTML.index matpow.png
+	cd $(outputdir) && $(RM) *.html *.ps HTML.index
 	cd $(outputdir) && $(RM) coda.{out,tex,dvi,log,aux,ps.gz,pdf}
 	cd $(outputdir) && $(RM) *.tar.gz
-	rmdir $(outputdir) coda coda.junk
+	rmdir coda coda.junk
 
 .phony: distclean
 distclean: clean
-	rm -f *~ *.bak core
+	$(RM) *~ *.bak core
 
-.phony: www-install
-www-install: all
-	cd $(outputdir) && install -m 644 -p *.html coda.ps.gz coda.pdf coda-sgml.tar.gz /site/wwwroot/octave/coda
+.phony: www-dist
+www-dist: html pdf dist
+	$(RM) $(outputdir)/coda/*
+	install -d $(outputdir)/coda
+	cd $(outputdir) && install -m 644 -p *.html *.png coda.pdf coda-sgml.tar.gz coda/
+	cd $(outputdir) && tar czf coda-www.tar.gz coda
+	rm -rf $(outputdir)/coda
+	
 
 .phony: html
 html: $(outputdir)/index.html $(outputdir)/matpow.png
@@ -51,10 +56,10 @@
 .phony: pdf
 pdf: $(outputdir)/coda.pdf
 
-.phony: targz
-targz: $(outputdir)/coda-sgml.tar.gz
+.phony: dist
+dist: $(outputdir)/coda-sgml.tar.gz
 
-$(outputdir)/coda-sgml.tar.gz: $(src) $(htmlimages) Makefile
+$(outputdir)/coda-sgml.tar.gz: $(src) $(htmlimages) $(pdfimages) Makefile
 	tar czf $@ $^
 
 index.sgml: $(src)
@@ -70,10 +75,10 @@
             mv $$f $$f.bak; \
             sed -e 's!FIXME:!<b class="fixme">FIXME:</b>!i' \
                 -e 's/&#13; *//g' < $${f}.bak > $$f; \
-            rm $$f.bak; \
+            $(RM) $$f.bak; \
         done
 
-$(outputdir)/coda.ps: $(src) index.sgml
+$(outputdir)/coda.ps: $(src) index.sgml $(pdfimages)
 	docbook2tex coda.sgml
 	cd $(outputdir) && \
 	    $(RM) coda.tex ; mv ../coda.tex . ; \
@@ -82,13 +87,10 @@
 
 $(outputdir)/coda.ps.gz: $(outputdir)/coda.ps
 
-$(outputdir)/coda.pdf: $(src) index.sgml
+$(outputdir)/coda.pdf: $(src) index.sgml $(pdfimages)
 	-docbook2pdf -o $(outputdir) coda.sgml >/dev/null 2>&1
 	docbook2pdf -o $(outputdir) coda.sgml
 
-$(outputdir)/matpow.png: oct/matpow.png
-	cp $< $@
-
 #	cd $(outputdir) && \
 #	    gs -q -r600 -dNOPAUSE -dBATCH -sDEVICE=pdfwrite \
 #                -sOutputFile=coda.pdf coda.ps
Binary file doc/coda/oct/matpow.png has changed
Binary file doc/coda/out/matpow.eps has changed
Binary file doc/coda/out/matpow.png has changed
--- a/doc/octave-forge-home.html	Thu Feb 12 07:58:33 2004 +0000
+++ b/doc/octave-forge-home.html	Thu Feb 12 20:32:39 2004 +0000
@@ -120,7 +120,7 @@
 </li>
 <li>
 <a href="coda/index.html">Da Coda Al Fine: Pushing Octave's Limits</a> 
-[<a href="coda.pdf">pdf</a>] (using C++ with Octave).
+[<a href="coda/coda.pdf">pdf</a>, <a href="coda/coda-sgml.tar.gz">source</a>, <a href="coda-www.tar.gz">all</a>] (using C++ with Octave).
 </li>
 <li>
 <a href="new_developer.html">Octave-forge developer's guide</a>