More changes -- move back to src/ directory

This commit was SVN r1390.

src/mca/ptl/gm/Makefile.am

@@ -1,12 +1,18 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #
 
+# Use the top-level OpenMPI Makefile.options
+
 include $(top_ompi_srcdir)/config/Makefile.options
 
-sources = \
-	ptl_gm.c
+SUBDIRS = src
+
+EXTRA_DIST = VERSION
+
+# According to the MCA spec, we have to make the output library here
+# in the top-level directory, and it has to be named
+# libompi_ssi_coll_ompi_basic.la
 
 if OMPI_BUILD_ptl_gm_LOADABLE_MODULE
 module_noinst =
@@ -18,11 +24,13 @@ endif
 
 mcamoduledir = $(libdir)/openmpi
 mcamodule_LTLIBRARIES = $(module_install)
-mca_ptl_gm_la_SOURCES = $(sources)
-mca_ptl_gm_la_LIBADD = $(LIBOMPI_LA)
+mca_ptl_gm_la_SOURCES = 
+mca_ptl_gm_la_LIBADD = \
+        src/libmca_ptl_gm.la \
+        $(LIBOMPI_LA)
 mca_ptl_gm_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(module_noinst)
-libmca_ptl_gm_la_SOURCES = $(sources)
+libmca_ptl_gm_la_SOURCES =
+libmca_ptl_gm_la_LIBADD = src/libmca_ptl_gm.la
 libmca_ptl_gm_la_LDFLAGS = -module -avoid-version
-

src/mca/ptl/gm/configure.params

@@ -5,6 +5,6 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=ptl_gm.c
+PARAM_INIT_FILE=src/ptl_gm.c
 PARAM_CONFIG_HEADER_FILE="gm_config.h"
-PARAM_CONFIG_FILES="Makefile"
+PARAM_CONFIG_FILES="Makefile src/Makefile"

src/mca/ptl/gm/src/Makefile.am

@@ -0,0 +1,12 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+noinst_LTLIBRARIES = libmca_ptl_gm.la
+libmca_ptl_gm_la_SOURCES = \
+	ptl_gm.c 
+
+