Remove doc/html with command make clean.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d1e64f..246eb5a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ endif(WIN32)
 ### Build the doc
 if(enable_doc)
        ADD_CUSTOM_COMMAND(
-         OUTPUT ${PROJECT_DIRECTORY}/doc/html/index.html
+         OUTPUT ${PROJECT_DIRECTORY}/doc/html
          DEPENDS       ${PROJECT_DIRECTORY}/doc/FAQ.doc 
                                ${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake 
                                ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeLists.txt
@@ -103,7 +103,7 @@ if(enable_doc)
          COMMENT "Generating the simgrid documentation..."
        )
        ADD_CUSTOM_TARGET(simgrid_documentation ALL
-                         DEPENDS ${PROJECT_DIRECTORY}/doc/html/index.html)
+                         DEPENDS ${PROJECT_DIRECTORY}/doc/html)
 endif(enable_doc)
 
 ### Make Simgrid.jar and Java examples

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index b9cffe2..c2c3117 100644 (file)
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -53,8 +53,6 @@ ${PROJECT_DIRECTORY}/doc/fig/amok_bw_sat.fig
 ${PROJECT_DIRECTORY}/doc/fig/gras_comm.fig
 )
 
-string(REPLACE ".fig" ".png\n" LISTE_TROIS ${FIGS})
-
 set(PNGS 
 ${PROJECT_DIRECTORY}/doc/webcruft/simgrid_logo.png
 ${PROJECT_DIRECTORY}/doc/webcruft/simgrid_logo_small.png