Move the figs into a subdir, and add a new one to explain the amok bandwith measureme...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2049 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 2ca53d0..8419315 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -3,5 +3,5 @@ html sgml xml
 Doxyfile
 index-API.doc logcategories.doc index.php
 *.toc
-simgrid_modules.map simgrid_modules.png
-simgrid.tag 
\ No newline at end of file
+simgrid_modules.map simgrid_modules.png amok_bw_test.png
+simgrid.tag 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4acd823..7e1b73e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,28 +1,32 @@
 DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \
  $(shell find @srcdir@ -name "*.doc")
+FIGS=simgrid_modules.fig amok_bw_test.fig
+PNGS=$(patsubst %.fig,%.png,$(FIGS)) simgrid_logo.png
 
 EXTRA_DIST = html Doxyfile \
- modules.doc FAQ.doc contrib.doc index.doc publis.doc footer.html simgrid_logo.png simgrid_modules.png
+ modules.doc FAQ.doc contrib.doc index.doc publis.doc footer.html \
+ $(foreach file,$(FIGS),fig/$(file)) $(PNGS)
+
 
 CLEANFILES = .*.toc
 DISTCLEANFILES = index-API.doc simgrid.tag
 MAINTAINERCLEANFILES = html
 
 if MAINTAINER_MODE
-simgrid_modules.map: simgrid_modules.fig
+simgrid_modules.map: fig/simgrid_modules.fig
        fig2dev -Lmap simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \
        sed 's/imagemap/simgrid_modules/g' | sed 's/\.gif/.png/' | \
        sed 's/<IMG /<IMG style="border:0px "/g' | sed 's/\.gif/.png/' \
        > simgrid_modules.map
 
-simgrid_modules.png: simgrid_modules.fig
-       fig2dev -Lpng simgrid_modules.fig > simgrid_modules.png
+%.png: fig/%.fig
+       fig2dev -Lpng $^ > $@
 
-html: Doxyfile ./logcategories.doc simgrid_modules.map simgrid_modules.png $(DOCSOURCES)
+html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES)
        : # Setting up
        touch index-API.doc .FAQ.doc.toc .index.doc.toc .contrib.doc.toc
        test -e html || mkdir html
-       cp @srcdir@/simgrid_logo.png @srcdir@/simgrid_modules.png html/
+       cp $(foreach file,$(PNGS),@srcdir@/$(file)) html/
        cp @srcdir@/Paje_MSG_screenshot_thn.jpg @srcdir@/Paje_MSG_screenshot.jpg html/
        cp @srcdir@/simgrid.css html/
        : # First pass

diff --git a/doc/fig/amok_bw_test.fig b/doc/fig/amok_bw_test.fig
new file mode 100644 (file)
index 0000000..7055e79
--- /dev/null
+++ b/doc/fig/amok_bw_test.fig
@@ -0,0 +1,61 @@
+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+5 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 2677.500 2317.500 2700 2250 2610 2295 2700 2385
+5 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 3870.000 2722.500 2700 2250 2610 2655 2700 3195
+5 1 0 1 0 7 50 -1 -1 0.000 0 0 0 0 3637.500 3645.000 4320 3195 4455 3645 4320 4095
+5 1 0 1 0 7 50 -1 -1 0.000 0 0 0 0 2880.000 3172.500 4320 2250 4590 3150 4320 4095
+6 4725 2925 5625 3240
+4 0 0 50 -1 0 12 0.0000 4 135 870 4725 3240 bandwidth\001
+4 0 0 50 -1 0 12 0.0000 4 180 750 4725 3060 Reported\001
+-6
+2 3 0 1 0 4 400 -1 24 0.000 0 0 -1 0 0 5
+        2700 2250 4185 2700 4185 2835 2700 2385 2700 2250
+2 3 0 1 0 4 400 -1 24 0.000 0 0 -1 0 0 5
+        2700 2385 4185 2835 4185 2970 2700 2520 2700 2385
+2 3 0 1 0 4 400 -1 24 0.000 0 0 -1 0 0 5
+        2700 2520 4185 2970 4185 3105 2700 2655 2700 2520
+2 3 0 1 0 4 400 -1 24 0.000 0 0 -1 0 0 5
+        2700 2655 4185 3105 4185 3240 2700 2790 2700 2655
+2 3 0 1 0 4 400 -1 24 0.000 0 0 -1 0 0 5
+        2700 2790 4185 3240 4185 3375 2700 2925 2700 2790
+2 3 0 1 0 4 400 -1 24 0.000 0 0 -1 0 0 5
+        2700 2925 4185 3375 4185 3510 2700 3060 2700 2925
+2 3 0 1 0 4 400 -1 24 0.000 0 0 -1 0 0 5
+        2700 3060 4185 3510 4185 3645 2700 3195 2700 3060
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        2604 2317 2469 2317
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        2610 2700 2475 2700
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        2699 4098 4184 3648
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        2700 2070 2700 4230
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        4185 2070 4185 4230
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        2475 4095 2700 4095
+2 1 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2
+        2700 4095 4500 4095
+2 1 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2
+        2700 3195 4590 3195
+2 1 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2
+        2700 2250 4500 2250
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        4455 3690 4680 3690
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        4590 3195 4725 3195
+4 2 0 50 -1 0 12 0.0000 4 180 750 2430 2385 msg_size\001
+4 2 0 50 -1 0 12 0.0000 4 180 720 2430 2745 exp_size\001
+4 1 0 50 -1 0 12 0.0000 4 135 525 4185 1980 host B\001
+4 1 0 50 -1 0 12 0.0000 4 135 525 2700 1980 host A\001
+4 2 0 50 -1 0 12 0.0000 4 180 510 2430 4140 1 byte\001
+4 0 0 50 -1 0 12 0.0000 4 180 660 4725 3735 Latency\001
+4 0 0 50 -1 0 10 0.0000 4 105 405 4815 3915 size=1\001
+4 0 0 50 -1 0 10 0.0000 4 105 390 4905 3375 size>1\001

diff --git a/doc/simgrid_modules.fig b/doc/fig/simgrid_modules.fig
similarity index 100%
rename from doc/simgrid_modules.fig
rename to doc/fig/simgrid_modules.fig