[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 0ea9ed13ebd73735615176b9d2f2664abf12ff08
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Oct 14 08:03:59 2005 +1000

    Added missing dependencies for building docs
    
    darcs-hash:20051013220359-fbd8f-8fe7a9a4e7c69b9f10a8d7a28fe01d7f3934080b.gz

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c9e75c2..df34078 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,11 +22,11 @@ templates: scan
 	gtkdoc-mktmpl --module=$(DOC_MODULE)
 	sort -f $(DOC_MODULE)-unused.txt > /tmp/toto; mv -f /tmp/toto $(DOC_MODULE)-unused.txt
 
-sgml:
+sgml: templates
 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
 	sort -f $(DOC_MODULE)-undocumented.txt > /tmp/toto; mv -f /tmp/toto $(DOC_MODULE)-undocumented.txt
 
-html:
+html: sgml
 	if ! test -d html ; then mkdir html ; fi
 	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index 09968e2..2830509 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -3,6 +3,9 @@
 EXTRA_DIST=tutorial.ps.gz tutorial.pdf tutorial.tar.gz half-cylinder.gts \
 	gfs2D.net
 
+Makefile.deps: Makefile.am tutorial.tex
+	awk -f depend.awk file="tutorial" < tutorial.tex > Makefile.deps
+
 clean-generic:
 	$(RM) *.dvi *.aux *.log *.toc *.out \
 	boundaries.pdf direction.eps direction.pdf dxscreen.eps dxscreen.pdf \
@@ -20,7 +23,7 @@ tutorial.tar.gz: tutorial.ps.gz
 	tar cf tutorial.tar tutorial
 	gzip -f --best tutorial.tar
 
-tutorial1.dvi: tutorial.tex
+tutorial1.dvi: tutorial.tex Makefile.deps
 	sed "s/GFS_VERSION/`$(top_srcdir)/src/gerris2D -V 2>&1 | awk '{ if ($$5 == "version") print $$6}'`/g" < tutorial.tex > tutorial1.tex
 	latex -interaction=nonstopmode tutorial1.tex > /dev/null 2>&1
 	latex -interaction=nonstopmode tutorial1.tex > /dev/null 2>&1
@@ -72,7 +75,4 @@ tutorial.pdf: tutorial1.dvi
 %.pdf: %.eps
 	epstopdf $<
 
-depend:
-	awk -f depend.awk file="tutorial" < tutorial.tex > Makefile.deps
-
 -include Makefile.deps

-- 
Gerris Flow Solver