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

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1102275094..71ca56294f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,8 +6,8 @@
 
 
 DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \
- $(shell find @srcdir@ -name "*.doc")
-FIGS=simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig
+ $(shell find @srcdir@ -name "*.doc" |grep -v logcategories.doc)
+FIGS=simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig gras_comm.fig
 PNGS=$(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png
 
 EXTRA_DIST = html Doxyfile \
@@ -19,7 +19,8 @@ CLEANFILES = .*.toc
 DISTCLEANFILES = index-API.doc simgrid.tag
 MAINTAINERCLEANFILES = html
 
-if MAINTAINER_MODE
+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 | \
 	sed 's/imagemap/simgrid_modules/g' | sed 's/\.gif/.png/' | \
@@ -67,13 +68,14 @@ html/simdag.html:
 publish:
 	$(MAKE) -C .. sync-gforge
 endif
+endif
 
 ./logcategories.doc: $(DOCSOURCES)
-	pwd=`pwd`; rm $$pwd/logcategories.doc; set -e; \
+	pwd=`pwd`; rm -f $$pwd/logcategories.doc; set -e; \
 	echo "/* Generated file, do not edit */"          > $$pwd/logcategories.doc; \
 	echo "/** \addtogroup XBT_log_cats"              >> $$pwd/logcategories.doc; \
 	echo "    @{"                                    >> $$pwd/logcategories.doc; \
-	cd @top_srcdir@/src; ./xbt_log_extract_hierarchy >> $$pwd/logcategories.doc; \
+	cd @top_srcdir@/src; ../tools/doxygen/xbt_log_extract_hierarchy.pl >> $$pwd/logcategories.doc; \
 	echo "@}*/"                                      >> $$pwd/logcategories.doc;
 
 install-data-local: