* make romio compile

* fix typos in ompi/Makefile.am This commit was SVN r6310.
2005-07-02 17:56:20 +00:00 · 2005-07-02 17:56:20 +00:00 · e422152b55
--- a/ompi/Makefile.am
+++ b/ompi/Makefile.am
@ -135,12 +135,12 @@ libmpi_la_LIBADD = \
        file/libfile.la \
        group/libgroup.la \
        info/libinfo.la \
-        mca/allocator/base/libmca_btl_base.la $(MCA_allocator_STATIC_LTLIBS) \
+        mca/allocator/base/libmca_allocator_base.la $(MCA_allocator_STATIC_LTLIBS) \
        mca/btl/base/libmca_btl_base.la $(MCA_btl_STATIC_LTLIBS) \
        mca/coll/base/libmca_coll_base.la $(MCA_coll_STATIC_LTLIBS) \
        $(MCA_common_STATIC_LTLIBS) \
        mca/io/base/libmca_io_base.la $(MCA_io_STATIC_LTLIBS) \
-        mca/mpool/base/libmca_btl_base.la $(MCA_mpool_STATIC_LTLIBS) \
+        mca/mpool/base/libmca_mpool_base.la $(MCA_mpool_STATIC_LTLIBS) \
        mca/pml/base/libmca_pml_base.la $(MCA_pml_STATIC_LTLIBS) \
        mca/ptl/base/libmca_ptl_base.la $(MCA_ptl_STATIC_LTLIBS) \
        mca/topo/base/libmca_topo_base.la $(MCA_topo_STATIC_LTLIBS) \
--- a/ompi/mca/io/romio/romio-dist/adio/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/Makefile.am
@ -17,9 +17,18 @@
 include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = -DHAVE_MPI_INFO \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include

 # Conditionals whether to build each subdir or not

--- a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/adio/common/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/common/Makefile.am
@ -18,9 +18,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include

 # It is unfortunately necessary to make all the filenames in the ROMIO
--- a/ompi/mca/io/romio/romio-dist/configure.in
+++ b/ompi/mca/io/romio/romio-dist/configure.in
@ -100,7 +100,7 @@ if test -f "$srcdir/../../../../../config/mca_configure.ac"; then

    top_ompi_srcdir='$(top_srcdir)/../../../../..'
    top_ompi_builddir='$(top_builddir)/../../../../..'
-    OMPI_CFLAGS='-I$(top_ompi_srcdir)/src -I$(top_ompi_srcdir)/include -I$(top_ompi_builddir)/src'
+    OMPI_CFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal -I$(top_builddir)/opal -I$(top_srcdir)/orte -I$(top_builddir)/orte -I$(top_srcdir)/ompi -I$(top_builddir)/ompi'" $CPPFLAGS"
    found_ompi_headers=1
    AC_MSG_RESULT([in Open MPI source tree -- good])
    AC_SUBST(top_ompi_srcdir)
--- a/ompi/mca/io/romio/romio-dist/mpi-io/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/mpi-io/Makefile.am
@ -22,9 +22,20 @@ include $(top_ompi_srcdir)/config/Makefile.options

 AM_CPPFLAGS = \
        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/adio/include

--- a/ompi/mca/io/romio/src/Makefile.extra
+++ b/ompi/mca/io/romio/src/Makefile.extra
@ -17,10 +17,18 @@

 AM_CPPFLAGS = \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/src \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_ompi_builddir)/opal \
+        -I$(top_ompi_builddir)/opal/include \
+        -I$(top_ompi_srcdir)/opal \
+        -I$(top_ompi_srcdir)/opal/include \
+        -I$(top_ompi_builddir)/orte \
+        -I$(top_ompi_builddir)/orte/include \
+        -I$(top_ompi_srcdir)/orte \
+        -I$(top_ompi_srcdir)/orte/include \
+        -I$(top_ompi_builddir)/ompi \
+        -I$(top_ompi_builddir)/ompi/include \
+        -I$(top_ompi_srcdir)/ompi \
+        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir) \
        -I$(top_srcdir)/romio-dist/include \
        -I$(top_builddir)