X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c0ae9ef71784f2d41e8ffe8a4400177227b85fb..e768b6f59f6c03b342ac1c2e9ef643b355af5c6f:/doc/Makefile.am diff --git a/doc/Makefile.am b/doc/Makefile.am index da55c7d8ec..6852abd506 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ 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 amok_bw_sat.fig -PNGS=$(patsubst %.fig,%.png,$(FIGS)) simgrid_logo.png simgrid_logo_small.png +FIGS=simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig +PNGS=$(patsubst %.fig,%.png,$(FIGS)) simgrid_logo.png simgrid_logo_small.png poster_thumbnail.png EXTRA_DIST = html Doxyfile \ modules.doc FAQ.doc contrib.doc index.doc publis.doc footer.html \ @@ -22,7 +22,8 @@ simgrid_modules.map: fig/simgrid_modules.fig %.png: fig/%.fig fig2dev -Lpng $^ > $@ -html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) +html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) \ + html/gras.html html/amok.html html/msg.html html/simdag.html : # Setting up touch index-API.doc .FAQ.doc.toc .index.doc.toc .contrib.doc.toc test -e html || mkdir html @@ -42,6 +43,19 @@ html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) @top_srcdir@/tools/doxygen/index_php.pl @srcdir@/index.php.in html/index.html index.php @top_srcdir@/tools/doxygen/doxygen_postprocesser.pl +html/gras.html: + echo "" >$@ + echo "


Grid Reality And Simulation.

" >>$@ +html/amok.html: + echo "" >$@ + echo "


Advanced Metacomputing Overlay Kit.

" >>$@ +html/msg.html: + echo "" >$@ + echo "


Meta SimGrid.

" >>$@ +html/simdag.html: + echo "" >$@ + echo "


DAG Simulator.

" >>$@ + publish: $(MAKE) -C .. sync-gforge endif @@ -76,8 +90,9 @@ check-gtut-tocs: @for n in gtut-tour-*.doc ; do \ sed -n '/Table of Contents/,/hr/p' $$n|grep ref > tmp.curtoc; \ \ - grep '\\section' $$n | grep -v _toc| \ - sed -e 's/\\section //' -e 's/ .*//' |sed 's/^/ - \\ref /' > tmp.realtoc; \ + grep -E '\\s?u?b?section' $$n | grep -v _toc| \ + sed -e 's/\\section //' -e 's/\\subsection /subsection/' -e 's/ .*//' |\ + sed -e 's/^/ - \\ref /' -e 's/- \\ref subsection/ - \\ref /' > tmp.realtoc; \ \ if ! diff -q tmp.curtoc tmp.realtoc >/dev/null; then \ echo Wrong toc for $$n. Should be ; \ @@ -92,11 +107,12 @@ check-gtut-tocs: grep -v toc|grep -v '
'|grep [^[:blank:]] >>tmp.realtoc;\ done @grep ' *- \\ref' gtut-tour.doc > tmp.curtoc - @if ! diff -b -q tmp.curtoc tmp.realtoc >/dev/null; then \ - echo Wrong toc for gtut-tour.doc. Should be ; \ - cat tmp.realtoc; \ + @if ! diff -b -u tmp.curtoc tmp.realtoc ; then \ + echo "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc"; \ + else \ + rm tmp.realtoc; \ fi ; - @rm tmp.realtoc tmp.curtoc + @rm tmp.curtoc .PHONY: html