From 4f35b621542a0fba45b6ab52e1750a90d98a7751 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 31 Jan 2012 20:43:27 +0000 Subject: [PATCH] Components should not be linking to top-level libraries -- and definitely should not be linking to more than libmpi.la! (remember that libmpi.la now wholly contains libopen-rte.la, which wholly contains libopen-pal.la). This commit was SVN r25843. --- ompi/mca/fcoll/dynamic/Makefile.am | 5 +---- ompi/mca/fcoll/individual/Makefile.am | 5 +---- ompi/mca/fcoll/static/Makefile.am | 5 +---- ompi/mca/fcoll/two_phase/Makefile.am | 5 +---- ompi/mca/fcoll/ylib/Makefile.am | 5 +---- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/ompi/mca/fcoll/dynamic/Makefile.am b/ompi/mca/fcoll/dynamic/Makefile.am index 1ef3487360..864d94df4a 100644 --- a/ompi/mca/fcoll/dynamic/Makefile.am +++ b/ompi/mca/fcoll/dynamic/Makefile.am @@ -10,6 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2011 University of Houston. All rights reserved. +# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -44,10 +45,6 @@ mcacomponentdir = $(libdir)/openmpi mcacomponent_LTLIBRARIES = $(component_install) mca_fcoll_dynamic_la_SOURCES = $(sources) mca_fcoll_dynamic_la_LDFLAGS = -module -avoid-version -mca_fcoll_dynamic_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_fcoll_dynamic_la_SOURCES =$(sources) diff --git a/ompi/mca/fcoll/individual/Makefile.am b/ompi/mca/fcoll/individual/Makefile.am index b8d594c589..98cc324b66 100644 --- a/ompi/mca/fcoll/individual/Makefile.am +++ b/ompi/mca/fcoll/individual/Makefile.am @@ -10,6 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2011 University of Houston. All rights reserved. +# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -44,10 +45,6 @@ mcacomponentdir = $(libdir)/openmpi mcacomponent_LTLIBRARIES = $(component_install) mca_fcoll_individual_la_SOURCES = $(sources) mca_fcoll_individual_la_LDFLAGS = -module -avoid-version -mca_fcoll_individual_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_fcoll_individual_la_SOURCES =$(sources) diff --git a/ompi/mca/fcoll/static/Makefile.am b/ompi/mca/fcoll/static/Makefile.am index 0994429b23..0934eff0b3 100644 --- a/ompi/mca/fcoll/static/Makefile.am +++ b/ompi/mca/fcoll/static/Makefile.am @@ -10,6 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2011 University of Houston. All rights reserved. +# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -44,10 +45,6 @@ mcacomponentdir = $(libdir)/openmpi mcacomponent_LTLIBRARIES = $(component_install) mca_fcoll_static_la_SOURCES = $(sources) mca_fcoll_static_la_LDFLAGS = -module -avoid-version -mca_fcoll_static_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_fcoll_static_la_SOURCES =$(sources) diff --git a/ompi/mca/fcoll/two_phase/Makefile.am b/ompi/mca/fcoll/two_phase/Makefile.am index 8765563fec..3946b6ac5e 100644 --- a/ompi/mca/fcoll/two_phase/Makefile.am +++ b/ompi/mca/fcoll/two_phase/Makefile.am @@ -10,6 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2011 University of Houston. All rights reserved. +# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -44,10 +45,6 @@ mcacomponentdir = $(libdir)/openmpi mcacomponent_LTLIBRARIES = $(component_install) mca_fcoll_two_phase_la_SOURCES = $(sources) mca_fcoll_two_phase_la_LDFLAGS = -module -avoid-version -mca_fcoll_two_phase_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_fcoll_two_phase_la_SOURCES =$(sources) diff --git a/ompi/mca/fcoll/ylib/Makefile.am b/ompi/mca/fcoll/ylib/Makefile.am index ca4314c38b..24d89b5dfb 100644 --- a/ompi/mca/fcoll/ylib/Makefile.am +++ b/ompi/mca/fcoll/ylib/Makefile.am @@ -10,6 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2011 University of Houston. All rights reserved. +# Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -44,10 +45,6 @@ mcacomponentdir = $(libdir)/openmpi mcacomponent_LTLIBRARIES = $(component_install) mca_fcoll_ylib_la_SOURCES = $(sources) mca_fcoll_ylib_la_LDFLAGS = -module -avoid-version -mca_fcoll_ylib_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_fcoll_ylib_la_SOURCES =$(sources)