Per long threads on the mailing list and much confusion discussion

about linkers, have all OPAL, ORTE, and OMPI components '''not'' link against the OPAL, ORTE, or OMPI libraries. See ttp://www.open-mpi.org/community/lists/users/2007/10/4220.php for details (or https://svn.open-mpi.org/trac/ompi/wiki/Linkers for a better-formatted version of the same info). This commit was SVN r16968.
2007-12-15 13:32:02 +00:00 · 2007-12-15 13:32:02 +00:00 · 213b5d5c6e
--- a/ompi/debuggers/Makefile.am
+++ b/ompi/debuggers/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-
 noinst_LTLIBRARIES = libdebuggers.la
 inst_LTLIBRARIES = libompitv.la

--- a/ompi/mca/allocator/basic/Makefile.am
+++ b/ompi/mca/allocator/basic/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        allocator_basic.c \
        allocator_basic.h 
@ -40,10 +36,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_allocator_basic_la_SOURCES = $(sources)
 mca_allocator_basic_la_LDFLAGS = -module -avoid-version
-mca_allocator_basic_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_allocator_basic_la_SOURCES = $(sources)
--- a/ompi/mca/allocator/bucket/Makefile.am
+++ b/ompi/mca/allocator/bucket/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        allocator_bucket.c \
        allocator_bucket_alloc.c \
@ -41,10 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_allocator_bucket_la_SOURCES = $(sources)
 mca_allocator_bucket_la_LDFLAGS = -module -avoid-version
-mca_allocator_bucket_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_allocator_bucket_la_SOURCES = $(sources)
--- a/ompi/mca/bml/r2/Makefile.am
+++ b/ompi/mca/bml/r2/Makefile.am
@ -14,8 +14,6 @@
 # $HEADER$
 #

-
-
 r2_sources  = \
 	bml_r2.c \
 	bml_r2.h \
@ -39,13 +37,8 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bml_r2_la_SOURCES = $(r2_sources)
-mca_bml_r2_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_bml_r2_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_bml_r2_la_SOURCES = $(r2_sources)
-libmca_bml_r2_la_LIBADD =
 libmca_bml_r2_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/btl/elan/Makefile.am
+++ b/ompi/mca/btl/elan/Makefile.am
@ -9,10 +9,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(btl_elan_CPPFLAGS)

 btl_elan_sources = btl_elan.c btl_elan.h btl_elan_component.c btl_elan_endpoint.c \
@ -33,11 +29,7 @@ endif
 mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_elan_la_SOURCES = $(btl_elan_sources)
-mca_btl_elan_la_LIBADD = \
-    $(btl_elan_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_btl_elan_la_LIBADD = $(btl_elan_LIBS)
 mca_btl_elan_la_LDFLAGS = -module -avoid-version $(btl_elan_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/btl/gm/Makefile.am
+++ b/ompi/mca/btl/gm/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(btl_gm_CPPFLAGS)

 gm_sources = \
@ -48,12 +44,7 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_gm_la_SOURCES = $(gm_sources)
-mca_btl_gm_la_LIBADD = \
-    $(btl_gm_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-        
+mca_btl_gm_la_LIBADD = $(btl_gm_LIBS)
 mca_btl_gm_la_LDFLAGS = -module -avoid-version $(btl_gm_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/btl/mx/Makefile.am
+++ b/ompi/mca/btl/mx/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(btl_mx_CPPFLAGS)

 btl_mx_sources = btl_mx.c btl_mx.h btl_mx_component.c btl_mx_endpoint.c \
@ -42,10 +38,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_mx_la_SOURCES = $(btl_mx_sources)
 mca_btl_mx_la_LIBADD = \
    $(btl_mx_LIBS) \
-    $(top_ompi_builddir)/ompi/mca/common/mx/libmca_common_mx.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+    $(top_ompi_builddir)/ompi/mca/common/mx/libmca_common_mx.la
 mca_btl_mx_la_LDFLAGS = -module -avoid-version $(btl_mx_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/btl/ofud/Makefile.am
+++ b/ompi/mca/btl/ofud/Makefile.am
@ -18,10 +18,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS=$(btl_ofud_CPPFLAGS) 

 sources = \
@ -55,14 +51,9 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_ofud_la_SOURCES = $(component_sources)
 mca_btl_ofud_la_LDFLAGS = -module -avoid-version $(btl_ofud_LDFLAGS) 
-mca_btl_ofud_la_LIBADD = \
-    $(btl_ofud_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-    
+mca_btl_ofud_la_LIBADD = $(btl_ofud_LIBS)

 noinst_LTLIBRARIES = $(lib)
 libmca_btl_ofud_la_SOURCES = $(lib_sources)
 libmca_btl_ofud_la_LDFLAGS= -module -avoid-version $(btl_ofud_LDFLAGS) 
-libmca_btl_ofud_la_LIBADD=$(btl_ofud_LIBS)
+libmca_btl_ofud_la_LIBADD = $(btl_ofud_LIBS)
--- a/ompi/mca/btl/openib/Makefile.am
+++ b/ompi/mca/btl/openib/Makefile.am
@ -17,8 +17,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
 AM_CPPFLAGS = $(btl_openib_CPPFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\"
 AM_LFLAGS = -Pbtl_openib_ini_yy
 LEX_OUTPUT_ROOT = lex.btl_openib_ini_yy
@ -83,11 +81,9 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_openib_la_SOURCES = $(component_sources)
 mca_btl_openib_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS) 
-mca_btl_openib_la_LIBADD = \
-    $(btl_openib_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la
+mca_btl_openib_la_LIBADD = $(btl_openib_LIBS)

 noinst_LTLIBRARIES = $(lib)
 libmca_btl_openib_la_SOURCES = $(lib_sources)
 libmca_btl_openib_la_LDFLAGS= -module -avoid-version $(btl_openib_LDFLAGS) 
-libmca_btl_openib_la_LIBADD=$(btl_openib_LIBS)
+libmca_btl_openib_la_LIBADD = $(btl_openib_LIBS)
--- a/ompi/mca/btl/portals/Makefile.am
+++ b/ompi/mca/btl/portals/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 # 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).
@ -53,10 +49,7 @@ mca_btl_portals_la_SOURCES = $(portals_SOURCES)
 nodist_mca_btl_portals_la_SOURCES = $(portals_nodist_SOURCES)
 mca_btl_portals_la_LIBADD = \
    $(btl_portals_LIBS) \
-    $(top_ompi_builddir)/ompi/mca/common/portals/libmca_common_portals.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+    $(top_ompi_builddir)/ompi/mca/common/portals/libmca_common_portals.la
 mca_btl_portals_la_LDFLAGS = -module -avoid-version $(btl_portals_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/btl/sctp/Makefile.am
+++ b/ompi/mca/btl/sctp/Makefile.am
@ -9,6 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -16,10 +17,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 CFLAGS = $(btl_sctp_CFLAGS)
 AM_CPPFLAGS = $(btl_sctp_CPPFLAGS)

@ -62,14 +59,8 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_sctp_la_SOURCES = $(component_sources)
 mca_btl_sctp_la_LDFLAGS = -module -avoid-version $(btl_sctp_LDFLAGS)
-mca_btl_sctp_la_LIBADD = \
-    $(btl_sctp_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-#mca_btl_sctp_la_CPPFLAGS = $(btl_sctp_CPPFLAGS)
+mca_btl_sctp_la_LIBADD = $(btl_sctp_LIBS)

 noinst_LTLIBRARIES = $(lib)
 libmca_btl_sctp_la_SOURCES = $(lib_sources)
 libmca_btl_sctp_la_LDFLAGS = -module -avoid-version $(btl_sctp_LDFLAGS)
-#libmca_btl_sctp_la_CPPFLAGS = $(btl_sctp_CPPFLAGS)
--- a/ompi/mca/btl/self/Makefile.am
+++ b/ompi/mca/btl/self/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 libmca_btl_self_la_sources = \
    btl_self.c \
    btl_self.h \
@ -43,12 +39,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_self_la_SOURCES = $(libmca_btl_self_la_sources)
 mca_btl_self_la_LDFLAGS = -module -avoid-version
-mca_btl_self_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_btl_self_la_SOURCES = $(libmca_btl_self_la_sources)
 libmca_btl_self_la_LDFLAGS = -module -avoid-version
-libmca_btl_self_la_LIBADD = 
--- a/ompi/mca/btl/sm/Makefile.am
+++ b/ompi/mca/btl/sm/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 libmca_btl_sm_la_sources = \
    btl_sm.c \
    btl_sm.h \
@ -49,12 +45,8 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
 mca_btl_sm_la_LDFLAGS = -module -avoid-version
 mca_btl_sm_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+    $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
 libmca_btl_sm_la_LDFLAGS = -module -avoid-version
-libmca_btl_sm_la_LIBADD = 
--- a/ompi/mca/btl/tcp/Makefile.am
+++ b/ompi/mca/btl/tcp/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
    btl_tcp.c \
    btl_tcp.h \
@ -55,10 +51,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_tcp_la_SOURCES = $(component_sources)
 mca_btl_tcp_la_LDFLAGS = -module -avoid-version
-mca_btl_tcp_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(lib)
 libmca_btl_tcp_la_SOURCES = $(lib_sources)
--- a/ompi/mca/btl/template/Makefile.am
+++ b/ompi/mca/btl/template/Makefile.am
@ -16,12 +16,9 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
 amca_paramdir = $(AMCA_PARAM_SETS_DIR)
 dist_amca_param_DATA = netpipe-btl-template.txt

-
 sources = \
    btl_template.c \
    btl_template.h \
@ -54,10 +51,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_template_la_SOURCES = $(component_sources)
 mca_btl_template_la_LDFLAGS = -module -avoid-version
-mca_btl_template_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(lib)
 libmca_btl_template_la_SOURCES = $(lib_sources)
--- a/ompi/mca/btl/udapl/Makefile.am
+++ b/ompi/mca/btl/udapl/Makefile.am
@ -18,10 +18,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 CFLAGS = $(btl_udapl_CFLAGS)
 AM_CPPFLAGS = $(btl_udapl_CPPFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\"

@ -57,12 +53,7 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_udapl_la_SOURCES = $(udapl_sources)
-mca_btl_udapl_la_LIBADD = \
-    $(btl_udapl_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-        
+mca_btl_udapl_la_LIBADD = $(btl_udapl_LIBS)
 mca_btl_udapl_la_LDFLAGS = -module -avoid-version $(btl_udapl_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/coll/basic/Makefile.am
+++ b/ompi/mca/coll/basic/Makefile.am
@ -53,10 +53,6 @@ mcacomponentdir = $(pkglibdir)
 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/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_basic_la_SOURCES =$(sources)
--- a/ompi/mca/coll/demo/Makefile.am
+++ b/ompi/mca/coll/demo/Makefile.am
@ -16,14 +16,6 @@
 # $HEADER$
 #

-# Need to use our own AUTOMAKE_OPTIONS -- cannot include
-# Makefile.options from main ompi tree because Automake now defers
-# "include" statements until "make" time.  Hence, if we're building
-# this component outside the ompi tree, the include statement will
-# fail.
-
-AUTOMAKE_OPTIONS	= foreign dist-bzip2
-
 # Source files

 sources = \
@ -63,10 +55,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_demo_la_SOURCES = $(sources)
 mca_coll_demo_la_LDFLAGS = -module -avoid-version
-mca_coll_demo_la_LIBADD = \
-        $(top_ompi_builddir)/ompi/libmpi.la \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_demo_la_SOURCES = $(sources)
--- a/ompi/mca/coll/hierarch/Makefile.am
+++ b/ompi/mca/coll/hierarch/Makefile.am
@ -32,10 +32,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_hierarch_la_SOURCES = $(sources)
 mca_coll_hierarch_la_LDFLAGS = -module -avoid-version
-mca_coll_hierarch_la_LIBADD = \
-        $(top_ompi_builddir)/ompi/libmpi.la \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_hierarch_la_SOURCES = $(sources)
--- a/ompi/mca/coll/inter/Makefile.am
+++ b/ompi/mca/coll/inter/Makefile.am
@ -32,10 +32,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_inter_la_SOURCES = $(sources)
 mca_coll_inter_la_LDFLAGS = -module -avoid-version
-mca_coll_inter_la_LIBADD = \
-        $(top_ompi_builddir)/ompi/libmpi.la \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_inter_la_SOURCES = $(sources)
--- a/ompi/mca/coll/libnbc/Makefile.am
+++ b/ompi/mca/coll/libnbc/Makefile.am
@ -58,10 +58,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_libnbc_la_SOURCES = $(sources)
 mca_coll_libnbc_la_LDFLAGS = -module -avoid-version
-mca_coll_libnbc_la_LIBADD = \
-        $(top_ompi_builddir)/ompi/libmpi.la \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_libnbc_la_SOURCES =$(sources)
--- a/ompi/mca/coll/self/Makefile.am
+++ b/ompi/mca/coll/self/Makefile.am
@ -53,10 +53,6 @@ mcacomponentdir = $(pkglibdir)
 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/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_self_la_SOURCES =$(sources)
--- a/ompi/mca/coll/sm/Makefile.am
+++ b/ompi/mca/coll/sm/Makefile.am
@ -59,10 +59,7 @@ 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/libmpi.la \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la
+        $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_sm_la_SOURCES =$(sources)
--- a/ompi/mca/coll/tuned/Makefile.am
+++ b/ompi/mca/coll/tuned/Makefile.am
@ -59,10 +59,6 @@ mcacomponentdir = $(pkglibdir)
 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/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_tuned_la_SOURCES =$(sources)
--- a/ompi/mca/common/sm/Makefile.am
+++ b/ompi/mca/common/sm/Makefile.am
@ -38,10 +38,6 @@
 # Note that building this common component statically and linking
 # against other dynamic components is *not* supported!

-# Use the top-level Makefile.options
-
-
-
 # Header files

 headers = \
--- a/ompi/mca/crcp/coord/Makefile.am
+++ b/ompi/mca/crcp/coord/Makefile.am
@ -39,10 +39,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_crcp_coord_la_SOURCES = $(sources)
 mca_crcp_coord_la_LDFLAGS = -module -avoid-version
-mca_crcp_coord_la_LIBADD = \
-		$(top_ompi_builddir)/ompi/libmpi.la  \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_crcp_coord_la_SOURCES = $(sources)
--- a/ompi/mca/io/romio/Makefile.am
+++ b/ompi/mca/io/romio/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources =
 include src/Makefile.extra

@ -50,11 +46,7 @@ libs = romio/libromio_dist.la
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_io_romio_la_SOURCES = $(component_sources)
-mca_io_romio_la_LIBADD = \
-    $(libs) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_io_romio_la_LIBADD = $(libs)
 mca_io_romio_la_DEPENDENCIES = $(libs)
 mca_io_romio_la_LDFLAGS = -module -avoid-version

--- a/ompi/mca/mpool/rdma/Makefile.am
+++ b/ompi/mca/mpool/rdma/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(mpool_rdma_CPPFLAGS)

 sources = \
@ -50,11 +46,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_rdma_la_SOURCES = $(sources)
 mca_mpool_rdma_la_LDFLAGS = -module -avoid-version
-mca_mpool_rdma_la_LIBADD = \
-    $(mpool_rdma_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_mpool_rdma_la_LIBADD = $(mpool_rdma_LIBS)

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_mpool_rdma_la_SOURCES = $(sources)
--- a/ompi/mca/mpool/sm/Makefile.am
+++ b/ompi/mca/mpool/sm/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
 	mpool_sm.h \
 	mpool_sm_module.c \
@ -45,10 +41,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_sm_la_SOURCES = $(sources)
 mca_mpool_sm_la_LDFLAGS = -module -avoid-version
 mca_mpool_sm_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+    $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_mpool_sm_la_SOURCES = $(sources)
--- a/ompi/mca/mtl/mx/Makefile.am
+++ b/ompi/mca/mtl/mx/Makefile.am
@ -50,10 +50,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_mx_la_SOURCES = $(mtl_mx_sources)
 mca_mtl_mx_la_LIBADD = \
    $(mtl_mx_LIBS) \
-    $(top_ompi_builddir)/ompi/mca/common/mx/libmca_common_mx.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+    $(top_ompi_builddir)/ompi/mca/common/mx/libmca_common_mx.la
 mca_mtl_mx_la_LDFLAGS = -module -avoid-version $(mtl_mx_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/mtl/portals/Makefile.am
+++ b/ompi/mca/mtl/portals/Makefile.am
@ -50,10 +50,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_portals_la_SOURCES = $(local_sources)
 mca_mtl_portals_la_LIBADD = \
    $(mtl_portals_LIBS) \
-    $(top_ompi_builddir)/ompi/mca/common/portals/libmca_common_portals.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+    $(top_ompi_builddir)/ompi/mca/common/portals/libmca_common_portals.la
 mca_mtl_portals_la_LDFLAGS = -module -avoid-version $(mtl_portals_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/mtl/psm/Makefile.am
+++ b/ompi/mca/mtl/psm/Makefile.am
@ -48,11 +48,7 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_psm_la_SOURCES = $(mtl_psm_sources)
-mca_mtl_psm_la_LIBADD = \
-    $(mtl_psm_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_mtl_psm_la_LIBADD = $(mtl_psm_LIBS)
 mca_mtl_psm_la_LDFLAGS = -module -avoid-version $(mtl_psm_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/osc/pt2pt/Makefile.am
+++ b/ompi/mca/osc/pt2pt/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 pt2pt_sources = \
 	osc_pt2pt.h \
 	osc_pt2pt.c \
@ -53,10 +49,8 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_pt2pt_la_SOURCES = $(pt2pt_sources)
-mca_osc_pt2pt_la_LIBADD = 
 mca_osc_pt2pt_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_osc_pt2pt_la_SOURCES = $(pt2pt_sources)
-libmca_osc_pt2pt_la_LIBADD = 
 libmca_osc_pt2pt_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/osc/rdma/Makefile.am
+++ b/ompi/mca/osc/rdma/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 pt2pt_sources = \
 	osc_rdma.h \
 	osc_rdma.c \
@ -50,10 +46,8 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_rdma_la_SOURCES = $(pt2pt_sources)
-mca_osc_rdma_la_LIBADD = 
 mca_osc_rdma_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_osc_rdma_la_SOURCES = $(pt2pt_sources)
-libmca_osc_rdma_la_LIBADD = 
 libmca_osc_rdma_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/cm/Makefile.am
+++ b/ompi/mca/pml/cm/Makefile.am
@ -42,11 +42,7 @@ local_sources = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_cm_la_SOURCES = $(local_sources)
-mca_pml_cm_la_LIBADD = \
-    $(pml_cm_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_pml_cm_la_LIBADD = $(pml_cm_LIBS)
 mca_pml_cm_la_LDFLAGS = -module -avoid-version $(pml_cm_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/pml/crcpw/Makefile.am
+++ b/ompi/mca/pml/crcpw/Makefile.am
@ -34,13 +34,8 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_crcpw_la_SOURCES = $(crcpw_sources)
-mca_pml_crcpw_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_pml_crcpw_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pml_crcpw_la_SOURCES = $(crcpw_sources)
-libmca_pml_crcpw_la_LIBADD =
 libmca_pml_crcpw_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/dr/Makefile.am
+++ b/ompi/mca/pml/dr/Makefile.am
@ -53,13 +53,8 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_dr_la_SOURCES = $(dr_sources)
-mca_pml_dr_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_pml_dr_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pml_dr_la_SOURCES = $(dr_sources)
-libmca_pml_dr_la_LIBADD =
 libmca_pml_dr_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/example/Makefile.am
+++ b/ompi/mca/pml/example/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 # 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).
@ -54,14 +50,9 @@ local_sources = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_example_la_SOURCES = $(local_sources)
-mca_pml_example_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_pml_example_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pml_example_la_SOURCES = $(local_sources)
-libmca_pml_example_la_LIBADD = 
 libmca_pml_example_la_LDFLAGS = -module -avoid-version

--- a/ompi/mca/pml/ob1/Makefile.am
+++ b/ompi/mca/pml/ob1/Makefile.am
@ -54,13 +54,8 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_ob1_la_SOURCES = $(ob1_sources)
-mca_pml_ob1_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_pml_ob1_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pml_ob1_la_SOURCES = $(ob1_sources)
-libmca_pml_ob1_la_LIBADD =
 libmca_pml_ob1_la_LDFLAGS = -module -avoid-version
--- a/ompi/mca/pml/v/Makefile.am
+++ b/ompi/mca/pml/v/Makefile.am
@ -8,10 +8,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 # 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).
@ -37,12 +33,10 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_v_la_SOURCES = $(local_sources)
 mca_pml_v_la_LIBADD = vprotocol/libmca_vprotocol.la
-mca_pml_v_la_CFLAGS = 
 mca_pml_v_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pml_v_la_SOURCES = $(local_sources)
 libmca_pml_v_la_LIBADD = vprotocol/libmca_vprotocol.la
-libmca_pml_v_la_CFLAGS =
 libmca_pml_v_la_LDFLAGS = -module -avoid-version

--- a/ompi/mca/pml/v/vprotocol/example/Makefile.am
+++ b/ompi/mca/pml/v/vprotocol/example/Makefile.am
@ -8,10 +8,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 # Make the output library in this directory, and name it either
 # protocol_<name>.la (for DSO builds) or libprotocol_<name>.la
 # (for static builds).
--- a/ompi/mca/pml/v/vprotocol/pessimist/Makefile.am
+++ b/ompi/mca/pml/v/vprotocol/pessimist/Makefile.am
@ -8,10 +8,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 # Make the output library in this directory, and name it either
 # protocol_<name>.la (for DSO builds) or libprotocol_<name>.la
 # (for static builds).
--- a/ompi/mca/rcache/rb/Makefile.am
+++ b/ompi/mca/rcache/rb/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 sources = \
    rcache_rb.c \
    rcache_rb.h \
@ -49,11 +45,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_rcache_rb_la_SOURCES = $(component_sources)
 mca_rcache_rb_la_LDFLAGS = -module -avoid-version $(rcache_rb_LDFLAGS)
-mca_rcache_rb_la_LIBADD = \
-    $(rcache_rb_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_rcache_rb_la_LIBADD = $(rcache_rb_LIBS)

 noinst_LTLIBRARIES = $(lib)
 libmca_rcache_rb_la_SOURCES = $(lib_sources)
--- a/ompi/mca/rcache/vma/Makefile.am
+++ b/ompi/mca/rcache/vma/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 sources = \
    rcache_vma.c \
    rcache_vma.h \
@ -47,11 +43,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_rcache_vma_la_SOURCES = $(component_sources)
 mca_rcache_vma_la_LDFLAGS = -module -avoid-version $(rcache_vma_LDFLAGS)
-mca_rcache_vma_la_LIBADD = \
-    $(rcache_vma_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_rcache_vma_la_LIBADD = $(rcache_vma_LIBS)

 noinst_LTLIBRARIES = $(lib)
 libmca_rcache_vma_la_SOURCES = $(lib_sources)
--- a/ompi/mca/topo/unity/Makefile.am
+++ b/ompi/mca/topo/unity/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
    topo_unity.h \
    topo_unity_cart_map.c \
@ -46,12 +42,6 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_topo_unity_la_SOURCES = $(component_sources)
-mca_topo_unity_la_LIBADD = \
-    $(LIBMPI_LA) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-
 mca_topo_unity_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(lib)
--- a/opal/mca/crs/blcr/Makefile.am
+++ b/opal/mca/crs/blcr/Makefile.am
@ -40,9 +40,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_crs_blcr_la_SOURCES  = $(sources)
 mca_crs_blcr_la_LDFLAGS  = -module -avoid-version $(crs_blcr_LDFLAGS)
-mca_crs_blcr_la_LIBADD = \
-        $(crs_blcr_LIBS) \
-        $(top_ompi_builddir)/opal/libopen-pal.la
+mca_crs_blcr_la_LIBADD = $(crs_blcr_LIBS)

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_crs_blcr_la_SOURCES = $(sources)
--- a/opal/mca/crs/self/Makefile.am
+++ b/opal/mca/crs/self/Makefile.am
@ -40,8 +40,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_crs_self_la_SOURCES = $(sources)
 mca_crs_self_la_LDFLAGS = -module -avoid-version
-mca_crs_self_la_LIBADD = \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_crs_self_la_SOURCES = $(sources)
--- a/opal/mca/maffinity/first_use/Makefile.am
+++ b/opal/mca/maffinity/first_use/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        maffinity_first_use.h \
        maffinity_first_use_component.c \
@ -41,8 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_maffinity_first_use_la_SOURCES = $(sources)
 mca_maffinity_first_use_la_LDFLAGS = -module -avoid-version
-mca_maffinity_first_use_la_LIBADD = \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_maffinity_first_use_la_SOURCES =$(sources)
--- a/opal/mca/maffinity/libnuma/Makefile.am
+++ b/opal/mca/maffinity/libnuma/Makefile.am
@ -39,9 +39,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_maffinity_libnuma_la_SOURCES = $(sources)
 mca_maffinity_libnuma_la_LDFLAGS = -module -avoid-version $(maffinity_libnuma_LDFLAGS)
-mca_maffinity_libnuma_la_LIBADD = \
-    $(maffinity_libnuma_LIBS) \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_maffinity_libnuma_la_LIBADD = $(maffinity_libnuma_LIBS)

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_maffinity_libnuma_la_SOURCES =$(sources)
--- a/opal/mca/memory/darwin/Makefile.am
+++ b/opal/mca/memory/darwin/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 noinst_LTLIBRARIES = libmca_memory_darwin.la

 # Source code files
--- a/opal/mca/memory/malloc_hooks/Makefile.am
+++ b/opal/mca/memory/malloc_hooks/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 noinst_LTLIBRARIES = libmca_memory_malloc_hooks.la

 # Source code files
--- a/opal/mca/memory/ptmalloc2/Makefile.am
+++ b/opal/mca/memory/ptmalloc2/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 AM_CPPFLAGS = -DMALLOC_DEBUG=0

 if OMPI_HAVE_POSIX_THREADS
--- a/opal/mca/paffinity/linux/Makefile.am
+++ b/opal/mca/paffinity/linux/Makefile.am
@ -44,8 +44,7 @@ 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/mca/paffinity/linux/plpa/src/libplpa/libplpa_included.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la
+        $(top_ompi_builddir)/opal/mca/paffinity/linux/plpa/src/libplpa/libplpa_included.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_paffinity_linux_la_SOURCES =$(sources)
--- a/opal/mca/paffinity/solaris/Makefile.am
+++ b/opal/mca/paffinity/solaris/Makefile.am
@ -37,8 +37,6 @@ mcacomponentdir = $(pkglibdir)
 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/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_paffinity_solaris_la_SOURCES =$(sources)
--- a/opal/mca/paffinity/windows/Makefile.am
+++ b/opal/mca/paffinity/windows/Makefile.am
@ -37,8 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_windows_la_SOURCES = $(sources)
 mca_paffinity_windows_la_LDFLAGS = -module -avoid-version
-mca_paffinity_windows_la_LIBADD = \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_paffinity_windows_la_SOURCES =$(sources)
--- a/opal/mca/timer/aix/Makefile.am
+++ b/opal/mca/timer/aix/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 noinst_LTLIBRARIES = libmca_timer_aix.la

 libmca_timer_aix_la_SOURCES = \
--- a/opal/mca/timer/altix/Makefile.am
+++ b/opal/mca/timer/altix/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 noinst_LTLIBRARIES = libmca_timer_altix.la

 libmca_timer_altix_la_SOURCES = \
--- a/opal/mca/timer/darwin/Makefile.am
+++ b/opal/mca/timer/darwin/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 noinst_LTLIBRARIES = libmca_timer_darwin.la

 libmca_timer_darwin_la_SOURCES = \
--- a/opal/mca/timer/linux/Makefile.am
+++ b/opal/mca/timer/linux/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 noinst_LTLIBRARIES = libmca_timer_linux.la

 libmca_timer_linux_la_SOURCES = \
--- a/opal/mca/timer/solaris/Makefile.am
+++ b/opal/mca/timer/solaris/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 noinst_LTLIBRARIES = libmca_timer_solaris.la

 libmca_timer_solaris_la_SOURCES = \
--- a/opal/mca/timer/windows/Makefile.am
+++ b/opal/mca/timer/windows/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-
-
 noinst_LTLIBRARIES = libmca_timer_windows.la

 libmca_timer_windows_la_SOURCES = \
--- a/orte/mca/errmgr/bproc/Makefile.am
+++ b/orte/mca/errmgr/bproc/Makefile.am
@ -39,10 +39,7 @@ sources = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_errmgr_bproc_la_SOURCES = $(sources)
-mca_errmgr_bproc_la_LIBADD = \
-    $(errmgr_bproc_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_errmgr_bproc_la_LIBS = $(errmgr_bproc_LIBS)
 mca_errmgr_bproc_la_LDFLAGS = -module -avoid-version $(errmgr_bproc_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/errmgr/hnp/Makefile.am
+++ b/orte/mca/errmgr/hnp/Makefile.am
@ -37,9 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_errmgr_hnp_la_SOURCES = $(sources)
 mca_errmgr_hnp_la_LDFLAGS = -module -avoid-version
-mca_errmgr_hnp_la_LIBADD = \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_errmgr_hnp_la_SOURCES =$(sources)
--- a/orte/mca/errmgr/orted/Makefile.am
+++ b/orte/mca/errmgr/orted/Makefile.am
@ -37,9 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_errmgr_orted_la_SOURCES = $(sources)
 mca_errmgr_orted_la_LDFLAGS = -module -avoid-version
-mca_errmgr_orted_la_LIBADD = \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_errmgr_orted_la_SOURCES =$(sources)
--- a/orte/mca/errmgr/proxy/Makefile.am
+++ b/orte/mca/errmgr/proxy/Makefile.am
@ -37,9 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_errmgr_proxy_la_SOURCES = $(sources)
 mca_errmgr_proxy_la_LDFLAGS = -module -avoid-version
-mca_errmgr_proxy_la_LIBADD = \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_errmgr_proxy_la_SOURCES =$(sources)
--- a/orte/mca/filem/rsh/Makefile.am
+++ b/orte/mca/filem/rsh/Makefile.am
@ -37,9 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_filem_rsh_la_SOURCES = $(sources)
 mca_filem_rsh_la_LDFLAGS = -module -avoid-version
-mca_filem_rsh_la_LIBADD = \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_filem_rsh_la_SOURCES = $(sources)
--- a/orte/mca/gpr/null/Makefile.am
+++ b/orte/mca/gpr/null/Makefile.am
@ -37,9 +37,6 @@ mcacomponentdir = $(pkglibdir)
 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/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_null_la_SOURCES =$(sources)
--- a/orte/mca/gpr/proxy/Makefile.am
+++ b/orte/mca/gpr/proxy/Makefile.am
@ -47,9 +47,6 @@ mcacomponentdir = $(pkglibdir)
 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/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_proxy_la_SOURCES =$(sources)
--- a/orte/mca/gpr/replica/Makefile.am
+++ b/orte/mca/gpr/replica/Makefile.am
@ -40,9 +40,7 @@ mca_gpr_replica_la_LIBADD = \
 	api_layer/libmca_gpr_replica_api.la \
 	transition_layer/libmca_gpr_replica_tl.la \
 	functional_layer/libmca_gpr_replica_fn.la \
-	communications/libmca_gpr_replica_comm.la \
-        $(top_ompi_builddir)/orte/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la
+	communications/libmca_gpr_replica_comm.la
 mca_gpr_replica_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/grpcomm/basic/Makefile.am
+++ b/orte/mca/grpcomm/basic/Makefile.am
@ -37,9 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_grpcomm_basic_la_SOURCES = $(sources)
 mca_grpcomm_basic_la_LDFLAGS = -module -avoid-version
-mca_grpcomm_basic_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_grpcomm_basic_la_SOURCES =$(sources)
--- a/orte/mca/grpcomm/cnos/Makefile.am
+++ b/orte/mca/grpcomm/cnos/Makefile.am
@ -37,9 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_grpcomm_cnos_la_SOURCES = $(sources)
 mca_grpcomm_cnos_la_LDFLAGS = -module -avoid-version
-mca_grpcomm_cnos_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_grpcomm_cnos_la_SOURCES =$(sources)
--- a/orte/mca/iof/null/Makefile.am
+++ b/orte/mca/iof/null/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 # 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).
@ -40,9 +36,6 @@ null_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_iof_null_la_SOURCES = $(null_SOURCES)
-mca_iof_null_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_iof_null_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/iof/proxy/Makefile.am
+++ b/orte/mca/iof/proxy/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 # 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).
@ -42,9 +38,6 @@ proxy_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_iof_proxy_la_SOURCES = $(proxy_SOURCES)
-mca_iof_proxy_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_iof_proxy_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/iof/svc/Makefile.am
+++ b/orte/mca/iof/svc/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 # 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).
@ -46,9 +42,6 @@ svc_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_iof_svc_la_SOURCES = $(svc_SOURCES)
-mca_iof_svc_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_iof_svc_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/ns/proxy/Makefile.am
+++ b/orte/mca/ns/proxy/Makefile.am
@ -40,9 +40,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ns_proxy_la_SOURCES = $(sources)
 mca_ns_proxy_la_LDFLAGS = -module -avoid-version
-mca_ns_proxy_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_ns_proxy_la_SOURCES =$(sources)
--- a/orte/mca/ns/replica/Makefile.am
+++ b/orte/mca/ns/replica/Makefile.am
@ -45,9 +45,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ns_replica_la_SOURCES = $(sources)
 mca_ns_replica_la_LDFLAGS = -module -avoid-version
-mca_ns_replica_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_ns_replica_la_SOURCES =$(sources)
--- a/orte/mca/odls/bproc/Makefile.am
+++ b/orte/mca/odls/bproc/Makefile.am
@ -39,10 +39,7 @@ sources = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_odls_bproc_la_SOURCES = $(sources)
-mca_odls_bproc_la_LIBADD = \
-    $(odls_bproc_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_odls_bproc_la_LIBADD = $(odls_bproc_LIBS)
 mca_odls_bproc_la_LDFLAGS = -module -avoid-version $(odls_bproc_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/odls/default/Makefile.am
+++ b/orte/mca/odls/default/Makefile.am
@ -39,9 +39,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_odls_default_la_SOURCES = $(sources)
 mca_odls_default_la_LDFLAGS = -module -avoid-version
-mca_odls_default_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_odls_default_la_SOURCES =$(sources)
--- a/orte/mca/odls/process/Makefile.am
+++ b/orte/mca/odls/process/Makefile.am
@ -9,9 +9,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
 dist_pkgdata_DATA = help-orte-odls-process.txt

 sources = \
@ -35,9 +32,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_odls_process_la_SOURCES = $(sources)
 mca_odls_process_la_LDFLAGS = -module -avoid-version
-mca_odls_process_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_odls_process_la_SOURCES =$(sources)
--- a/orte/mca/oob/tcp/Makefile.am
+++ b/orte/mca/oob/tcp/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
    oob_tcp.c \
    oob_tcp.h \
@ -49,10 +45,6 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_oob_tcp_la_SOURCES = $(sources)
-mca_oob_tcp_la_LIBADD = \
-    $(LIBOMPI_LA) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_oob_tcp_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/pls/bproc/Makefile.am
+++ b/orte/mca/pls/bproc/Makefile.am
@ -39,10 +39,7 @@ sources = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_bproc_la_SOURCES = $(sources)
-mca_pls_bproc_la_LIBADD = \
-    $(pls_bproc_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_pls_bproc_la_LIBADD = $(pls_bproc_LIBS)
 mca_pls_bproc_la_LDFLAGS = -module -avoid-version $(pls_bproc_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/pls/cnos/Makefile.am
+++ b/orte/mca/pls/cnos/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 # 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).
@ -38,12 +34,8 @@ cnos_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_cnos_la_SOURCES = $(cnos_SOURCES)
-mca_pls_cnos_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_pls_cnos_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pls_cnos_la_SOURCES = $(cnos_SOURCES)
-libmca_pls_cnos_la_LIBADD =
 libmca_pls_cnos_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/pls/gridengine/Makefile.am
+++ b/orte/mca/pls/gridengine/Makefile.am
@ -41,9 +41,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_gridengine_la_SOURCES = $(sources)
 mca_pls_gridengine_la_LDFLAGS = -module -avoid-version
-mca_pls_gridengine_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pls_gridengine_la_SOURCES =$(sources)
--- a/orte/mca/pls/lsf/Makefile.am
+++ b/orte/mca/pls/lsf/Makefile.am
@ -46,10 +46,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_pls_lsf_la_SOURCES = $(component_sources)
 mca_pls_lsf_la_LDFLAGS = -module -avoid-version $(pls_lsf_LDFLAGS)
-mca_pls_lsf_la_LIBADD = \
-    $(pls_lsf_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_pls_lsf_la_LIBADD = $(pls_lsf_LIBS)

 noinst_LTLIBRARIES = $(lib)
 libmca_pls_lsf_la_SOURCES = $(lib_sources)
--- a/orte/mca/pls/poe/Makefile.am
+++ b/orte/mca/pls/poe/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        pls_poe.h \
        pls_poe_component.c \
@ -41,9 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_poe_la_SOURCES = $(sources)
 mca_pls_poe_la_LDFLAGS = -module -avoid-version
-mca_pls_poe_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pls_poe_la_SOURCES =$(sources)
--- a/orte/mca/pls/proxy/Makefile.am
+++ b/orte/mca/pls/proxy/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 # 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).
@ -40,12 +36,8 @@ proxy_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_proxy_la_SOURCES = $(proxy_SOURCES)
-mca_pls_proxy_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_pls_proxy_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pls_proxy_la_SOURCES = $(proxy_SOURCES)
-libmca_pls_proxy_la_LIBADD =
 libmca_pls_proxy_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/pls/rsh/Makefile.am
+++ b/orte/mca/pls/rsh/Makefile.am
@ -39,9 +39,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_rsh_la_SOURCES = $(sources)
 mca_pls_rsh_la_LDFLAGS = -module -avoid-version
-mca_pls_rsh_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pls_rsh_la_SOURCES =$(sources)
--- a/orte/mca/pls/slurm/Makefile.am
+++ b/orte/mca/pls/slurm/Makefile.am
@ -39,9 +39,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_slurm_la_SOURCES = $(sources)
 mca_pls_slurm_la_LDFLAGS = -module -avoid-version
-mca_pls_slurm_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pls_slurm_la_SOURCES =$(sources)
--- a/orte/mca/pls/submit/Makefile.am
+++ b/orte/mca/pls/submit/Makefile.am
@ -39,9 +39,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_rsh_la_SOURCES = $(sources)
 mca_pls_rsh_la_LDFLAGS = -module -avoid-version
-mca_pls_rsh_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pls_rsh_la_SOURCES =$(sources)
--- a/orte/mca/pls/tm/Makefile.am
+++ b/orte/mca/pls/tm/Makefile.am
@ -45,10 +45,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_pls_tm_la_SOURCES = $(component_sources)
 mca_pls_tm_la_LDFLAGS = -module -avoid-version $(pls_tm_LDFLAGS)
-mca_pls_tm_la_LIBADD = \
-    $(pls_tm_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_pls_tm_la_LIBADD = $(pls_tm_LIBS)

 noinst_LTLIBRARIES = $(lib)
 libmca_pls_tm_la_SOURCES = $(lib_sources)
--- a/orte/mca/pls/xcpu/Makefile.am
+++ b/orte/mca/pls/xcpu/Makefile.am
@ -39,10 +39,7 @@ sources = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_xcpu_la_SOURCES = $(sources)
-mca_pls_xcpu_la_LIBADD = \
-    $(pls_xcpu_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_pls_xcpu_la_LIBADD = $(pls_xcpu_LIBS)
 mca_pls_xcpu_la_LDFLAGS = -module -avoid-version $(pls_xcpu_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/pls/xgrid/Makefile.am
+++ b/orte/mca/pls/xgrid/Makefile.am
@ -16,8 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
 AM_CPPFLAGS = -I$(top_ompi_builddir)/include 
 AM_OBJCFLAGS = $(pls_xgrid_OBJCFLAGS)

@ -51,12 +49,8 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pls_xgrid_la_SOURCES = $(xgrid_sources)
-mca_pls_xgrid_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_pls_xgrid_la_LDFLAGS = -module -avoid-version $(pls_xgrid_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pls_xgrid_la_SOURCES = $(xgrid_sources)
-libmca_pls_xgrid_la_LIBADD = 
 libmca_pls_xgrid_la_LDFLAGS = -module -avoid-version $(pls_xgrid_LDFLAGS)
--- a/orte/mca/ras/bjs/Makefile.am
+++ b/orte/mca/ras/bjs/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 # 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).
@ -42,10 +38,7 @@ proxy_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_bjs_la_SOURCES = $(proxy_SOURCES)
-mca_ras_bjs_la_LIBADD = \
-    $(ras_bjs_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_ras_bjs_la_LIBADD = $(ras_bjs_LIBS)
 mca_ras_bjs_la_LDFLAGS = -module -avoid-version $(ras_bjs_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/ras/bproc_raw/Makefile.am
+++ b/orte/mca/ras/bproc_raw/Makefile.am
@ -16,11 +16,8 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
 dist_pkgdata_DATA = help-ras-bproc-raw.txt

-
 # 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).
@ -43,10 +40,7 @@ proxy_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_bproc_raw_la_SOURCES = $(proxy_SOURCES)
-mca_ras_bproc_raw_la_LIBADD = \
-    $(ras_bproc_raw_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_ras_bproc_raw_la_LIBADD = $(ras_bproc_raw_LIBS)
 mca_ras_bproc_raw_la_LDFLAGS = -module -avoid-version $(ras_bproc_raw_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/ras/dash_host/Makefile.am
+++ b/orte/mca/ras/dash_host/Makefile.am
@ -36,12 +36,8 @@ dash_host_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_dash_host_la_SOURCES = $(dash_host_SOURCES)
-mca_ras_dash_host_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_ras_dash_host_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_ras_dash_host_la_SOURCES = $(dash_host_SOURCES)
-libmca_ras_dash_host_la_LIBADD =
 libmca_ras_dash_host_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/ras/gridengine/Makefile.am
+++ b/orte/mca/ras/gridengine/Makefile.am
@ -41,9 +41,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_gridengine_la_SOURCES = $(sources)
 mca_ras_gridengine_la_LDFLAGS = -module -avoid-version
-mca_ras_gridengine_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_ras_gridengine_la_SOURCES =$(sources)
--- a/orte/mca/ras/lanl_bproc/Makefile.am
+++ b/orte/mca/ras/lanl_bproc/Makefile.am
@ -16,12 +16,8 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
 dist_pkgdata_DATA = help-ras-lanl-bproc.txt

-
-
 # 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).
@ -44,10 +40,7 @@ proxy_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_lanl_bproc_la_SOURCES = $(proxy_SOURCES)
-mca_ras_lanl_bproc_la_LIBADD = \
-    $(ras_lanl_bproc_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_ras_lanl_bproc_la_LIBADD = $(ras_lanl_bproc_LIBS)
 mca_ras_lanl_bproc_la_LDFLAGS = -module -avoid-version $(ras_lanl_bproc_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/orte/mca/ras/loadleveler/Makefile.am
+++ b/orte/mca/ras/loadleveler/Makefile.am
@ -16,10 +16,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(ras_loadleveler_CPPFLAGS)

 sources = \
@ -48,10 +44,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_ras_loadleveler_la_SOURCES = $(component_sources)
 mca_ras_loadleveler_la_LDFLAGS = -module -avoid-version $(ras_loadleveler_LDFLAGS)
-mca_ras_loadleveler_la_LIBADD = \
-    $(ras_loadleveler_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_ras_loadleveler_la_LIBADD = $(ras_loadleveler_LIBS)

 noinst_LTLIBRARIES = $(lib)
 libmca_ras_loadleveler_la_SOURCES = $(lib_sources)
--- a/orte/mca/ras/localhost/Makefile.am
+++ b/orte/mca/ras/localhost/Makefile.am
@ -36,12 +36,8 @@ localhost_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_localhost_la_SOURCES = $(localhost_SOURCES)
-mca_ras_localhost_la_LIBADD = \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_ras_localhost_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_ras_localhost_la_SOURCES = $(localhost_SOURCES)
-libmca_ras_localhost_la_LIBADD =
 libmca_ras_localhost_la_LDFLAGS = -module -avoid-version
--- a/orte/mca/ras/lsf/Makefile.am
+++ b/orte/mca/ras/lsf/Makefile.am
@ -17,11 +17,8 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
 dist_pkgdata_DATA = help-ras-lsf.txt

-
 # 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).
@ -44,10 +41,7 @@ proxy_SOURCES = \
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ras_lsf_la_SOURCES = $(proxy_SOURCES)
-mca_ras_lsf_la_LIBADD = \
-    $(ras_lsf_LIBS) \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_ras_lsf_la_LIBADD = $(ras_lsf_LIBS)
 mca_ras_lsf_la_LDFLAGS = -module -avoid-version $(ras_lsf_LDFLAGS)

 noinst_LTLIBRARIES = $(component_noinst)
--- a/Показать больше
+++ b/Показать больше