diff --git a/ompi/mca/coll/basic/Makefile.am b/ompi/mca/coll/basic/Makefile.am
index a7e6d12140..1db43b081c 100644
--- a/ompi/mca/coll/basic/Makefile.am
+++ b/ompi/mca/coll/basic/Makefile.am
@@ -14,10 +14,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
         coll_basic.h \
         coll_basic_allgather.c \
@@ -55,6 +51,10 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_basic_la_SOURCES = $(sources)
 mca_coll_basic_la_LDFLAGS = -module -avoid-version
+mca_coll_basic_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_basic_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/demo/Makefile.am b/ompi/mca/coll/demo/Makefile.am
index 7c8f12310f..af027e3aab 100644
--- a/ompi/mca/coll/demo/Makefile.am
+++ b/ompi/mca/coll/demo/Makefile.am
@@ -62,6 +62,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_demo_la_SOURCES = $(sources)
 mca_coll_demo_la_LIBADD = $(LIBMPI_LA)
 mca_coll_demo_la_LDFLAGS = -module -avoid-version
+mca_coll_demo_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_demo_la_SOURCES = $(sources)
diff --git a/ompi/mca/coll/hierarch/Makefile.am b/ompi/mca/coll/hierarch/Makefile.am
index 33278afcf6..a553e6b5b9 100644
--- a/ompi/mca/coll/hierarch/Makefile.am
+++ b/ompi/mca/coll/hierarch/Makefile.am
@@ -39,6 +39,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_hierarch_la_SOURCES = $(sources)
 mca_coll_hierarch_la_LIBADD = $(LIBMPI_LA)
 mca_coll_hierarch_la_LDFLAGS = -module -avoid-version
+mca_coll_hierarch_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_hierarch_la_SOURCES = $(sources)
diff --git a/ompi/mca/coll/self/Makefile.am b/ompi/mca/coll/self/Makefile.am
index a82a70bd1a..5274ce7449 100644
--- a/ompi/mca/coll/self/Makefile.am
+++ b/ompi/mca/coll/self/Makefile.am
@@ -14,10 +14,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
         coll_self.h \
         coll_self_allgather.c \
@@ -55,6 +51,10 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_self_la_SOURCES = $(sources)
 mca_coll_self_la_LDFLAGS = -module -avoid-version
+mca_coll_self_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_self_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/sm/Makefile.am b/ompi/mca/coll/sm/Makefile.am
index 55e18559a9..1d923fd381 100644
--- a/ompi/mca/coll/sm/Makefile.am
+++ b/ompi/mca/coll/sm/Makefile.am
@@ -14,7 +14,6 @@
 # $HEADER$
 #
 
-
 not_used_yet = \
         coll_sm_allgather.c \
         coll_sm_allgatherv.c \
@@ -58,7 +57,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_sm_la_SOURCES = $(sources)
 mca_coll_sm_la_LDFLAGS = -module -avoid-version
 mca_coll_sm_la_LIBADD = \
-        $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
+        $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_sm_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/tuned/Makefile.am b/ompi/mca/coll/tuned/Makefile.am
index 67d0f8a7c2..00ab294310 100644
--- a/ompi/mca/coll/tuned/Makefile.am
+++ b/ompi/mca/coll/tuned/Makefile.am
@@ -14,10 +14,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 sources = \
         coll_tuned.h \
         coll_tuned_topo.h \
@@ -55,6 +51,10 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_tuned_la_SOURCES = $(sources)
 mca_coll_tuned_la_LDFLAGS = -module -avoid-version
+mca_coll_tuned_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_tuned_la_SOURCES =$(sources)
diff --git a/opal/mca/paffinity/linux/Makefile.am b/opal/mca/paffinity/linux/Makefile.am
index f12acbaeea..10e8634b34 100644
--- a/opal/mca/paffinity/linux/Makefile.am
+++ b/opal/mca/paffinity/linux/Makefile.am
@@ -14,10 +14,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
         paffinity_linux.h \
         paffinity_linux_component.c \
@@ -39,6 +35,8 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_linux_la_SOURCES = $(sources)
 mca_paffinity_linux_la_LDFLAGS = -module -avoid-version
+mca_paffinity_linux_la_LIBADD = \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_paffinity_linux_la_SOURCES =$(sources)
diff --git a/opal/mca/paffinity/solaris/Makefile.am b/opal/mca/paffinity/solaris/Makefile.am
index 27c4dd6950..40ffaa1d86 100644
--- a/opal/mca/paffinity/solaris/Makefile.am
+++ b/opal/mca/paffinity/solaris/Makefile.am
@@ -14,10 +14,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
         paffinity_solaris.h \
         paffinity_solaris_component.c \
@@ -39,6 +35,8 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_solaris_la_SOURCES = $(sources)
 mca_paffinity_solaris_la_LDFLAGS = -module -avoid-version
+mca_paffinity_solaris_la_LIBADD = \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_paffinity_solaris_la_SOURCES =$(sources)
diff --git a/orte/mca/gpr/null/Makefile.am b/orte/mca/gpr/null/Makefile.am
index 07e0e83597..50030d1d9d 100644
--- a/orte/mca/gpr/null/Makefile.am
+++ b/orte/mca/gpr/null/Makefile.am
@@ -14,10 +14,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
         gpr_null_component.c \
         gpr_null.c
@@ -38,6 +34,9 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_gpr_null_la_SOURCES = $(sources)
 mca_gpr_null_la_LDFLAGS = -module -avoid-version
+mca_gpr_null_la_LIBADD = \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_null_la_SOURCES =$(sources)
diff --git a/orte/mca/gpr/proxy/Makefile.am b/orte/mca/gpr/proxy/Makefile.am
index 5d88636988..53601a41b1 100644
--- a/orte/mca/gpr/proxy/Makefile.am
+++ b/orte/mca/gpr/proxy/Makefile.am
@@ -14,10 +14,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
         gpr_proxy_arithmetic_ops.c \
         gpr_proxy_cleanup.c \
@@ -49,6 +45,9 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_gpr_proxy_la_SOURCES = $(sources)
 mca_gpr_proxy_la_LDFLAGS = -module -avoid-version
+mca_gpr_proxy_la_LIBADD = \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_proxy_la_SOURCES =$(sources)
diff --git a/orte/mca/gpr/replica/Makefile.am b/orte/mca/gpr/replica/Makefile.am
index 49927e6743..8afadd8932 100644
--- a/orte/mca/gpr/replica/Makefile.am
+++ b/orte/mca/gpr/replica/Makefile.am
@@ -14,10 +14,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 SUBDIRS = api_layer functional_layer transition_layer communications
 
 # Make the output library in this directory, and name it either
@@ -44,6 +40,9 @@ mca_gpr_replica_la_LIBADD = \
 	functional_layer/libmca_gpr_replica_fn.la \
 	communications/libmca_gpr_replica_comm.la
 mca_gpr_replica_la_LDFLAGS = -module -avoid-version
+mca_gpr_replica_la_LIBADD = \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_replica_la_SOURCES = gpr_replica.h \