--- a/doc/models/Makefile	Tue Jun 28 11:06:44 2011 -0700
+++ b/doc/models/Makefile	Tue Jun 28 11:42:50 2011 -0700
@@ -50,7 +50,11 @@
 	$(SRC)/flow-monitor/doc/flow-monitor.rst \
 
 # list all model library figure files that need to be copied to 
-# $SOURCETEMP/figures.  Either a .dia or both a .pdf and .png
+# $SOURCETEMP/figures.  For each figure to be included in all
+# documentation formats (html, latex...) the following formats are supported: 
+#  1) a single .dia file (preferred option, because it can be edited)
+#  2) a single .eps file
+#  3) both a .pdf and .png file
 SOURCEFIGS = \
 	figures/testbed.dia \
 	figures/emulated-channel.dia \
@@ -73,7 +77,8 @@
 	$(SRC)/netanim/doc/animation-dumbbell.png \
 	$(SRC)/netanim/doc/animation-dumbbell.pdf \
 
-# specify figures for build process (all dia figures)
+# specify figures from which .png and .pdf figures need to be
+# generated (all dia and eps figures)
 IMAGES_EPS = \
 	$(FIGURES)/testbed.eps \
 	$(FIGURES)/emulated-channel.eps \
@@ -90,7 +95,7 @@
 	$(FIGURES)/WimaxArchitecture.eps \
         $(FIGURES)/auvmobility-classes.eps \
 
-# rescale figures as necessary
+# rescale pdf figures as necessary
 $(FIGURES)/testbed.pdf_width = 5in
 $(FIGURES)/emulated-channel.pdf_width = 6in
 $(FIGURES)/node.pdf_width = 5in
@@ -112,6 +117,7 @@
 
 %.eps : %.dia; $(DIA) -t eps $< -e $@
 %.png : %.dia; $(DIA) -t png $< -e $@
+%.png : %.eps; $(CONVERT) $< $@
 %.pdf : %.eps; $(EPSTOPDF) $< -o=$@; if test x$($@_width) != x; then TMPFILE=`mktemp`; ./rescale-pdf.sh $($@_width) $@ $${TMPFILE} && mv $${TMPFILE} $@; fi
 
 # You can set these variables from the command line.