From 05d422e4bd6b4c7e583a41081e22bc5c5e525e01 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Fri, 9 Jan 2004 08:38:06 +0000
Subject: [PATCH] Fix some errors / add more skeleton infrastructure

This commit was SVN r166.
---
 src/mca/mpi/coll/Makefile.am |  6 +++---
 src/mca/mpi/io/Makefile.am   | 16 +++++++++++++++-
 src/mca/mpi/one/Makefile.am  | 16 +++++++++++++++-
 src/mca/mpi/topo/Makefile.am | 15 +++++++++++++++
 src/mca/mpi/topo/topo.h      |  6 +++---
 5 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/src/mca/mpi/coll/Makefile.am b/src/mca/mpi/coll/Makefile.am
index 7875e26205..7bf8db2808 100644
--- a/src/mca/mpi/coll/Makefile.am
+++ b/src/mca/mpi/coll/Makefile.am
@@ -4,8 +4,8 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = base $(MCA_pml_STATIC_SUBDIRS)
-DIST_SUBDIRS = base $(MCA_pml_ALL_SUBDIRS)
+SUBDIRS = base $(MCA_coll_STATIC_SUBDIRS)
+DIST_SUBDIRS = base $(MCA_coll_ALL_SUBDIRS)
 
 # Source code files
 
@@ -14,7 +14,7 @@ headers = coll.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-lamdir = $(includedir)/lam/mca/mpi/pml
+lamdir = $(includedir)/lam/mca/mpi/coll
 lam_HEADERS = $(headers)
 else
 lamdir = $(includedir)
diff --git a/src/mca/mpi/io/Makefile.am b/src/mca/mpi/io/Makefile.am
index eaa35c30a9..18089b5918 100644
--- a/src/mca/mpi/io/Makefile.am
+++ b/src/mca/mpi/io/Makefile.am
@@ -4,4 +4,18 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = base
+SUBDIRS = base $(MCA_io_STATIC_SUBDIRS)
+DIST_SUBDIRS = base $(MCA_io_ALL_SUBDIRS)
+
+# Source code files
+
+headers = io.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mca/mpi/io
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif
diff --git a/src/mca/mpi/one/Makefile.am b/src/mca/mpi/one/Makefile.am
index eaa35c30a9..8300bfbb09 100644
--- a/src/mca/mpi/one/Makefile.am
+++ b/src/mca/mpi/one/Makefile.am
@@ -4,4 +4,18 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = base
+SUBDIRS = base $(MCA_one_STATIC_SUBDIRS)
+DIST_SUBDIRS = base $(MCA_one_ALL_SUBDIRS)
+
+# Source code files
+
+headers = one.h
+
+# Conditonenally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mca/mpi/one
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif
diff --git a/src/mca/mpi/topo/Makefile.am b/src/mca/mpi/topo/Makefile.am
index e592aae646..41c7d19dbf 100644
--- a/src/mca/mpi/topo/Makefile.am
+++ b/src/mca/mpi/topo/Makefile.am
@@ -4,3 +4,18 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+SUBDIRS = base $(MCA_topo_STATIC_SUBDIRS)
+DIST_SUBDIRS = base $(MCA_topo_ALL_SUBDIRS)
+
+# Source code files
+
+headers = topo.h
+
+# Condittoponally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mca/mpi/topo
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif
diff --git a/src/mca/mpi/topo/topo.h b/src/mca/mpi/topo/topo.h
index 38231c98ad..f6b7aa2083 100644
--- a/src/mca/mpi/topo/topo.h
+++ b/src/mca/mpi/topo/topo.h
@@ -2,9 +2,9 @@
  * $HEADER
  */
 
-#ifndef MCA_IO_H
-#define MCA_IO_H
+#ifndef MCA_TOPO_H
+#define MCA_TOPO_H
 
 /* JMS Need to fill in here */
 
-#endif /* MCA_IO_H */
+#endif /* MCA_TOPO_H */