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

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7f7298def7..e6ffaa1133 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,7 +11,7 @@ FIGS=simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig g
 PNGS=$(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png
 
 EXTRA_DIST = html Doxyfile \
- modules.doc FAQ.doc contrib.doc index.doc publis.doc publis2.doc footer.html history.doc  \
+ modules.doc FAQ.doc contrib.doc index.doc publis.doc footer.html history.doc  \
  $(foreach file,$(FIGS),fig/$(file)) $(PNGS) all.bib
 
 
@@ -22,13 +22,13 @@ MAINTAINERCLEANFILES = html
 if MAINTAINER_MODE 
 if HAVE_DOXYGEN
 simgrid_modules.map: fig/simgrid_modules.fig
-	fig2dev -Lmap fig/simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \
+	$(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
 
 %.png: fig/%.fig
-	fig2dev -Lpng $^ > $@
+	$(FIG2DEV) -Lpng $^ > $@
 
 html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) \
       html/gras.html html/amok.html html/msg.html html/simdag.html  \
@@ -40,13 +40,13 @@ html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) \
 	cp @srcdir@/webcruft/Paje_MSG_screenshot_thn.jpg @srcdir@/webcruft/Paje_MSG_screenshot.jpg html/
 	cp @srcdir@/simgrid.css html/
 	: # First pass
-	doxygen Doxyfile >/dev/null
+	$(DOXYGEN) Doxyfile >/dev/null
 	@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 \
 	   @srcdir@/gtut-introduction.doc @srcdir@/history.doc
 	: # Second pass
-	doxygen Doxyfile >/dev/null
+	$(DOXYGEN) Doxyfile >/dev/null
 	: # Post-processing
 	rm -f html/dir* 
 	@top_srcdir@/tools/doxygen/index_php.pl @srcdir@/index.php.in html/index.html index.php