ROMIO VPATH fixes

This commit was SVN r3417.

src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am

@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/adio/common/Makefile.am

@@ -4,9 +4,11 @@
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/romio-dist/mpi-io/Makefile.am

@@ -10,9 +10,11 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least

src/mca/io/romio/src/Makefile.am

@@ -5,10 +5,13 @@
 include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
+        -I$(top_ompi_builddir)/src \
         -I$(top_ompi_builddir)/src/include \
         -I$(top_ompi_srcdir)/src \
         -I$(top_ompi_srcdir)/src/include \
-        -I$(top_srcdir)
+        -I$(top_srcdir) \
+        -I$(top_srcdir)/romio-dist/include \
+        -I$(top_builddir)
 
 noinst_LTLIBRARIES = libmca_io_romio.la
 libmca_io_romio_la_SOURCES = \