From 4881cd0df3e1337c1a93b48fe0bf5fbb1f5dff21 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Thu, 11 Jun 2009 03:15:47 +0000
Subject: [PATCH] Revert the prior change out from the individual .h files -
 the problem was in the Makefile.am's, causing the make dist to fail.

This commit was SVN r21414.
---
 ompi/group/Makefile.am               | 3 ++-
 ompi/group/group.h                   | 2 +-
 ompi/mca/pml/base/Makefile.am        | 3 ++-
 ompi/mca/pml/base/pml_base_request.h | 2 +-
 ompi/request/Makefile.am             | 3 ++-
 ompi/request/request.h               | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ompi/group/Makefile.am b/ompi/group/Makefile.am
index 070b299b34..f9f1bfc236 100644
--- a/ompi/group/Makefile.am
+++ b/ompi/group/Makefile.am
@@ -21,7 +21,8 @@
 # This makefile.am does not stand on its own - it is included from ompi/Makefile.am
 
 headers += \
-        group/group.h
+        group/group.h \
+	group/group_dbg.h
 
 libmpi_la_SOURCES += \
         group/group.c \
diff --git a/ompi/group/group.h b/ompi/group/group.h
index 850e67e588..90ae57a47b 100644
--- a/ompi/group/group.h
+++ b/ompi/group/group.h
@@ -118,7 +118,7 @@ typedef struct ompi_predefined_group_t ompi_predefined_group_t;
  * For more information on why we do this see the Notice to developers 
  * comment at the top of the ompi_msgq_dll.c file.
  */
-#include "ompi/group/group_dbg.h"
+#include "group_dbg.h"
 
 #define OMPI_GROUP_IS_INTRINSIC(_group) ((_group)->grp_flags&OMPI_GROUP_INTRINSIC)
 #define OMPI_GROUP_IS_DENSE(_group) ((_group)->grp_flags & OMPI_GROUP_DENSE)
diff --git a/ompi/mca/pml/base/Makefile.am b/ompi/mca/pml/base/Makefile.am
index db7a2fb60f..49b44e4ab0 100644
--- a/ompi/mca/pml/base/Makefile.am
+++ b/ompi/mca/pml/base/Makefile.am
@@ -21,7 +21,8 @@ headers += \
         base/pml_base_bsend.h \
         base/pml_base_request.h \
         base/pml_base_recvreq.h \
-        base/pml_base_sendreq.h
+        base/pml_base_sendreq.h \
+	base/pml_base_request_dbg.h
 
 libmca_pml_la_SOURCES += \
         base/pml_base_bsend.c \
diff --git a/ompi/mca/pml/base/pml_base_request.h b/ompi/mca/pml/base/pml_base_request.h
index 044ee0fdf7..d1399b48bd 100644
--- a/ompi/mca/pml/base/pml_base_request.h
+++ b/ompi/mca/pml/base/pml_base_request.h
@@ -48,7 +48,7 @@ OMPI_DECLSPEC extern ompi_free_list_t mca_pml_base_recv_requests;
  * For more information on why we do this see the Notice to developers 
  * comment at the top of the ompi_msgq_dll.c file.
  */
-#include "ompi/mca/pml/base/pml_base_request_dbg.h"
+#include "pml_base_request_dbg.h"
 
 
 /**
diff --git a/ompi/request/Makefile.am b/ompi/request/Makefile.am
index 40d28f5225..1473238721 100644
--- a/ompi/request/Makefile.am
+++ b/ompi/request/Makefile.am
@@ -22,7 +22,8 @@
 headers += \
         request/grequest.h \
         request/request_default.h \
-        request/request.h
+        request/request.h \
+	request/request_dbg.h
 
 libmpi_la_SOURCES += \
         request/grequest.c \
diff --git a/ompi/request/request.h b/ompi/request/request.h
index 41132c98ce..5a20083f12 100644
--- a/ompi/request/request.h
+++ b/ompi/request/request.h
@@ -47,7 +47,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(ompi_request_t);
  * comment at the top of the ompi_msgq_dll.c file.
  */
 
-#include "ompi/request/request_dbg.h"
+#include "request_dbg.h"
 
 struct ompi_request_t;