After consulting with Edgar, eliminate a redundant directory in the

"basic" coll component.

This commit was SVN r1961.

src/mca/coll/basic/Makefile.am

@@ -6,10 +6,29 @@
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
-SUBDIRS = src
-
 EXTRA_DIST = VERSION
 
+sources = \
+        coll_basic.h \
+        coll_basic.c \
+        coll_basic_allgather.c \
+        coll_basic_allgatherv.c \
+        coll_basic_allreduce.c \
+        coll_basic_alltoall.c \
+        coll_basic_alltoallv.c \
+        coll_basic_alltoallw.c \
+        coll_basic_barrier.c \
+        coll_basic_bcast.c \
+        coll_basic_component.c \
+        coll_basic_gather.c \
+        coll_basic_gatherv.c \
+        coll_basic_reduce.c \
+        coll_basic_reduce_scatter.c \
+        coll_basic_scan.c \
+        coll_basic_exscan.c \
+        coll_basic_scatter.c \
+        coll_basic_scatterv.c
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
@@ -24,11 +43,9 @@ endif
 
 mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
-mca_coll_basic_la_SOURCES =
-mca_coll_basic_la_LIBADD = src/libmca_coll_basic.la $(LIBMPI_LA)
+mca_coll_basic_la_SOURCES = $(sources)
 mca_coll_basic_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(component_noinst)
-libmca_coll_basic_la_SOURCES =
-libmca_coll_basic_la_LIBADD = src/libmca_coll_basic.la
+libmca_coll_basic_la_SOURCES =$(sources)
 libmca_coll_basic_la_LDFLAGS = -module -avoid-version

src/mca/coll/basic/configure.params

@@ -5,5 +5,5 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=src/coll_basic.c
-PARAM_CONFIG_FILES="Makefile src/Makefile"
+PARAM_INIT_FILE=coll_basic.c
+PARAM_CONFIG_FILES=Makefile

src/mca/coll/basic/src/Makefile.am

@@ -1,27 +0,0 @@
-#
-# $HEADER$
-#
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
-noinst_LTLIBRARIES = libmca_coll_basic.la
-libmca_coll_basic_la_SOURCES = \
-        coll_basic.h \
-        coll_basic.c \
-        coll_basic_allgather.c \
-        coll_basic_allgatherv.c \
-        coll_basic_allreduce.c \
-        coll_basic_alltoall.c \
-        coll_basic_alltoallv.c \
-        coll_basic_alltoallw.c \
-        coll_basic_barrier.c \
-        coll_basic_bcast.c \
-        coll_basic_component.c \
-        coll_basic_gather.c \
-        coll_basic_gatherv.c \
-        coll_basic_reduce.c \
-        coll_basic_reduce_scatter.c \
-        coll_basic_scan.c \
-        coll_basic_exscan.c \
-        coll_basic_scatter.c \
-        coll_basic_scatterv.c