Pr/oshmem man v1.10

.gitignore

@@ -547,6 +547,17 @@ oshmem/shmem/fortran/profile/pmy_pe_f.c
 oshmem/shmem/fortran/profile/pshpalloc_f.c
 oshmem/shmem/fortran/profile/pnum_pes_f.c
 oshmem/shmem/fortran/profile/pstart_pes_f.c
+oshmem/shmem/man/man3/shmem_*.3
+oshmem/shmem/man/man3/OpenSHMEM.3
+oshmem/shmem/man/man3/intro_shmem.3
+oshmem/shmem/man/man3/_my_pe.3
+oshmem/shmem/man/man3/_num_pes.3
+oshmem/shmem/man/man3/shfree.3
+oshmem/shmem/man/man3/shmalloc.3
+oshmem/shmem/man/man3/shmemalign.3
+oshmem/shmem/man/man3/shrealloc.3
+oshmem/shmem/man/man3/start_pes.3
+oshmem/shmem/man/man3/.dir-stamp
 oshmem/tools/oshmem_info/oshmem_info
 oshmem/tools/oshmem_info/oshmem_info.1
 oshmem/tools/wrappers/shmemcc-wrapper-data.txt

oshmem/Makefile.am

@@ -1,94 +1,114 @@
-#
-# Copyright (c) 2013      Mellanox Technologies, Inc.
-#                         All rights reserved.
-# Copyright (c) 2013-2014 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2014      Intel, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-# Do we have profiling?
-if OSHMEM_PROFILING
-c_pshmem_lib = shmem/c/profile/liboshmem_c_pshmem.la
-else
-c_pshmem_lib =
-endif
-
-# Do we have the Fortran bindings?
-if OSHMEM_BUILD_FORTRAN_BINDINGS
-fortran_oshmem_lib = shmem/fortran/liboshmem_fortran.la
-
-if OSHMEM_PROFILING
-fortran_pshmem_lib = shmem/fortran/profile/liboshmem_fortran_pshmem.la
-endif
-
-else
-fortran_oshmem_lib =
-fortran_pshmem_lib =
-endif
-
-SUBDIRS = \
-	include \
-	shmem/c \
-	shmem/fortran
-
-if PROJECT_OSHMEM
-# Only traverse these dirs if we're building oshmem
-SUBDIRS += \
-	$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
-	$(MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
-	. \
-	$(MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS) 
-endif
-
-DIST_SUBDIRS = \
-	include \
-	shmem/c \
-	shmem/fortran \
-	$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
-	$(MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS) 
-
-# Build The main OSHMEM library, but only if we're building OSHMEM
-lib_LTLIBRARIES =
-if PROJECT_OSHMEM
-lib_LTLIBRARIES += liboshmem.la
-endif
-
-liboshmem_la_SOURCES =
-liboshmem_la_LIBADD = \
-	shmem/c/liboshmem_c.la \
-	$(c_pshmem_lib) \
-	$(fortran_oshmem_lib) \
-	$(fortran_pshmem_lib) \
-	$(MCA_oshmem_FRAMEWORK_LIBS) \
-	$(top_ompi_builddir)/ompi/libmpi.la
-liboshmem_la_DEPENDENCIES = $(liboshmem_la_LIBADD)
-liboshmem_la_LDFLAGS = \
-        -version-info $(liboshmem_so_version) \
-        $(OSHMEM_LIBSHMEM_EXTRA_LDFLAGS)
-
-# included subdirectory Makefile.am's and appended-to variables
-headers =
-noinst_LTLIBRARIES =
-include_HEADERS =
-dist_ompidata_DATA =
-liboshmem_la_SOURCES += $(headers)
-nodist_man_MANS =
-
-# Conditionally install the header files
-
-if WANT_INSTALL_HEADERS
-oshmemdir = $(ompiincludedir)/$(subdir)
-nobase_oshmem_HEADERS = $(headers)
-endif
-
-include op/Makefile.am
-include proc/Makefile.am
-include request/Makefile.am
-include runtime/Makefile.am
-include shmem/Makefile.am
-include tools/Makefile.am
-include util/Makefile.am
+#
+# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
+#                         All rights reserved.
+# Copyright (c) 2013-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Do we have profiling?
+if OSHMEM_PROFILING
+c_pshmem_lib = shmem/c/profile/liboshmem_c_pshmem.la
+else
+c_pshmem_lib =
+endif
+
+# Do we have the Fortran bindings?
+if OSHMEM_BUILD_FORTRAN_BINDINGS
+fortran_oshmem_lib = shmem/fortran/liboshmem_fortran.la
+
+if OSHMEM_PROFILING
+fortran_pshmem_lib = shmem/fortran/profile/liboshmem_fortran_pshmem.la
+endif
+
+else
+fortran_oshmem_lib =
+fortran_pshmem_lib =
+endif
+
+SUBDIRS = \
+	include \
+	shmem/c \
+	shmem/fortran
+
+if PROJECT_OSHMEM
+# Only traverse these dirs if we're building oshmem
+SUBDIRS += \
+	$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
+	$(MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
+	. \
+	$(MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS) 
+endif
+
+DIST_SUBDIRS = \
+	include \
+	shmem/c \
+	shmem/fortran \
+	$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
+	$(MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS) 
+
+# Build The main OSHMEM library, but only if we're building OSHMEM
+lib_LTLIBRARIES =
+if PROJECT_OSHMEM
+lib_LTLIBRARIES += liboshmem.la
+endif
+
+liboshmem_la_SOURCES =
+liboshmem_la_LIBADD = \
+	shmem/c/liboshmem_c.la \
+	$(c_pshmem_lib) \
+	$(fortran_oshmem_lib) \
+	$(fortran_pshmem_lib) \
+	$(MCA_oshmem_FRAMEWORK_LIBS) \
+	$(top_ompi_builddir)/ompi/libmpi.la
+liboshmem_la_DEPENDENCIES = $(liboshmem_la_LIBADD)
+liboshmem_la_LDFLAGS = \
+        -version-info $(liboshmem_so_version) \
+        $(OSHMEM_LIBSHMEM_EXTRA_LDFLAGS)
+
+# included subdirectory Makefile.am's and appended-to variables
+headers =
+noinst_LTLIBRARIES =
+include_HEADERS =
+dist_ompidata_DATA =
+liboshmem_la_SOURCES += $(headers)
+nodist_man_MANS =
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+oshmemdir = $(ompiincludedir)/$(subdir)
+nobase_oshmem_HEADERS = $(headers)
+endif
+
+include op/Makefile.am
+include proc/Makefile.am
+include request/Makefile.am
+include runtime/Makefile.am
+include shmem/Makefile.am
+include shmem/man/man3/Makefile.extra
+include tools/Makefile.am
+include util/Makefile.am
+
+# Ensure that the man page directory exists before we try to make man
+# page files (because ompi/mpi/man/man3 has no config.status-generated
+# Makefile)
+dir_stamp = $(top_builddir)/$(subdir)/shmem/man/man3/.dir-stamp
+
+# Also ensure that the man pages are rebuilt if the opal_config.h file
+# changes (e.g., configure was run again, meaning that the release
+# date or version may have changed)
+$(nodist_man_MANS): $(dir_stamp) $(top_builddir)/opal/include/opal_config.h
+
+$(dir_stamp):
+	$(MKDIR_P) `dirname $@`
+	touch "$@"
+
+# Remove the generated man pages
+distclean-local:
+	rm -f $(nodist_man_MANS) $(dir_stamp)
+

oshmem/include/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2013      Mellanox Technologies, Inc.
+# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
 #                         All rights reserved.
 # $COPYRIGHT$
 #
@@ -11,21 +11,20 @@
 headers = oshmem_config.h
 nodist_headers =
 
+if PROJECT_OSHMEM
 # Install these in $(includedir)
 include_HEADERS =
 
-# Install these in $(includedir)
-mppincludedir = $(includedir)/mpp
-mppinclude_HEADERS = mpp/shmem.h \
-                     mpp/shmem.fh
-
 # Always install these in $(pkgincludedir)
 pkginclude_HEADERS =
 
 include_HEADERS += shmem.fh \
         shmemx.h \
         shmem-compat.h
 
+nobase_include_HEADERS = mpp/shmem.h \
+                         mpp/shmem.fh
+
 # These files are always installed in $(includedir), but shouldn't be
 # shipped since they are generated by configure from their .in
 # counterparts (which AM automatically ships).
@@ -36,8 +35,10 @@ include_HEADERS += pshmem.h \
         pshmemx.h
 endif
 
-nobase_dist_noinst_HEADERS = $(headers)
-nobase_nodist_noinst_HEADERS = $(nodist_headers)
+oshmemdir=${includedir}/openshmem
+nobase_dist_oshmem_HEADERS = $(headers)
+nobase_nodist_oshmem_HEADERS = $(nodist_headers)
+endif
 
 distclean-local:
 

oshmem/runtime/Makefile.am

@@ -9,8 +9,9 @@
 
 # This makefile.am does not stand on its own - it is included from oshmem/Makefile.am
 
+if PROJECT_OSHMEM
 dist_ompidata_DATA += runtime/help-shmem-runtime.txt
-
+endif
 
 headers += \
 	runtime/runtime.h \

oshmem/shmem/Makefile.am

@@ -1,12 +1,17 @@
-# Copyright (c) 2013      Mellanox Technologies, Inc.
+# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
 #                         All rights reserved.
 # $COPYRIGHT$
-# 
+#
 # Additional copyrights may follow
-# 
+#
 # $HEADER$
 #
 
+EXTRA_DIST =
+
 headers += shmem/shmem_api_logger.h \
            shmem/shmem_lock.h
-dist_ompidata_DATA += shmem/c/help-shmem-api.txt
+
+if PROJECT_OSHMEM
+dist_ompidata_DATA += shmem/help-shmem-api.txt
+endif