From: <ai...@us...> - 2008-07-26 17:12:47
|
Revision: 8594 http://plplot.svn.sourceforge.net/plplot/?rev=8594&view=rev Author: airwin Date: 2008-07-26 17:12:56 +0000 (Sat, 26 Jul 2008) Log Message: ----------- Serialize builds of the print, info, and html targets since their file dependency chains all create the inline.ent symlink in different ways. This change allows parallel builds of the prebuild_dist target (i.e., "make -j3 prebuild_dist") to work correctly. The validate target also sets the inline.ent symlink, but the validate target is always run completely independently of the others so don't include it in this logic. Modified Paths: -------------- trunk/doc/docbook/src/CMakeLists.txt Modified: trunk/doc/docbook/src/CMakeLists.txt =================================================================== --- trunk/doc/docbook/src/CMakeLists.txt 2008-07-25 11:47:48 UTC (rev 8593) +++ trunk/doc/docbook/src/CMakeLists.txt 2008-07-26 17:12:56 UTC (rev 8594) @@ -320,6 +320,8 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi ) + # Use this variable to serialize inline.ent use in parallel builds. + set(SERIALIZE_INLINE_DEPENDS) if(BUILD_PRINT) add_custom_target( print ALL @@ -339,7 +341,9 @@ add_dependencies(print docbook_plplot-symbols_txt docbook_plplot-structs_txt + ${SERIALIZE_INLINE_DEPENDS} ) + list(APPEND SERIALIZE_INLINE_DEPENDS print) endif(BUILD_PRINT) # Custom commands for building info version of documentation @@ -405,7 +409,9 @@ add_dependencies(info docbook_plplot-symbols_txt docbook_plplot-structs_txt + ${SERIALIZE_INLINE_DEPENDS} ) + list(APPEND SERIALIZE_INLINE_DEPENDS info) endif(BUILD_INFO) # Custom commands for building man version of documentation @@ -458,7 +464,9 @@ add_dependencies(html docbook_plplot-symbols_txt docbook_plplot-structs_txt + ${SERIALIZE_INLINE_DEPENDS} ) + list(APPEND SERIALIZE_INLINE_DEPENDS html) endif(BUILD_HTML) endif(BUILD_DOC) endif( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |