More work to make make distcheck happy

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

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1ba05e0..aa68e11 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,10 @@
 DOCSOURCES = $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.doc")
 
 EXTRA_DIST = html Doxyfile.API Doxyfile.Examples Doxyfile.main \
 DOCSOURCES = $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") $(shell find @top_srcdir@/src @top_srcdir@/include -name "*.doc")
 
 EXTRA_DIST = html Doxyfile.API Doxyfile.Examples Doxyfile.main \

- FAQ.doc index.doc footer.html
+ FAQ.doc index.doc footer.html simgrid_logo.png simgrid_modules.jpg

 
 DISTCLEANFILES = api_index.doc
 
 DISTCLEANFILES = api_index.doc

+MAINTAINERCLEANFILES = html

 
 html: $(DOCSOURCES) Doxyfile.API  Doxyfile.Examples  Doxyfile.main
        touch api_index.doc
 
 html: $(DOCSOURCES) Doxyfile.API  Doxyfile.Examples  Doxyfile.main
        touch api_index.doc


@@ -11,7 +12,7 @@ html: $(DOCSOURCES) Doxyfile.API  Doxyfile.Examples  Doxyfile.main
        doxygen Doxyfile.API
        doxygen Doxyfile.Examples
        @top_srcdir@/tools/doxygen/index_create.pl html/API/API.tag api_index.doc
        doxygen Doxyfile.API
        doxygen Doxyfile.Examples
        @top_srcdir@/tools/doxygen/index_create.pl html/API/API.tag api_index.doc

-       cp simgrid_logo.png simgrid_modules.jpg html/
+       cp @srcdir@/simgrid_logo.png @srcdir@/simgrid_modules.jpg html/

        doxygen Doxyfile.API
        doxygen Doxyfile.Examples
        doxygen Doxyfile.main
        doxygen Doxyfile.API
        doxygen Doxyfile.Examples
        doxygen Doxyfile.main


@@ -19,5 +20,4 @@ html: $(DOCSOURCES) Doxyfile.API  Doxyfile.Examples  Doxyfile.main
 #      @rm -rf html/API html/examples
 #      for i in `find doc/html -name "*.html" -exec grep -l "group_[^_]"  {} \;` ; do tools/fix_doxygen.pl $$i; rm $$i.bak; done
 
 #      @rm -rf html/API html/examples
 #      for i in `find doc/html -name "*.html" -exec grep -l "group_[^_]"  {} \;` ; do tools/fix_doxygen.pl $$i; rm $$i.bak; done
 

-clean: 
-       @rm -rf html/
+.PHONY: html