--- manual/Makefile	2002/02/28 19:33:58	1.10
+++ manual/Makefile	2002/11/20 14:08:51	1.17
@@ -1,28 +1,64 @@
+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>" \
+      -local_icons -noantialias -notransparent -white
+
 default:
 	@echo "Targets"
-	@echo " make all  - just the tex "
+	@echo " make all  - everything in order"
 	@echo " make tex  - tex and bibliograohy"
 	@echo " make ps   - postscript form of manual"
 	@echo " make pdf  - pdf form of manual"
-	@echo " make html - hypertext form of manual"
+	@echo " make l2h  - latex2html of manual"
+	@echo " make html - hypertext form of manual with substitutions"
+
 all:
 	make tex
+	make ps
+	make pdf
+	make ps.gz
+	make html
+
+tex: manual.dvi
+
+ps: manual.ps
+
+ps.gz: manual.ps
+	gzip -9 -c manual.ps > manual.ps.gz
+
+pdf: manual.pdf
+
+html:
+	make l2h
+	make subfigs
 
-tex:
+l2h: l2h.tgz
+
+subfigs: manual.tgz
+
+manual.dvi: *.tex */*.tex */*/*/*.tex */*.ps */*.eps */*/*/*.eps
 	TEXINPUTS=.:::texinputs latex manual
 	bibtex manual
 	TEXINPUTS=.:::texinputs latex manual
 	TEXINPUTS=.:::texinputs latex manual | tee warnings
-#	TEXINPUTS=.:::texinputs latex manual
-ps: manual.ps
-pdf: manual.pdf
 
 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} warnings l2h.log
+Clean:
+	make clean
+	rm -f manual.{ps,pdf,ps.gz}
+	rm -rf manual
+	rm -f manual.{tz,tgz} mbkup.{tz,tgz} l2h.{tz,tgz}
+
 # Note - the noantialias option here does not affect the gif images
 #        that are generated. However, it does make ppmquant to run in
 #        a way that leaves out the -floyd option. This option
@@ -40,23 +76,15 @@
 #           /usr/bin/ppmquant.orig 256
 #           !
 
+debugl2h:
+	/usr/bin/latex2html -debug -nodiscard -ldump $(L2H) manual
 
-html:
-	latex2html -image_type gif -split 5 -show_section_numbers -link 2 -address "<a href=mailto:support@mitgcm.org>support@mitgcm.org</a>" -local_icons -noantialias -white manual
-	cd manual; tar -czf ../mbkup.tz .
-	cd manual; ../tools/make_mail_subjects.sh
-	cd manual; ../tools/figsub.sh
-	cd manual; ../tools/fix_docref_target.sh
-	cd manual; tar -czf ../manual.tz .
-#	cd /homes/cnh/SEALION_RELEASE/website/online_documents/manual; tar -xzf /homes/cnh/SEALION_RELEASE/manual/HEAD/manual.tz
-#	tar -czf ol.tz on-line-figs
+l2h.tgz: manual.dvi
+	/usr/bin/latex2html $(L2H) manual | tee l2h.log
+	tar -czf l2h.tgz manual
 
-html2:
-	cd manual; tar -xzf ../mbkup.tz .
+manual.tgz: l2h.tgz
 	cd manual; ../tools/make_mail_subjects.sh
 	cd manual; ../tools/figsub.sh
 	cd manual; ../tools/fix_docref_target.sh
-	cd manual; tar -czf ../manual.tz .
-	cd /homes/cnh/SEALION_RELEASE/website/online_documents/manual; tar -xzf /homes/cnh/SEALION_RELEASE/manual/HEAD/manual.tz
-#	tar -czf ol.tz on-line-figs
-
+	tar -czf manual.tgz manual