Fix some errors / add more skeleton infrastructure

This commit was SVN r166.

src/mca/mpi/coll/Makefile.am

@@ -4,8 +4,8 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = base $(MCA_pml_STATIC_SUBDIRS)
+SUBDIRS = base $(MCA_coll_STATIC_SUBDIRS)
-DIST_SUBDIRS = base $(MCA_pml_ALL_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)

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

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

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

src/mca/mpi/topo/topo.h

@@ -2,9 +2,9 @@
  * $HEADER
  */
 
-#ifndef MCA_IO_H
+#ifndef MCA_TOPO_H
-#define MCA_IO_H
+#define MCA_TOPO_H
 
 /* JMS Need to fill in here */
 
-#endif /* MCA_IO_H */
+#endif /* MCA_TOPO_H */