X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cbbbd885c925238d5511d29466a55f588422c885..6604439f3437486f84c0e239f28b162662631127:/doc/Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 76bf6fb13e..2710660645 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,46 +1,50 @@
 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
 
 EXTRA_DIST = html Doxyfile \
- modules.doc FAQ.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
-	fig2dev -Lmap simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \
+simgrid_modules.map: fig/simgrid_modules.fig
+	fig2dev -Lmap fig/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: $(DOCSOURCES) Doxyfile logcategories.doc simgrid_modules.map simgrid_modules.png
+html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES)
 	: # Setting up
-	touch index-API.doc .FAQ.doc.toc
-	mkdir html
-	cp @srcdir@/simgrid_logo.png @srcdir@/simgrid_modules.png html/
+	touch index-API.doc .FAQ.doc.toc .index.doc.toc .contrib.doc.toc
+	test -e html || mkdir 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
 	doxygen Doxyfile >/dev/null
-	../tools/doxygen/index_create.pl simgrid.tag index-API.doc
-	../tools/doxygen/toc_create.pl FAQ.doc index.doc
+	@top_srcdir@/tools/doxygen/index_create.pl simgrid.tag index-API.doc
+	@top_srcdir@/tools/doxygen/toc_create.pl @srcdir@/FAQ.doc @srcdir@/index.doc @srcdir@/contrib.doc
 	: # Second pass
 	doxygen Doxyfile >/dev/null
 	: # Post-processing
-	rm html/dir*
-	../tools/doxygen/index_php.pl index.php.in html/index.html index.php
-	../tools/doxygen/doxygen_postprocesser.pl
+	rm -f html/dir* 
+	@top_srcdir@/tools/doxygen/index_php.pl @srcdir@/index.php.in html/index.html index.php
+	@top_srcdir@/tools/doxygen/doxygen_postprocesser.pl
 
 publish:
 	$(MAKE) -C .. sync-gforge
 endif
 
-logcategories.doc: $(DOCSOURCES)
+./logcategories.doc: $(DOCSOURCES)
 	pwd=`pwd`; rm $$pwd/logcategories.doc; set -e; \
 	echo "/* Generated file, do not edit */"          > $$pwd/logcategories.doc; \
 	echo "/** \addtogroup XBT_log_cats"              >> $$pwd/logcategories.doc; \