--- manual/Makefile	2002/04/24 20:48:16	1.15
+++ manual/Makefile	2011/04/21 20:14:39	1.31
@@ -1,5 +1,16 @@
+#
+#  $Header: /home/ubuntu/mnt/e9_copy/manual/Makefile,v 1.31 2011/04/21 20:14:39 jmc Exp $
+#  $Name:  $
+#
+
+#
+#L2H = -image_type gif -split 5 -show_section_numbers -link 2 \
+#      -address "<a href=mailto:support@mitgcm.org>support@mitgcm.org</a>" \
+#      -local_icons -noantialias -notransparent -white
+
+
 L2H = -image_type png -split 5 -show_section_numbers -link 2 \
-      -address "<a href=mailto:support@mitgcm.org>support@mitgcm.org</a>" \
+      -address "<a href=mailto:support@mitgcm.org>mitgcm-support@mitgcm.org</a>" \
       -local_icons -noantialias -notransparent -white
 
 default:
@@ -18,11 +29,7 @@
 	make ps.gz
 	make html
 
-tex:
-	TEXINPUTS=.:::texinputs latex manual
-	bibtex manual
-	TEXINPUTS=.:::texinputs latex manual
-	TEXINPUTS=.:::texinputs latex manual | tee warnings
+tex: manual.dvi
 
 ps: manual.ps
 
@@ -31,17 +38,47 @@
 
 pdf: manual.pdf
 
+#eh3 WARNING: due to the make dependencies, using the following rule will 
+#eh3   *always* result in running the "manual.dvi" and "l2h.tgz" rules
+#eh3   *TWICE* due to the "*/*.ps" entry in the dependency list!
+#eh3 html:
+#eh3 	make l2h
+#eh3 	make subfigs
+html:
+	make l2h
+	cd manual; ../tools/make_mail_subjects.sh
+	cd manual; ../tools/figsub.sh
+	cd manual; ../tools/fix_docref_target.sh
+	cd manual; ../tools/genredir.sh
+	tar -czf manual.tgz manual
+
+l2h: l2h.tgz
+
+subfigs: manual.tgz
+
+manual.dvi: *.tex */*/*.tex */*/*.templ */*/*.ps */*/*.eps manual_references.bib
+	( cd s_examples/global_oce_latlon/  &&  make )
+	( cd s_examples/held_suarez_cs/  &&  make )
+	TEXINPUTS=.:::texinputs latex manual
+	bibtex manual
+	TEXINPUTS=.:::texinputs latex manual
+	TEXINPUTS=.:::texinputs latex manual
+	tools/latex_warning.sh manual.log warnings
+
 manual.ps: manual.dvi
-	dvips -Pcmz -Pamz -Ppdf -o manual.ps manual.dvi
+	dvips -Pcmz -Pamz -o manual.ps manual.dvi
 
 manual.pdf: manual.ps
 	ps2pdf -dMaxSubsetPct=100 -dCompatibilityLevel=1.2 -dSubsetFonts=true -dEmbedAllFonts=true manual.ps manual.pdf
 
 clean: 
-	rm -f manual.{aux,bbl,blg,dvi,log,out,toc} 
+	rm -f manual.{aux,bbl,blg,dvi,log,out,toc} warnings l2h.log
+
 Clean:
 	make clean
-	rm -f manual.{ps,pdf}
+	( cd s_examples/global_oce_latlon/  &&  make Clean )
+	( cd s_examples/held_suarez_cs/  &&  make Clean )
+	rm -f manual.{ps,pdf,ps.gz}
 	rm -rf manual
 	rm -f manual.{tz,tgz} mbkup.{tz,tgz} l2h.{tz,tgz}
 
@@ -62,18 +99,14 @@
 #           /usr/bin/ppmquant.orig 256
 #           !
 
-html:
-	make l2h
-	make subfigs
+debugl2h:
+	/usr/bin/latex2html -debug -nodiscard -ldump $(L2H) manual
 
-l2h:
-	latex2html $(L2H) manual
+l2h.tgz: manual.dvi
+	/usr/bin/latex2html $(L2H) manual | tee l2h.log
 	tar -czf l2h.tgz manual
 
-debugl2h:
-	latex2html -debug -nodiscard -ldump $(L2H) manual
-
-subfigs:
+manual.tgz: l2h.tgz
 	cd manual; ../tools/make_mail_subjects.sh
 	cd manual; ../tools/figsub.sh
 	cd manual; ../tools/fix_docref_target.sh