[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-15-ge645371

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  e645371f794f4325db21e93f5e5517e02f4146c1 (commit)
      from  63298b2f71fd9a0f70c4e85b976380962448f476 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/e645371f794f4325db21e93f5e5517e02f4146c1

commit e645371f794f4325db21e93f5e5517e02f4146c1
Author: William Gropp <wgropp at illinois.edu>
Date:   Mon Nov 24 10:44:25 2014 -0600

    Make ROMIO htmldocs update link file
    
    Update the use of DOCTEXT to match the rest of MPICH, including adding
    -nolocation (drop the location of the source file from the documentation)
    and ensure that the mpi.cit file contains the I/O routines as well as
    the others (this file can be used to add links to the man pages in
    other documents).
    
    Signed-off-by: Rob Latham <robl at mcs.anl.gov>

diff --git a/src/mpi/romio/Makefile.am b/src/mpi/romio/Makefile.am
index 7468dd3..b9d4e25 100644
--- a/src/mpi/romio/Makefile.am
+++ b/src/mpi/romio/Makefile.am
@@ -132,20 +132,27 @@ mandoc_path3=$(abs_top_builddir)/man/man3
 htmldoc_path1=$(abs_top_builddir)/www/www1
 htmldoc_path3=$(abs_top_builddir)/www/www3
 doctext_docnotes=
+# Provide an easily replaced url root for the generated index file.
+# You can override this with URL desired in the index file generated by doctext.
+# You can ignore this if you don't use mapnames or tohtml to add links
+# to the MPI manual pages to documents.
+htmldoc_root3="--your-url-here--"
 
 .c.man-phony:
 	$(doctextman_verbose)$(DOCTEXT) -man -mpath $(mandoc_path3) -ext 3 \
-	    -heading MPI -quotefmt $(doctext_docnotes) $<
+	    -heading MPI -quotefmt -nolocation $(doctext_docnotes) $<
 .c.html-phony:
 	$(doctexthtml_verbose)$(DOCTEXT) -html -mpath $(htmldoc_path3) \
-	    -heading MPI -quotefmt $(doctext_docnotes) $<
+	    -heading MPI -quotefmt -nolocation \
+	    -index $(htmldoc_path3)/mpi.cit -indexdir $(htmldoc_root3) \
+		$(doctext_docnotes) $<
 
 .txt.man1-phony:
 	$(doctextman_verbose)$(DOCTEXT) -man -mpath $(mandoc_path1) -ext 1 \
-	    -heading MPI -quotefmt $(doctext_docnotes) $<
+	    -heading MPI -quotefmt -nolocation $(doctext_docnotes) $<
 .txt.html1-phony:
 	$(doctexthtml_verbose)$(DOCTEXT) -html -mpath $(htmldoc_path1) \
-	    -heading MPI -quotefmt $(doctext_docnotes) $<
+	    -heading MPI -quotefmt -nolocation $(doctext_docnotes) $<
 
 # use mandoc-local target to force directory creation before running DOCTEXT
 mandoc:

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/romio/Makefile.am |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
MPICH primary repository