build the documentation and include it in the distribution

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

diff --git a/Makefile.am b/Makefile.am
index d57547e..1adb72f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS= include src examples doc testsuite
+SUBDIRS= include src examples doc testsuite doc
 DISTCLEANFILES =  *~  
 
 ACLOCAL = aclocal -I acmacro -I /usr/share/aclocal/gnome2-macros
@@ -7,7 +7,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog\
        acmacro/aci.m4 \
-       tools/gras-check-arch   tools/compile-remote-worker.in
+       tools/gras-check-arch   tools/compile-remote-worker.in \
+       tools/MSG_visualization tools/platform_generation
 
 TAGS: 
        etags `find . -name "*.[ch]"`

diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb6b232..b530bdc 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,8 @@
 DOCSOURCES = $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.doc")
 
-documentation: $(DOCSOURCES) Doxyfile.API  Doxyfile.Examples  Doxyfile.main
-       @doxygen Doxyfile.main
+EXTRA_DIST = html
 
-html2: $(DOCSOURCES) Doxyfile.API  Doxyfile.Examples  Doxyfile.main
+html: $(DOCSOURCES) Doxyfile.API  Doxyfile.Examples  Doxyfile.main
        @touch @top_srcdir@/src/api_index.doc
        @doxygen Doxyfile.main
        @doxygen Doxyfile.API