Fixes for new include file locations

This commit was SVN r241.

src/mca/mpi/pml/base/Makefile.am

@@ -3,11 +3,11 @@
 #
 
 include $(top_srcdir)/config/Makefile.options
-                                                                                                    
+
 noinst_LTLIBRARIES = libpmlb.la
-                                                                                                                  
+
 # Source code files
-                                                                                                                  
+
 headers = \
 	fragment.h \
 	header.h \
@@ -22,9 +22,9 @@ libpmlb_la_SOURCES = \
         recvfrag.c \
         request.c \
         sendfrag.c
-                                                                                                                  
+
 # Conditionally install the header files
-                                                                                                                  
+
 if WANT_INSTALL_HEADERS
 lamdir = $(includedir)/mfc/mpi/pml/base
 lam_HEADERS = $(headers)

src/mca/mpi/pml/base/pml_base_request.h

@@ -6,10 +6,10 @@
 #ifndef MCA_PML_BASE_REQUEST_H
 #define MCA_PML_BASE_REQUEST_H
 
-#include "lam/communicator.h"
-#include "lam/datatype.h"
-#include "lam/request.h"
 #include "lam/mem/free_list.h"
+#include "mpi/request/request.h"
+#include "mpi/datatype/datatype.h"
+#include "mpi/communicator/communicator.h"
 #include "mca/mpi/pml/pml.h"
 
 

src/mca/mpi/pml/pml.h

@@ -6,8 +6,8 @@
 #define LAM_MCA_PML_H
 
 #include "lam/lam.h"
-#include "lam/proc.h"
 #include "lam/lfc/list.h"
+#include "mpi/proc/proc.h"
 #include "mca/mca.h"
 
 /*

src/mca/mpi/pml/teg/src/pml_teg_proc.h

@@ -5,7 +5,7 @@
 #ifndef MCA_PML_PROC_H
 #define MCA_PML_PROC_H
 
-#include "lam/proc.h"
+#include "mpi/proc/proc.h"
 #include "mca/mpi/pml/teg/ptl_array.h"
 
 extern lam_class_info_t mca_pml_teg_proc_cls;