diff --git a/ompi/mca/io/romio/romio/adio/ad_gridftp/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_gridftp/Makefile.am index 0f99109bbb..f2905f0894 100644 --- a/ompi/mca/io/romio/romio/adio/ad_gridftp/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_gridftp/Makefile.am @@ -18,37 +18,17 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_gridftp.la libadio_gridftp_la_SOURCES = \ - io_romio_ad_gridftp.c \ + ad_gridftp.c \ ad_gridftp.h \ - io_romio_ad_gridftp_close.c \ - io_romio_ad_gridftp_delete.c \ - io_romio_ad_gridftp_fcntl.c \ - io_romio_ad_gridftp_flush.c \ - io_romio_ad_gridftp_hints.c \ - io_romio_ad_gridftp_open.c \ - io_romio_ad_gridftp_read.c \ - io_romio_ad_gridftp_resize.c \ - io_romio_ad_gridftp_write.c \ - io_romio_globus_routines.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_gridftp -$(libadio_gridftp_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_gridftp_close.c \ + ad_gridftp_delete.c \ + ad_gridftp_fcntl.c \ + ad_gridftp_flush.c \ + ad_gridftp_hints.c \ + ad_gridftp_open.c \ + ad_gridftp_read.c \ + ad_gridftp_resize.c \ + ad_gridftp_write.c \ + globus_routines.c diff --git a/ompi/mca/io/romio/romio/adio/ad_hfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_hfs/Makefile.am index ffe9d45bb9..78e03f0264 100644 --- a/ompi/mca/io/romio/romio/adio/ad_hfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_hfs/Makefile.am @@ -20,32 +20,12 @@ include $(top_srcdir)/Makefile.options EXTRA_DIST = README -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_hfs.la libadio_hfs_la_SOURCES = \ ad_hfs.h \ - io_romio_ad_hfs.c \ - io_romio_ad_hfs_fcntl.c \ - io_romio_ad_hfs_open.c \ - io_romio_ad_hfs_read.c \ - io_romio_ad_hfs_resize.c \ - io_romio_ad_hfs_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_hfs -$(libadio_hfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_hfs.c \ + ad_hfs_fcntl.c \ + ad_hfs_open.c \ + ad_hfs_read.c \ + ad_hfs_resize.c \ + ad_hfs_write.c diff --git a/ompi/mca/io/romio/romio/adio/ad_nfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_nfs/Makefile.am index b7368218ac..21116d71dc 100644 --- a/ompi/mca/io/romio/romio/adio/ad_nfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_nfs/Makefile.am @@ -18,39 +18,19 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_nfs.la libadio_nfs_la_SOURCES = \ - io_romio_ad_nfs.c \ + ad_nfs.c \ ad_nfs.h \ - io_romio_ad_nfs_done.c \ - io_romio_ad_nfs_fcntl.c \ - io_romio_ad_nfs_getsh.c \ - io_romio_ad_nfs_hints.c \ - io_romio_ad_nfs_iread.c \ - io_romio_ad_nfs_iwrite.c \ - io_romio_ad_nfs_open.c \ - io_romio_ad_nfs_read.c \ - io_romio_ad_nfs_resize.c \ - io_romio_ad_nfs_setsh.c \ - io_romio_ad_nfs_wait.c \ - io_romio_ad_nfs_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_nfs -$(libadio_nfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_nfs_done.c \ + ad_nfs_fcntl.c \ + ad_nfs_getsh.c \ + ad_nfs_hints.c \ + ad_nfs_iread.c \ + ad_nfs_iwrite.c \ + ad_nfs_open.c \ + ad_nfs_read.c \ + ad_nfs_resize.c \ + ad_nfs_setsh.c \ + ad_nfs_wait.c \ + ad_nfs_write.c diff --git a/ompi/mca/io/romio/romio/adio/ad_ntfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_ntfs/Makefile.am index cccd704fa8..cbef3bc373 100644 --- a/ompi/mca/io/romio/romio/adio/ad_ntfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_ntfs/Makefile.am @@ -18,38 +18,18 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_ntfs.la libadio_ntfs_la_SOURCES = \ - io_romio_ad_ntfs.c \ + ad_ntfs.c \ ad_ntfs.h \ - io_romio_ad_ntfs_close.c \ - io_romio_ad_ntfs_done.c \ - io_romio_ad_ntfs_fcntl.c \ - io_romio_ad_ntfs_flush.c \ - io_romio_ad_ntfs_iread.c \ - io_romio_ad_ntfs_iwrite.c \ - io_romio_ad_ntfs_open.c \ - io_romio_ad_ntfs_read.c \ - io_romio_ad_ntfs_resize.c \ - io_romio_ad_ntfs_wait.c \ - io_romio_ad_ntfs_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_ntfs -$(libadio_ntfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_ntfs_close.c \ + ad_ntfs_done.c \ + ad_ntfs_fcntl.c \ + ad_ntfs_flush.c \ + ad_ntfs_iread.c \ + ad_ntfs_iwrite.c \ + ad_ntfs_open.c \ + ad_ntfs_read.c \ + ad_ntfs_resize.c \ + ad_ntfs_wait.c \ + ad_ntfs_write.c diff --git a/ompi/mca/io/romio/romio/adio/ad_panfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_panfs/Makefile.am index 0551269e7c..93fc151482 100644 --- a/ompi/mca/io/romio/romio/adio/ad_panfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_panfs/Makefile.am @@ -18,29 +18,9 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_panfs.la libadio_panfs_la_SOURCES = \ - io_romio_ad_panfs.c \ + ad_panfs.c \ ad_panfs.h \ - io_romio_ad_panfs_hints.c \ - io_romio_ad_panfs_open.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_panfs -$(libadio_panfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_panfs_hints.c \ + ad_panfs_open.c diff --git a/ompi/mca/io/romio/romio/adio/ad_pfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_pfs/Makefile.am index 7338566156..33d12db478 100644 --- a/ompi/mca/io/romio/romio/adio/ad_pfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_pfs/Makefile.am @@ -18,37 +18,17 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_pfs.la libadio_pfs_la_SOURCES = \ - io_romio_ad_pfs.c \ - io_romio_ad_pfs_done.c \ - io_romio_ad_pfs_fcntl.c \ - io_romio_ad_pfs_flush.c \ + ad_pfs.c \ + ad_pfs_done.c \ + ad_pfs_fcntl.c \ + ad_pfs_flush.c \ ad_pfs.h \ - io_romio_ad_pfs_hints.c \ - io_romio_ad_pfs_iread.c \ - io_romio_ad_pfs_iwrite.c \ - io_romio_ad_pfs_open.c \ - io_romio_ad_pfs_read.c \ - io_romio_ad_pfs_wait.c \ - io_romio_ad_pfs_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_pfs -$(libadio_pfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_pfs_hints.c \ + ad_pfs_iread.c \ + ad_pfs_iwrite.c \ + ad_pfs_open.c \ + ad_pfs_read.c \ + ad_pfs_wait.c \ + ad_pfs_write.c diff --git a/ompi/mca/io/romio/romio/adio/ad_piofs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_piofs/Makefile.am index 80a4fec5fb..894ffde106 100644 --- a/ompi/mca/io/romio/romio/adio/ad_piofs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_piofs/Makefile.am @@ -20,32 +20,12 @@ include $(top_srcdir)/Makefile.options EXTRA_DIST = README -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_piofs.la libadio_piofs_la_SOURCES = \ - io_romio_ad_piofs.c \ + ad_piofs.c \ ad_piofs.h \ - io_romio_ad_piofs_fcntl.c \ - io_romio_ad_piofs_hints.c \ - io_romio_ad_piofs_open.c \ - io_romio_ad_piofs_read.c \ - io_romio_ad_piofs_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_piofs -$(libadio_piofs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_piofs_fcntl.c \ + ad_piofs_hints.c \ + ad_piofs_open.c \ + ad_piofs_read.c \ + ad_piofs_write.c diff --git a/ompi/mca/io/romio/romio/adio/ad_pvfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_pvfs/Makefile.am index 11fe02a71d..38306e096d 100644 --- a/ompi/mca/io/romio/romio/adio/ad_pvfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_pvfs/Makefile.am @@ -18,36 +18,16 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_pvfs.la libadio_pvfs_la_SOURCES = \ - io_romio_ad_pvfs.c \ + ad_pvfs.c \ ad_pvfs.h \ - io_romio_ad_pvfs_close.c \ - io_romio_ad_pvfs_delete.c \ - io_romio_ad_pvfs_fcntl.c \ - io_romio_ad_pvfs_flush.c \ - io_romio_ad_pvfs_hints.c \ - io_romio_ad_pvfs_open.c \ - io_romio_ad_pvfs_read.c \ - io_romio_ad_pvfs_resize.c \ - io_romio_ad_pvfs_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_pvfs -$(libadio_pvfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_pvfs_close.c \ + ad_pvfs_delete.c \ + ad_pvfs_fcntl.c \ + ad_pvfs_flush.c \ + ad_pvfs_hints.c \ + ad_pvfs_open.c \ + ad_pvfs_read.c \ + ad_pvfs_resize.c \ + ad_pvfs_write.c diff --git a/ompi/mca/io/romio/romio/adio/ad_pvfs2/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_pvfs2/Makefile.am index e578525ba6..41e6fc0a52 100644 --- a/ompi/mca/io/romio/romio/adio/ad_pvfs2/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_pvfs2/Makefile.am @@ -18,38 +18,18 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_pvfs2.la libadio_pvfs2_la_SOURCES = \ - io_romio_ad_pvfs2.c \ + ad_pvfs2.c \ ad_pvfs2.h \ ad_pvfs2_common.h \ - io_romio_ad_pvfs2_close.c \ - io_romio_ad_pvfs2_common.c \ - io_romio_ad_pvfs2_delete.c \ - io_romio_ad_pvfs2_fcntl.c \ - io_romio_ad_pvfs2_flush.c \ - io_romio_ad_pvfs2_hints.c \ - io_romio_ad_pvfs2_open.c \ - io_romio_ad_pvfs2_read.c \ - io_romio_ad_pvfs2_resize.c \ - io_romio_ad_pvfs2_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_pvfs2 -$(libadio_pvfs2_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_pvfs2_close.c \ + ad_pvfs2_common.c \ + ad_pvfs2_delete.c \ + ad_pvfs2_fcntl.c \ + ad_pvfs2_flush.c \ + ad_pvfs2_hints.c \ + ad_pvfs2_open.c \ + ad_pvfs2_read.c \ + ad_pvfs2_resize.c \ + ad_pvfs2_write.c diff --git a/ompi/mca/io/romio/romio/adio/ad_sfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_sfs/Makefile.am index 1828197eb3..b18e56bd2c 100644 --- a/ompi/mca/io/romio/romio/adio/ad_sfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_sfs/Makefile.am @@ -20,30 +20,10 @@ include $(top_srcdir)/Makefile.options EXTRA_DIST = README -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_sfs.la libadio_sfs_la_SOURCES = \ - io_romio_ad_sfs.c \ + ad_sfs.c \ ad_sfs.h \ - io_romio_ad_sfs_fcntl.c \ - io_romio_ad_sfs_flush.c \ - io_romio_ad_sfs_open.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_sfs -$(libadio_sfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_sfs_fcntl.c \ + ad_sfs_flush.c \ + ad_sfs_open.c diff --git a/ompi/mca/io/romio/romio/adio/ad_testfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_testfs/Makefile.am index f9aa201340..a9d04f5fa9 100644 --- a/ompi/mca/io/romio/romio/adio/ad_testfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_testfs/Makefile.am @@ -18,45 +18,25 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_testfs.la libadio_testfs_la_SOURCES = \ - io_romio_ad_testfs.c \ + ad_testfs.c \ ad_testfs.h \ - io_romio_ad_testfs_close.c \ - io_romio_ad_testfs_delete.c \ - io_romio_ad_testfs_done.c \ - io_romio_ad_testfs_fcntl.c \ - io_romio_ad_testfs_flush.c \ - io_romio_ad_testfs_getsh.c \ - io_romio_ad_testfs_hints.c \ - io_romio_ad_testfs_iread.c \ - io_romio_ad_testfs_iwrite.c \ - io_romio_ad_testfs_open.c \ - io_romio_ad_testfs_rdcoll.c \ - io_romio_ad_testfs_read.c \ - io_romio_ad_testfs_resize.c \ - io_romio_ad_testfs_seek.c \ - io_romio_ad_testfs_setsh.c \ - io_romio_ad_testfs_wait.c \ - io_romio_ad_testfs_wrcoll.c \ - io_romio_ad_testfs_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_testfs -$(libadio_testfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_testfs_close.c \ + ad_testfs_delete.c \ + ad_testfs_done.c \ + ad_testfs_fcntl.c \ + ad_testfs_flush.c \ + ad_testfs_getsh.c \ + ad_testfs_hints.c \ + ad_testfs_iread.c \ + ad_testfs_iwrite.c \ + ad_testfs_open.c \ + ad_testfs_rdcoll.c \ + ad_testfs_read.c \ + ad_testfs_resize.c \ + ad_testfs_seek.c \ + ad_testfs_setsh.c \ + ad_testfs_wait.c \ + ad_testfs_wrcoll.c \ + ad_testfs_write.c diff --git a/ompi/mca/io/romio/romio/adio/ad_ufs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_ufs/Makefile.am index 009a5ad9d8..b60b6644ff 100644 --- a/ompi/mca/io/romio/romio/adio/ad_ufs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_ufs/Makefile.am @@ -18,28 +18,8 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_ufs.la libadio_ufs_la_SOURCES = \ - io_romio_ad_ufs.c \ + ad_ufs.c \ ad_ufs.h \ - io_romio_ad_ufs_open.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_ufs -$(libadio_ufs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_ufs_open.c diff --git a/ompi/mca/io/romio/romio/adio/ad_xfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_xfs/Makefile.am index 7eb3104ddc..8541ee271d 100644 --- a/ompi/mca/io/romio/romio/adio/ad_xfs/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/ad_xfs/Makefile.am @@ -18,37 +18,17 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_xfs.la libadio_xfs_la_SOURCES = \ - io_romio_ad_xfs.c \ + ad_xfs.c \ ad_xfs.h \ - io_romio_ad_xfs_done.c \ - io_romio_ad_xfs_fcntl.c \ - io_romio_ad_xfs_hints.c \ - io_romio_ad_xfs_iread.c \ - io_romio_ad_xfs_iwrite.c \ - io_romio_ad_xfs_open.c \ - io_romio_ad_xfs_read.c \ - io_romio_ad_xfs_resize.c \ - io_romio_ad_xfs_wait.c \ - io_romio_ad_xfs_write.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/ad_xfs -$(libadio_xfs_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_xfs_done.c \ + ad_xfs_fcntl.c \ + ad_xfs_hints.c \ + ad_xfs_iread.c \ + ad_xfs_iwrite.c \ + ad_xfs_open.c \ + ad_xfs_read.c \ + ad_xfs_resize.c \ + ad_xfs_wait.c \ + ad_xfs_write.c diff --git a/ompi/mca/io/romio/romio/adio/common/Makefile.am b/ompi/mca/io/romio/romio/adio/common/Makefile.am index babe696d32..1854cfd8d6 100644 --- a/ompi/mca/io/romio/romio/adio/common/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/common/Makefile.am @@ -18,75 +18,55 @@ include $(top_srcdir)/Makefile.options -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libadio_common.la libadio_common_la_SOURCES = \ - io_romio_ad_aggregate.c \ - io_romio_ad_close.c \ - io_romio_ad_darray.c \ - io_romio_ad_delete.c \ - io_romio_ad_done.c \ - io_romio_ad_done_fake.c \ - io_romio_ad_end.c \ - io_romio_ad_fcntl.c \ - io_romio_ad_flush.c \ - io_romio_ad_fstype.c \ - io_romio_ad_get_sh_fp.c \ - io_romio_ad_hints.c \ - io_romio_ad_init.c \ - io_romio_ad_iopen.c \ - io_romio_ad_iread.c \ - io_romio_ad_iread_fake.c \ - io_romio_ad_iwrite.c \ - io_romio_ad_iwrite_fake.c \ - io_romio_ad_open.c \ - io_romio_ad_prealloc.c \ - io_romio_ad_read.c \ - io_romio_ad_read_coll.c \ - io_romio_ad_read_str.c \ - io_romio_ad_read_str_naive.c \ - io_romio_ad_resize.c \ - io_romio_ad_seek.c \ - io_romio_ad_set_sh_fp.c \ - io_romio_ad_set_view.c \ - io_romio_ad_subarray.c \ - io_romio_ad_wait.c \ - io_romio_ad_wait_fake.c \ - io_romio_ad_write.c \ - io_romio_ad_write_coll.c \ - io_romio_ad_write_str.c \ - io_romio_ad_write_str_naive.c \ - io_romio_adi_close.c \ - io_romio_async_list.c \ - io_romio_byte_offset.c \ - io_romio_cb_config_list.c \ - io_romio_eof_offset.c \ - io_romio_error.c \ - io_romio_flatten.c \ - io_romio_get_fp_posn.c \ - io_romio_iscontig.c \ - io_romio_lock.c \ - io_romio_malloc.c \ - io_romio_req_malloc.c \ - io_romio_shfp_fname.c \ - io_romio_status_setb.c \ - io_romio_strfns.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/adio/common -$(libadio_common_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + ad_aggregate.c \ + ad_close.c \ + ad_darray.c \ + ad_delete.c \ + ad_done.c \ + ad_done_fake.c \ + ad_end.c \ + ad_fcntl.c \ + ad_flush.c \ + ad_fstype.c \ + ad_get_sh_fp.c \ + ad_hints.c \ + ad_init.c \ + ad_iopen.c \ + ad_iread.c \ + ad_iread_fake.c \ + ad_iwrite.c \ + ad_iwrite_fake.c \ + ad_open.c \ + ad_prealloc.c \ + ad_read.c \ + ad_read_coll.c \ + ad_read_str.c \ + ad_read_str_naive.c \ + ad_resize.c \ + ad_seek.c \ + ad_set_sh_fp.c \ + ad_set_view.c \ + ad_subarray.c \ + ad_wait.c \ + ad_wait_fake.c \ + ad_write.c \ + ad_write_coll.c \ + ad_write_str.c \ + ad_write_str_naive.c \ + adi_close.c \ + async_list.c \ + byte_offset.c \ + cb_config_list.c \ + eof_offset.c \ + error.c \ + flatten.c \ + get_fp_posn.c \ + iscontig.c \ + lock.c \ + malloc.c \ + req_malloc.c \ + shfp_fname.c \ + status_setb.c \ + strfns.c diff --git a/ompi/mca/io/romio/romio/adio/include/Makefile.am b/ompi/mca/io/romio/romio/adio/include/Makefile.am index b55b2dc109..a74869e714 100644 --- a/ompi/mca/io/romio/romio/adio/include/Makefile.am +++ b/ompi/mca/io/romio/romio/adio/include/Makefile.am @@ -26,7 +26,6 @@ noinst_HEADERS = \ adioi_error.h \ adioi_fs_proto.h \ adioi.h \ - io_adio_conv.h \ mpio_error.h \ mpipr.h \ romioconf-undefs.h diff --git a/ompi/mca/io/romio/romio/adio/include/adio.h b/ompi/mca/io/romio/romio/adio/include/adio.h index 86a1f1d939..acaf386c70 100644 --- a/ompi/mca/io/romio/romio/adio/include/adio.h +++ b/ompi/mca/io/romio/romio/adio/include/adio.h @@ -21,10 +21,6 @@ #ifndef ADIO_INCLUDE #define ADIO_INCLUDE -/* Open MPI: We need to rename almost all of these functions, as well - a the types to be names that conform to the prefix rule */ -#include "io_adio_conv.h" - #ifdef SPPUX #define _POSIX_SOURCE #endif diff --git a/ompi/mca/io/romio/romio/adio/include/adioi.h b/ompi/mca/io/romio/romio/adio/include/adioi.h index 8273a49d81..c09a586e1a 100644 --- a/ompi/mca/io/romio/romio/adio/include/adioi.h +++ b/ompi/mca/io/romio/romio/adio/include/adioi.h @@ -24,10 +24,6 @@ #ifndef ADIOI_INCLUDE #define ADIOI_INCLUDE -/* Open MPI: We need to rename almost all of these functions, as well - a the types to be names that conform to the prefix rule */ -#include "io_adio_conv.h" - /* each pending nonblocking request is stored on a linked list */ typedef struct ADIOI_Async { ADIO_Request *request; diff --git a/ompi/mca/io/romio/romio/adio/include/io_adio_conv.h b/ompi/mca/io/romio/romio/adio/include/io_adio_conv.h deleted file mode 100644 index 59e2647534..0000000000 --- a/ompi/mca/io/romio/romio/adio/include/io_adio_conv.h +++ /dev/null @@ -1,338 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#ifndef MCA_IO_ADIO_CONV_H -#define MCA_IO_ADIO_CONV_H - -/* Prefix that we add to all ROMIO symbols */ -#ifdef ROMIO_PREFIX -#undef ROMIO_PREFIX -#endif -#define ROMIO_PREFIX(foo) mca_io_romio_dist_##foo - -/* These function #defines are separated from the MPI_File_* (and - related) #defines mainly on principle */ - -/* Some places only include adio.h, not mpio.h, but still use - MPIR_Status_set_bytes. So add a #define here for it for those - cases */ - -#ifndef MPIR_Status_set_bytes -#define MPIR_Status_set_bytes ROMIO_PREFIX(MPIR_Status_set_bytes) -#endif - -/* Internal ROMIO functions (found by the illegal symbol report) */ - -#define ADIO_Close ROMIO_PREFIX(ADIO_Close) -#define ADIO_End ROMIO_PREFIX(ADIO_End) -#define ADIO_FileSysType_fncall ROMIO_PREFIX(ADIO_FileSysType_fncall) -#define ADIO_FileSysType_parentdir ROMIO_PREFIX(ADIO_FileSysType_parentdir) -#define ADIO_FileSysType_prefix ROMIO_PREFIX(ADIO_FileSysType_prefix) -#define ADIO_Get_shared_fp ROMIO_PREFIX(ADIO_Get_shared_fp) -#define ADIOI_Add_req_to_list ROMIO_PREFIX(ADIOI_Add_req_to_list) -#define ADIOI_Async_avail_head ROMIO_PREFIX(ADIOI_Async_avail_head) -#define ADIOI_Async_avail_tail ROMIO_PREFIX(ADIOI_Async_avail_tail) -#define ADIOI_Async_list_head ROMIO_PREFIX(ADIOI_Async_list_head) -#define ADIOI_Async_list_tail ROMIO_PREFIX(ADIOI_Async_list_tail) -#define ADIOI_Calc_aggregator ROMIO_PREFIX(ADIOI_Calc_aggregator) -#define ADIOI_Calc_file_domains ROMIO_PREFIX(ADIOI_Calc_file_domains) -#define ADIOI_Calc_my_off_len ROMIO_PREFIX(ADIOI_Calc_my_off_len) -#define ADIOI_Calc_my_req ROMIO_PREFIX(ADIOI_Calc_my_req) -#define ADIOI_Calc_others_req ROMIO_PREFIX(ADIOI_Calc_others_req) -#define ADIOI_Calloc_fn ROMIO_PREFIX(ADIOI_Calloc_fn) -#define ADIOI_cb_bcast_rank_map ROMIO_PREFIX(ADIOI_cb_bcast_rank_map) -#define ADIOI_cb_config_list_parse ROMIO_PREFIX(ADIOI_cb_config_list_parse) -#define ADIOI_cb_copy_name_array ROMIO_PREFIX(ADIOI_cb_copy_name_array) -#define ADIOI_cb_delete_name_array ROMIO_PREFIX(ADIOI_cb_delete_name_array) -#define ADIOI_cb_gather_name_array ROMIO_PREFIX(ADIOI_cb_gather_name_array) -#define ADIOI_Complete_async ROMIO_PREFIX(ADIOI_Complete_async) -#define ADIOI_Count_contiguous_blocks ROMIO_PREFIX(ADIOI_Count_contiguous_blocks) -#define ADIOI_Datatype_iscontig ROMIO_PREFIX(ADIOI_Datatype_iscontig) -#define ADIOI_Delete_flattened ROMIO_PREFIX(ADIOI_Delete_flattened) -#define ADIOI_Del_req_from_list ROMIO_PREFIX(ADIOI_Del_req_from_list) -#define ADIOI_DFLT_ERR_HANDLER ROMIO_PREFIX(ADIOI_DFLT_ERR_HANDLER) -#define ADIOI_End_call ROMIO_PREFIX(ADIOI_End_call) -#define ADIOI_Error ROMIO_PREFIX(ADIOI_Error) -#define ADIOI_Exch_and_write ROMIO_PREFIX(ADIOI_Exch_and_write) -#define ADIOI_Fill_send_buffer ROMIO_PREFIX(ADIOI_Fill_send_buffer) -#define ADIOI_Fill_user_buffer ROMIO_PREFIX(ADIOI_Fill_user_buffer) -#define ADIOI_Flatlist ROMIO_PREFIX(ADIOI_Flatlist) -#define ADIOI_Flatten_datatype ROMIO_PREFIX(ADIOI_Flatten_datatype) -#define ADIOI_Flatten ROMIO_PREFIX(ADIOI_Flatten) -#define ADIOI_Free_async_node ROMIO_PREFIX(ADIOI_Free_async_node) -#define ADIOI_Free_fn ROMIO_PREFIX(ADIOI_Free_fn) -#define ADIOI_Free_request ROMIO_PREFIX(ADIOI_Free_request) -#define ADIOI_Ftable_max ROMIO_PREFIX(ADIOI_Ftable_max) -#define ADIOI_Ftable_ptr ROMIO_PREFIX(ADIOI_Ftable_ptr) -#define ADIOI_Ftable ROMIO_PREFIX(ADIOI_Ftable) -#define ADIOI_Get_byte_offset ROMIO_PREFIX(ADIOI_Get_byte_offset) -#define ADIOI_Get_eof_offset ROMIO_PREFIX(ADIOI_Get_eof_offset) -#define ADIOI_Get_position ROMIO_PREFIX(ADIOI_Get_position) -#define ADIOI_Heap_merge ROMIO_PREFIX(ADIOI_Heap_merge) -#define ADIOI_Malloc_async_head ROMIO_PREFIX(ADIOI_Malloc_async_head) -#define ADIOI_Malloc_async_node ROMIO_PREFIX(ADIOI_Malloc_async_node) -#define ADIOI_Malloc_async_tail ROMIO_PREFIX(ADIOI_Malloc_async_tail) -#define ADIOI_Malloc_fn ROMIO_PREFIX(ADIOI_Malloc_fn) -#define ADIOI_Malloc_req_head ROMIO_PREFIX(ADIOI_Malloc_req_head) -#define ADIOI_Malloc_req_tail ROMIO_PREFIX(ADIOI_Malloc_req_tail) -#define ADIOI_Malloc_request ROMIO_PREFIX(ADIOI_Malloc_request) -#define ADIO_Init_keyval ROMIO_PREFIX(ADIO_Init_keyval) -#define ADIO_Init ROMIO_PREFIX(ADIO_Init) -#define ADIOI_Oploc_fn ROMIO_PREFIX(ADIOI_Oploc_fn) -#define ADIOI_Optimize_flattened ROMIO_PREFIX(ADIOI_Optimize_flattened) -#define ADIOI_Read_and_exch ROMIO_PREFIX(ADIOI_Read_and_exch) -#define ADIOI_Realloc_fn ROMIO_PREFIX(ADIOI_Realloc_fn) -#define ADIOI_Realloc_fn ROMIO_PREFIX(ADIOI_Realloc_fn) -#define ADIOI_Req_avail_head ROMIO_PREFIX(ADIOI_Req_avail_head) -#define ADIOI_Req_avail_tail ROMIO_PREFIX(ADIOI_Req_avail_tail) -#define ADIOI_Reqtable_max ROMIO_PREFIX(ADIOI_Reqtable_max) -#define ADIOI_Reqtable_ptr ROMIO_PREFIX(ADIOI_Reqtable_ptr) -#define ADIOI_Reqtable ROMIO_PREFIX(ADIOI_Reqtable) -#define ADIOI_R_Exchange_data ROMIO_PREFIX(ADIOI_R_Exchange_data) -#define ADIOI_SetFunctions ROMIO_PREFIX(ADIOI_SetFunctions) -#define ADIOI_Set_lock ROMIO_PREFIX(ADIOI_Set_lock) -#define ADIOI_Shfp_fname ROMIO_PREFIX(ADIOI_Shfp_fname) -#define ADIOI_Uses_generic_read ROMIO_PREFIX(ADIOI_Uses_generic_read) -#define ADIOI_Uses_generic_write ROMIO_PREFIX(ADIOI_Uses_generic_write) -#define ADIOI_W_Exchange_data ROMIO_PREFIX(ADIOI_W_Exchange_data) -#define ADIO_Open ROMIO_PREFIX(ADIO_Open) -#define ADIO_ResolveFileType ROMIO_PREFIX(ADIO_ResolveFileType) -#define ADIO_Set_shared_fp ROMIO_PREFIX(ADIO_Set_shared_fp) -#define ADIO_Set_view ROMIO_PREFIX(ADIO_Set_view) - -/* We could have done some fancy-schmancy plan (with pants to match), - perhaps with some perl and creative grepping, to automatically get - the symbols for all the ROMIO ADIO modules that would - hypothetically make things easier the next time we import a new - version of ROMIO, but it just didn't seem worth it. Either way, - we'll end up editing this file again, though, so it seemed - simplicity was the better choice here. */ - -#define ADIOI_GEN_Delete ROMIO_PREFIX(ADIOI_GEN_Delete) -#define ADIOI_GEN_Flush ROMIO_PREFIX(ADIOI_GEN_Flush) -#define ADIOI_GEN_ReadStridedColl ROMIO_PREFIX(ADIOI_GEN_ReadStridedColl) -#define ADIOI_GEN_ReadStrided_naive ROMIO_PREFIX(ADIOI_GEN_ReadStrided_naive) -#define ADIOI_GEN_ReadStrided ROMIO_PREFIX(ADIOI_GEN_ReadStrided) -#define ADIOI_GEN_SeekIndividual ROMIO_PREFIX(ADIOI_GEN_SeekIndividual) -#define ADIOI_GEN_SetInfo ROMIO_PREFIX(ADIOI_GEN_SetInfo) -#define ADIOI_GEN_WriteStridedColl ROMIO_PREFIX(ADIOI_GEN_WriteStridedColl) -#define ADIOI_GEN_WriteStrided ROMIO_PREFIX(ADIOI_GEN_WriteStrided) - -#define ADIOI_HFS_operations ROMIO_PREFIX(ADIOI_HFS_operations) -#define ADIOI_HFS_Open ROMIO_PREFIX(ADIOI_HFS_Open) -#define ADIOI_HFS_ReadContig ROMIO_PREFIX(ADIOI_HFS_ReadContig) -#define ADIOI_HFS_WriteContig ROMIO_PREFIX(ADIOI_HFS_WriteContig) -#define ADIOI_HFS_SeekIndividual ROMIO_PREFIX(ADIOI_HFS_SeekIndividual) -#define ADIOI_HFS_Fcntl ROMIO_PREFIX(ADIOI_HFS_Fcntl) -#define ADIOI_HFS_Close ROMIO_PREFIX(ADIOI_HFS_Close) -#define ADIOI_HFS_IreadContig ROMIO_PREFIX(ADIOI_HFS_IreadContig) -#define ADIOI_HFS_IwriteContig ROMIO_PREFIX(ADIOI_HFS_IwriteContig) -#define ADIOI_HFS_ReadDone ROMIO_PREFIX(ADIOI_HFS_ReadDone) -#define ADIOI_HFS_WriteDone ROMIO_PREFIX(ADIOI_HFS_WriteDone) -#define ADIOI_HFS_ReadComplete ROMIO_PREFIX(ADIOI_HFS_ReadComplete) -#define ADIOI_HFS_WriteComplete ROMIO_PREFIX(ADIOI_HFS_WriteComplete) -#define ADIOI_HFS_IreadStrided ROMIO_PREFIX(ADIOI_HFS_IreadStrided) -#define ADIOI_HFS_IwriteStrided ROMIO_PREFIX(ADIOI_HFS_IwriteStrided) -#define ADIOI_HFS_Resize ROMIO_PREFIX(ADIOI_HFS_Resize) - -#define ADIO_NFS_operations ROMIO_PREFIX(ADIO_NFS_operations) -#define ADIOI_NFS_aio ROMIO_PREFIX(ADIOI_NFS_aio) -#define ADIOI_NFS_Close ROMIO_PREFIX(ADIOI_NFS_Close) -#define ADIOI_NFS_Fcntl ROMIO_PREFIX(ADIOI_NFS_Fcntl) -#define ADIOI_NFS_Flush ROMIO_PREFIX(ADIOI_NFS_Flush) -#define ADIOI_NFS_Get_shared_fp ROMIO_PREFIX(ADIOI_NFS_Get_shared_fp) -#define ADIOI_NFS_IreadContig ROMIO_PREFIX(ADIOI_NFS_IreadContig) -#define ADIOI_NFS_IreadStrided ROMIO_PREFIX(ADIOI_NFS_IreadStrided) -#define ADIOI_NFS_IwriteContig ROMIO_PREFIX(ADIOI_NFS_IwriteContig) -#define ADIOI_NFS_IwriteStrided ROMIO_PREFIX(ADIOI_NFS_IwriteStrided) -#define ADIOI_NFS_Open ROMIO_PREFIX(ADIOI_NFS_Open) -#define ADIOI_NFS_ReadComplete ROMIO_PREFIX(ADIOI_NFS_ReadComplete) -#define ADIOI_NFS_ReadContig ROMIO_PREFIX(ADIOI_NFS_ReadContig) -#define ADIOI_NFS_ReadDone ROMIO_PREFIX(ADIOI_NFS_ReadDone) -#define ADIOI_NFS_ReadStridedColl ROMIO_PREFIX(ADIOI_NFS_ReadStridedColl) -#define ADIOI_NFS_ReadStrided ROMIO_PREFIX(ADIOI_NFS_ReadStrided) -#define ADIOI_NFS_Resize ROMIO_PREFIX(ADIOI_NFS_Resize) -#define ADIOI_NFS_SeekIndividual ROMIO_PREFIX(ADIOI_NFS_SeekIndividual) -#define ADIOI_NFS_SetInfo ROMIO_PREFIX(ADIOI_NFS_SetInfo) -#define ADIOI_NFS_Set_shared_fp ROMIO_PREFIX(ADIOI_NFS_Set_shared_fp) -#define ADIOI_NFS_WriteComplete ROMIO_PREFIX(ADIOI_NFS_WriteComplete) -#define ADIOI_NFS_WriteContig ROMIO_PREFIX(ADIOI_NFS_WriteContig) -#define ADIOI_NFS_WriteDone ROMIO_PREFIX(ADIOI_NFS_WriteDone) -#define ADIOI_NFS_WriteStridedColl ROMIO_PREFIX(ADIOI_NFS_WriteStridedColl) -#define ADIOI_NFS_WriteStrided ROMIO_PREFIX(ADIOI_NFS_WriteStrided) - -#define ADIOI_NTFS_operations ROMIO_PREFIX(ADIOI_NTFS_operations) -#define ADIOI_NTFS_Open ROMIO_PREFIX(ADIOI_NTFS_Open) -#define ADIOI_NTFS_ReadContig ROMIO_PREFIX(ADIOI_NTFS_ReadContig) -#define ADIOI_NTFS_WriteContig ROMIO_PREFIX(ADIOI_NTFS_WriteContig) -#define ADIOI_NTFS_SeekIndividual ROMIO_PREFIX(ADIOI_NTFS_SeekIndividual) -#define ADIOI_NTFS_Fcntl ROMIO_PREFIX(ADIOI_NTFS_Fcntl) -#define ADIOI_NTFS_Close ROMIO_PREFIX(ADIOI_NTFS_Close) -#define ADIOI_NTFS_IreadContig ROMIO_PREFIX(ADIOI_NTFS_IreadContig) -#define ADIOI_NTFS_IwriteContig ROMIO_PREFIX(ADIOI_NTFS_IwriteContig) -#define ADIOI_NTFS_ReadDone ROMIO_PREFIX(ADIOI_NTFS_ReadDone) -#define ADIOI_NTFS_WriteDone ROMIO_PREFIX(ADIOI_NTFS_WriteDone) -#define ADIOI_NTFS_ReadComplete ROMIO_PREFIX(ADIOI_NTFS_ReadComplete) -#define ADIOI_NTFS_WriteComplete ROMIO_PREFIX(ADIOI_NTFS_WriteComplete) -#define ADIOI_NTFS_IreadStrided ROMIO_PREFIX(ADIOI_NTFS_IreadStrided) -#define ADIOI_NTFS_IwriteStrided ROMIO_PREFIX(ADIOI_NTFS_IwriteStrided) -#define ADIOI_NTFS_Flush ROMIO_PREFIX(ADIOI_NTFS_Flush) -#define ADIOI_NTFS_Resize ROMIO_PREFIX(ADIOI_NTFS_Resize) - -#define ADIOI_PFS_operations ROMIO_PREFIX(ADIOI_PFS_operations) -#define ADIOI_PFS_Open ROMIO_PREFIX(ADIOI_PFS_Open) -#define ADIOI_PFS_ReadContig ROMIO_PREFIX(ADIOI_PFS_ReadContig) -#define ADIOI_PFS_WriteContig ROMIO_PREFIX(ADIOI_PFS_WriteContig) -#define ADIOI_PFS_SeekIndividual ROMIO_PREFIX(ADIOI_PFS_SeekIndividual) -#define ADIOI_PFS_Fcntl ROMIO_PREFIX(ADIOI_PFS_Fcntl) -#define ADIOI_PFS_SetInfo ROMIO_PREFIX(ADIOI_PFS_SetInfo) -#define ADIOI_PFS_Close ROMIO_PREFIX(ADIOI_PFS_Close) -#define ADIOI_PFS_IreadContig ROMIO_PREFIX(ADIOI_PFS_IreadContig) -#define ADIOI_PFS_IwriteContig ROMIO_PREFIX(ADIOI_PFS_IwriteContig) -#define ADIOI_PFS_ReadDone ROMIO_PREFIX(ADIOI_PFS_ReadDone) -#define ADIOI_PFS_WriteDone ROMIO_PREFIX(ADIOI_PFS_WriteDone) -#define ADIOI_PFS_ReadComplete ROMIO_PREFIX(ADIOI_PFS_ReadComplete) -#define ADIOI_PFS_WriteComplete ROMIO_PREFIX(ADIOI_PFS_WriteComplete) -#define ADIOI_PFS_IreadStrided ROMIO_PREFIX(ADIOI_PFS_IreadStrided) -#define ADIOI_PFS_IwriteStrided ROMIO_PREFIX(ADIOI_PFS_IwriteStrided) -#define ADIOI_PFS_Flush ROMIO_PREFIX(ADIOI_PFS_Flush) -#define ADIOI_PFS_Resize ROMIO_PREFIX(ADIOI_PFS_Resize) - -#define ADIOI_PIOFS_operations ROMIO_PREFIX(ADIOI_PIOFS_operations) -#define ADIOI_PIOFS_Open ROMIO_PREFIX(ADIOI_PIOFS_Open) -#define ADIOI_PIOFS_ReadContig ROMIO_PREFIX(ADIOI_PIOFS_ReadContig) -#define ADIOI_PIOFS_WriteContig ROMIO_PREFIX(ADIOI_PIOFS_WriteContig) -#define ADIOI_PIOFS_SeekIndividual ROMIO_PREFIX(ADIOI_PIOFS_SeekIndividual) -#define ADIOI_PIOFS_Fcntl ROMIO_PREFIX(ADIOI_PIOFS_Fcntl) -#define ADIOI_PIOFS_SetInfo ROMIO_PREFIX(ADIOI_PIOFS_SetInfo) -#define ADIOI_PIOFS_WriteStrided ROMIO_PREFIX(ADIOI_PIOFS_WriteStrided) -#define ADIOI_PIOFS_Close ROMIO_PREFIX(ADIOI_PIOFS_Close) -#define ADIOI_PIOFS_IreadContig ROMIO_PREFIX(ADIOI_PIOFS_IreadContig) -#define ADIOI_PIOFS_IwriteContig ROMIO_PREFIX(ADIOI_PIOFS_IwriteContig) -#define ADIOI_PIOFS_ReadDone ROMIO_PREFIX(ADIOI_PIOFS_ReadDone) -#define ADIOI_PIOFS_WriteDone ROMIO_PREFIX(ADIOI_PIOFS_WriteDone) -#define ADIOI_PIOFS_ReadComplete ROMIO_PREFIX(ADIOI_PIOFS_ReadComplete) -#define ADIOI_PIOFS_WriteComplete ROMIO_PREFIX(ADIOI_PIOFS_WriteComplete) -#define ADIOI_PIOFS_IreadStrided ROMIO_PREFIX(ADIOI_PIOFS_IreadStrided) -#define ADIOI_PIOFS_IwriteStrided ROMIO_PREFIX(ADIOI_PIOFS_IwriteStrided) -#define ADIOI_PIOFS_Resize ROMIO_PREFIX(ADIOI_PIOFS_Resize) - -#define ADIOI_PVFS_operations ROMIO_PREFIX(ADIOI_PVFS_operations) -#define ADIOI_PVFS_ReadContig ROMIO_PREFIX(ADIOI_PVFS_ReadContig) -#define ADIOI_PVFS_WriteContig ROMIO_PREFIX(ADIOI_PVFS_WriteContig) -#define ADIOI_PVFS_SeekIndividual ROMIO_PREFIX(ADIOI_PVFS_SeekIndividual) -#define ADIOI_PVFS_Fcntl ROMIO_PREFIX(ADIOI_PVFS_Fcntl) -#define ADIOI_PVFS_SetInfo ROMIO_PREFIX(ADIOI_PVFS_SetInfo) -#define ADIOI_PVFS_WriteStrided ROMIO_PREFIX(ADIOI_PVFS_WriteStrided) -#define ADIOI_PVFS_Close ROMIO_PREFIX(ADIOI_PVFS_Close) -#define ADIOI_PVFS_IreadContig ROMIO_PREFIX(ADIOI_PVFS_IreadContig) -#define ADIOI_PVFS_IwriteContig ROMIO_PREFIX(ADIOI_PVFS_IwriteContig) -#define ADIOI_PVFS_ReadDone ROMIO_PREFIX(ADIOI_PVFS_ReadDone) -#define ADIOI_PVFS_WriteDone ROMIO_PREFIX(ADIOI_PVFS_WriteDone) -#define ADIOI_PVFS_ReadComplete ROMIO_PREFIX(ADIOI_PVFS_ReadComplete) -#define ADIOI_PVFS_WriteComplete ROMIO_PREFIX(ADIOI_PVFS_WriteComplete) -#define ADIOI_PVFS_IreadStrided ROMIO_PREFIX(ADIOI_PVFS_IreadStrided) -#define ADIOI_PVFS_IwriteStrided ROMIO_PREFIX(ADIOI_PVFS_IwriteStrided) -#define ADIOI_PVFS_Flush ROMIO_PREFIX(ADIOI_PVFS_Flush) -#define ADIOI_PVFS_Resize ROMIO_PREFIX(ADIOI_PVFS_Resize) -#define ADIOI_PVFS_Delete ROMIO_PREFIX(ADIOI_PVFS_Delete) - -#define ADIOI_SFS_operations ROMIO_PREFIX(ADIOI_SFS_operations) -#define ADIOI_SFS_Open ROMIO_PREFIX(ADIOI_SFS_Open) -#define ADIOI_SFS_ReadContig ROMIO_PREFIX(ADIOI_SFS_ReadContig) -#define ADIOI_SFS_WriteContig ROMIO_PREFIX(ADIOI_SFS_WriteContig) -#define ADIOI_SFS_Fcntl ROMIO_PREFIX(ADIOI_SFS_Fcntl) -#define ADIOI_SFS_Close ROMIO_PREFIX(ADIOI_SFS_Close) -#define ADIOI_SFS_IreadContig ROMIO_PREFIX(ADIOI_SFS_IreadContig) -#define ADIOI_SFS_IwriteContig ROMIO_PREFIX(ADIOI_SFS_IwriteContig) -#define ADIOI_SFS_ReadDone ROMIO_PREFIX(ADIOI_SFS_ReadDone) -#define ADIOI_SFS_WriteDone ROMIO_PREFIX(ADIOI_SFS_WriteDone) -#define ADIOI_SFS_ReadComplete ROMIO_PREFIX(ADIOI_SFS_ReadComplete) -#define ADIOI_SFS_WriteComplete ROMIO_PREFIX(ADIOI_SFS_WriteComplete) -#define ADIOI_SFS_IreadStrided ROMIO_PREFIX(ADIOI_SFS_IreadStrided) -#define ADIOI_SFS_IwriteStrided ROMIO_PREFIX(ADIOI_SFS_IwriteStrided) -#define ADIOI_SFS_Flush ROMIO_PREFIX(ADIOI_SFS_Flush) -#define ADIOI_SFS_Resize ROMIO_PREFIX(ADIOI_SFS_Resize) - -#define ADIOI_TESTFS_operations ROMIO_PREFIX(ADIOI_TESTFS_operations) -#define ADIOI_TESTFS_Open ROMIO_PREFIX(ADIOI_TESTFS_Open) -#define ADIOI_TESTFS_ReadContig ROMIO_PREFIX(ADIOI_TESTFS_ReadContig) -#define ADIOI_TESTFS_WriteContig ROMIO_PREFIX(ADIOI_TESTFS_WriteContig) -#define ADIOI_TESTFS_ReadStridedColl ROMIO_PREFIX(ADIOI_TESTFS_ReadStridedColl) -#define ADIOI_TESTFS_WriteStridedColl ROMIO_PREFIX(ADIOI_TESTFS_WriteStridedColl) -#define ADIOI_TESTFS_SeekIndividual ROMIO_PREFIX(ADIOI_TESTFS_SeekIndividual) -#define ADIOI_TESTFS_Fcntl ROMIO_PREFIX(ADIOI_TESTFS_Fcntl) -#define ADIOI_TESTFS_SetInfo ROMIO_PREFIX(ADIOI_TESTFS_SetInfo) -#define ADIOI_TESTFS_ReadStrided ROMIO_PREFIX(ADIOI_TESTFS_ReadStrided) -#define ADIOI_TESTFS_WriteStrided ROMIO_PREFIX(ADIOI_TESTFS_WriteStrided) -#define ADIOI_TESTFS_Close ROMIO_PREFIX(ADIOI_TESTFS_Close) -#define ADIOI_TESTFS_IreadContig ROMIO_PREFIX(ADIOI_TESTFS_IreadContig) -#define ADIOI_TESTFS_IwriteContig ROMIO_PREFIX(ADIOI_TESTFS_IwriteContig) -#define ADIOI_TESTFS_ReadDone ROMIO_PREFIX(ADIOI_TESTFS_ReadDone) -#define ADIOI_TESTFS_WriteDone ROMIO_PREFIX(ADIOI_TESTFS_WriteDone) -#define ADIOI_TESTFS_ReadComplete ROMIO_PREFIX(ADIOI_TESTFS_ReadComplete) -#define ADIOI_TESTFS_WriteComplete ROMIO_PREFIX(ADIOI_TESTFS_WriteComplete) -#define ADIOI_TESTFS_IreadStrided ROMIO_PREFIX(ADIOI_TESTFS_IreadStrided) -#define ADIOI_TESTFS_IwriteStrided ROMIO_PREFIX(ADIOI_TESTFS_IwriteStrided) -#define ADIOI_TESTFS_Flush ROMIO_PREFIX(ADIOI_TESTFS_Flush) -#define ADIOI_TESTFS_Resize ROMIO_PREFIX(ADIOI_TESTFS_Resize) -#define ADIOI_TESTFS_Delete ROMIO_PREFIX(ADIOI_TESTFS_Delete) - -#define ADIO_UFS_operations ROMIO_PREFIX(ADIO_UFS_operations) -#define ADIOI_UFS_aio ROMIO_PREFIX(ADIOI_UFS_aio) -#define ADIOI_UFS_Close ROMIO_PREFIX(ADIOI_UFS_Close) -#define ADIOI_UFS_Fcntl ROMIO_PREFIX(ADIOI_UFS_Fcntl) -#define ADIOI_UFS_Flush ROMIO_PREFIX(ADIOI_UFS_Flush) -#define ADIOI_UFS_IreadContig ROMIO_PREFIX(ADIOI_UFS_IreadContig) -#define ADIOI_UFS_IreadStrided ROMIO_PREFIX(ADIOI_UFS_IreadStrided) -#define ADIOI_UFS_IwriteContig ROMIO_PREFIX(ADIOI_UFS_IwriteContig) -#define ADIOI_UFS_IwriteStrided ROMIO_PREFIX(ADIOI_UFS_IwriteStrided) -#define ADIOI_UFS_Open ROMIO_PREFIX(ADIOI_UFS_Open) -#define ADIOI_UFS_ReadComplete ROMIO_PREFIX(ADIOI_UFS_ReadComplete) -#define ADIOI_UFS_ReadContig ROMIO_PREFIX(ADIOI_UFS_ReadContig) -#define ADIOI_UFS_ReadDone ROMIO_PREFIX(ADIOI_UFS_ReadDone) -#define ADIOI_UFS_ReadStridedColl ROMIO_PREFIX(ADIOI_UFS_ReadStridedColl) -#define ADIOI_UFS_ReadStrided ROMIO_PREFIX(ADIOI_UFS_ReadStrided) -#define ADIOI_UFS_Resize ROMIO_PREFIX(ADIOI_UFS_Resize) -#define ADIOI_UFS_SeekIndividual ROMIO_PREFIX(ADIOI_UFS_SeekIndividual) -#define ADIOI_UFS_SetInfo ROMIO_PREFIX(ADIOI_UFS_SetInfo) -#define ADIOI_UFS_WriteComplete ROMIO_PREFIX(ADIOI_UFS_WriteComplete) -#define ADIOI_UFS_WriteContig ROMIO_PREFIX(ADIOI_UFS_WriteContig) -#define ADIOI_UFS_WriteDone ROMIO_PREFIX(ADIOI_UFS_WriteDone) -#define ADIOI_UFS_WriteStridedColl ROMIO_PREFIX(ADIOI_UFS_WriteStridedColl) -#define ADIOI_UFS_WriteStrided ROMIO_PREFIX(ADIOI_UFS_WriteStrided) - -#define ADIOI_XFS_operations ROMIO_PREFIX(ADIOI_XFS_operations) -#define ADIOI_XFS_Open ROMIO_PREFIX(ADIOI_XFS_Open) -#define ADIOI_XFS_ReadContig ROMIO_PREFIX(ADIOI_XFS_ReadContig) -#define ADIOI_XFS_WriteContig ROMIO_PREFIX(ADIOI_XFS_WriteContig) -#define ADIOI_XFS_SeekIndividual ROMIO_PREFIX(ADIOI_XFS_SeekIndividual) -#define ADIOI_XFS_Fcntl ROMIO_PREFIX(ADIOI_XFS_Fcntl) -#define ADIOI_XFS_SetInfo ROMIO_PREFIX(ADIOI_XFS_SetInfo) -#define ADIOI_XFS_Close ROMIO_PREFIX(ADIOI_XFS_Close) -#define ADIOI_XFS_IreadContig ROMIO_PREFIX(ADIOI_XFS_IreadContig) -#define ADIOI_XFS_IwriteContig ROMIO_PREFIX(ADIOI_XFS_IwriteContig) -#define ADIOI_XFS_ReadDone ROMIO_PREFIX(ADIOI_XFS_ReadDone) -#define ADIOI_XFS_WriteDone ROMIO_PREFIX(ADIOI_XFS_WriteDone) -#define ADIOI_XFS_ReadComplete ROMIO_PREFIX(ADIOI_XFS_ReadComplete) -#define ADIOI_XFS_WriteComplete ROMIO_PREFIX(ADIOI_XFS_WriteComplete) -#define ADIOI_XFS_IreadStrided ROMIO_PREFIX(ADIOI_XFS_IreadStrided) -#define ADIOI_XFS_IwriteStrided ROMIO_PREFIX(ADIOI_XFS_IwriteStrided) -#define ADIOI_XFS_Resize ROMIO_PREFIX(ADIOI_XFS_Resize) - -#endif /* MCA_IO_ADIO_CONV_H */ diff --git a/ompi/mca/io/romio/romio/mpi-io/Makefile.am b/ompi/mca/io/romio/romio/mpi-io/Makefile.am index 11c3b401b5..38844af171 100644 --- a/ompi/mca/io/romio/romio/mpi-io/Makefile.am +++ b/ompi/mca/io/romio/romio/mpi-io/Makefile.am @@ -24,86 +24,66 @@ include $(top_srcdir)/Makefile.options SUBDIRS = glue/openmpi -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libmpi-io.la libmpi_io_la_SOURCES = \ - io_romio_close.c \ - io_romio_delete.c \ - io_romio_fsync.c \ - io_romio_get_amode.c \ - io_romio_get_atom.c \ - io_romio_get_bytoff.c \ - io_romio_get_errh.c \ - io_romio_get_extent.c \ - io_romio_get_group.c \ - io_romio_get_info.c \ - io_romio_get_posn.c \ - io_romio_get_posn_sh.c \ - io_romio_get_size.c \ - io_romio_get_view.c \ - io_romio_iotest.c \ - io_romio_iowait.c \ - io_romio_iread_at.c \ - io_romio_iread.c \ - io_romio_iread_sh.c \ - io_romio_iwrite_at.c \ - io_romio_iwrite.c \ - io_romio_iwrite_sh.c \ + close.c \ + delete.c \ + fsync.c \ + get_amode.c \ + get_atom.c \ + get_bytoff.c \ + get_errh.c \ + get_extent.c \ + get_group.c \ + get_info.c \ + get_posn.c \ + get_posn_sh.c \ + get_size.c \ + get_view.c \ + iotest.c \ + iowait.c \ + iread_at.c \ + iread.c \ + iread_sh.c \ + iwrite_at.c \ + iwrite.c \ + iwrite_sh.c \ mpioimpl.h \ mpioprof.h \ - io_romio_open.c \ - io_romio_prealloc.c \ - io_romio_rd_atallb.c \ - io_romio_rd_atalle.c \ - io_romio_read_allb.c \ - io_romio_read_all.c \ - io_romio_read_alle.c \ - io_romio_read_atall.c \ - io_romio_read_at.c \ - io_romio_read.c \ - io_romio_read_ordb.c \ - io_romio_read_ord.c \ - io_romio_read_orde.c \ - io_romio_read_sh.c \ - io_romio_seek.c \ - io_romio_seek_sh.c \ - io_romio_set_atom.c \ - io_romio_set_errh.c \ - io_romio_set_info.c \ - io_romio_set_size.c \ - io_romio_set_view.c \ - io_romio_wr_atallb.c \ - io_romio_wr_atalle.c \ - io_romio_write_allb.c \ - io_romio_write_all.c \ - io_romio_write_alle.c \ - io_romio_write_atall.c \ - io_romio_write_at.c \ - io_romio_write.c \ - io_romio_write_ordb.c \ - io_romio_write_ord.c \ - io_romio_write_orde.c \ - io_romio_write_sh.c \ - io_romio_register_datarep.c \ - io_romio_mpiu_greq.c \ + open.c \ + prealloc.c \ + rd_atallb.c \ + rd_atalle.c \ + read_allb.c \ + read_all.c \ + read_alle.c \ + read_atall.c \ + read_at.c \ + read.c \ + read_ordb.c \ + read_ord.c \ + read_orde.c \ + read_sh.c \ + seek.c \ + seek_sh.c \ + set_atom.c \ + set_errh.c \ + set_info.c \ + set_size.c \ + set_view.c \ + wr_atallb.c \ + wr_atalle.c \ + write_allb.c \ + write_all.c \ + write_alle.c \ + write_atall.c \ + write_at.c \ + write.c \ + write_ordb.c \ + write_ord.c \ + write_orde.c \ + write_sh.c \ + register_datarep.c \ + mpiu_greq.c \ mpiu_greq.h \ - io_romio_mpich2_fileutil.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/mpi-io -$(libmpi_io_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + mpich2_fileutil.c diff --git a/ompi/mca/io/romio/romio/mpi-io/glue/openmpi/Makefile.am b/ompi/mca/io/romio/romio/mpi-io/glue/openmpi/Makefile.am index c347810a9b..aac100937a 100644 --- a/ompi/mca/io/romio/romio/mpi-io/glue/openmpi/Makefile.am +++ b/ompi/mca/io/romio/romio/mpi-io/glue/openmpi/Makefile.am @@ -21,28 +21,7 @@ include $(top_srcdir)/Makefile.options AM_CPPFLAGS += \ -I$(top_srcdir)/mpi-io - -# It is unfortunately necessary to make all the filenames in the ROMIO -# distribtion confrom to the MCA prefix name rule -- there is at least -# one or two filename conflicts that potentially create problems when -# merging everything into onelibmpi. - -# In developer's copies, we have the real ROMIO files, and sym links -# are made. In distribution tarballs, the sym-linked files turn into -# real files and the original filenames do not appear. - noinst_LTLIBRARIES = libglue.la libglue_la_SOURCES = \ - io_romio_mpio_err.c \ - io_romio_mpio_file.c - -# -# Sym link the sources to conform to the MCA prefix name rule -# -dir=$(top_srcdir)/mpi-io/glue/openmpi -$(libglue_la_SOURCES): - if test ! -r $@ ; then \ - pname=`echo $@ | cut -b '10-'` ; \ - rm -f $@; \ - ln -s $(dir)/$$pname $@ ; \ - fi + mpio_err.c \ + mpio_file.c