Change dependancies for libs.

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

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index 4c42042..0aa3217 100644 (file)
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -96,6 +96,15 @@ ADD_CUSTOM_COMMAND(
        COMMENT "Generating files in maintainer mode..."
 )
 
        COMMENT "Generating files in maintainer mode..."
 )
 

+       add_custom_target(maintainer_files
+                                               DEPENDS ${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h
+                                                               ${PROJECT_DIRECTORY}/include/xbt/graphxml.h
+                                                               ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h
+                                                               ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c
+                                                               ${PROJECT_DIRECTORY}/src/xbt/graphxml.c
+                                                               ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c
+                                               )
+

 else(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
        message("  FLEX :       ${FLEX_EXE}")
        message("FLEXML :       ${FLEXML_EXE}")
 else(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
        message("  FLEX :       ${FLEX_EXE}")
        message("FLEXML :       ${FLEXML_EXE}")

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 9b96684..515aa44 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -3,9 +3,9 @@
 if(enable_supernovae)
        include(${PROJECT_DIRECTORY}/buildtools/Cmake/Supernovae.cmake)
 else(enable_supernovae)        
 if(enable_supernovae)
        include(${PROJECT_DIRECTORY}/buildtools/Cmake/Supernovae.cmake)
 else(enable_supernovae)        

-       add_library(simgrid SHARED ${simgrid_sources} ${PROJECT_DIRECTORY}/include/xbt/graphxml.h)
-       add_library(simgrid_static STATIC ${simgrid_sources} ${PROJECT_DIRECTORY}/include/xbt/graphxml.h)
-       add_library(gras SHARED ${gras_sources} ${PROJECT_DIRECTORY}/include/xbt/graphxml.h)
+       add_library(simgrid SHARED ${simgrid_sources})
+       add_library(simgrid_static STATIC ${simgrid_sources})
+       add_library(gras SHARED ${gras_sources})

        if(enable_smpi)
                add_library(smpi SHARED ${SMPI_SRC})
        endif(enable_smpi)
        if(enable_smpi)
                add_library(smpi SHARED ${SMPI_SRC})
        endif(enable_smpi)


@@ -71,6 +71,10 @@ target_link_libraries(simgrid        ${SIMGRID_DEP})
 target_link_libraries(simgrid_static   ${SIMGRID_DEP})
 target_link_libraries(gras     ${GRAS_DEP})
 
 target_link_libraries(simgrid_static   ${SIMGRID_DEP})
 target_link_libraries(gras     ${GRAS_DEP})
 

+add_dependencies(gras maintainer_files)
+add_dependencies(simgrid maintainer_files)
+add_dependencies(simgrid_static maintainer_files)
+                               

 if(enable_smpi)
        target_link_libraries(smpi      simgrid ${SMPI_DEP})
 endif(enable_smpi)
 if(enable_smpi)
        target_link_libraries(smpi      simgrid ${SMPI_DEP})
 endif(enable_smpi)