Index: test/runtime/Makefile.am =================================================================== --- test/runtime/Makefile.am (revision 19940) +++ test/runtime/Makefile.am (working copy) @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -31,7 +32,7 @@ sigchld_SOURCES = \ sigchld.c sigchld_LDADD = \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a sigchld_DEPENDENCIES = $(sigchld_LDADD) @@ -39,7 +40,7 @@ start_shut_SOURCES = \ start_shut.c start_shut_LDADD = \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a start_shut_DEPENDENCIES = $(start_shut_LDADD) @@ -47,7 +48,7 @@ orte_init_finalize_SOURCES = \ orte_init_finalize.c orte_init_finalize_LDADD = \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la orte_init_finalize_DEPENDENCIES = $(orte_init_finalize_LDADD) Index: test/class/Makefile.am =================================================================== --- test/class/Makefile.am (revision 19940) +++ test/class/Makefile.am (working copy) @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -34,7 +35,7 @@ ompi_bitmap_SOURCES = ompi_bitmap.c ompi_bitmap_LDADD = \ $(top_builddir)/ompi/libmpi.la \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a ompi_bitmap_DEPENDENCIES = $(ompi_bitmap_LDADD) @@ -42,7 +43,7 @@ #ompi_circular_buffer_fifo_SOURCES = ompi_circular_buffer_fifo.c #ompi_circular_buffer_fifo_LDADD = \ # $(top_builddir)/ompi/libmpi.la \ -# $(top_builddir)/orte/libopen-rte.la \ +# $(top_builddir)/orte/libompi-rte.la \ # $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #ompi_circular_buffer_fifo_DEPENDENCIES = $(ompi_circular_buffer_fifo_LDADD) @@ -50,7 +51,7 @@ #ompi_fifo_SOURCES = ompi_fifo.c #ompi_fifo_LDADD = \ # $(top_builddir)/ompi/libmpi.la \ -# $(top_builddir)/orte/libopen-rte.la \ +# $(top_builddir)/orte/libompi-rte.la \ # $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #ompi_fifo_DEPENDENCIES = $(ompi_fifo_LDADD) @@ -70,21 +71,21 @@ opal_pointer_array_SOURCES = opal_pointer_array.c opal_pointer_array_LDADD = \ $(top_builddir)/ompi/libmpi.la \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_pointer_array_DEPENDENCIES = $(opal_pointer_array_LDADD) opal_value_array_SOURCES = opal_value_array.c opal_value_array_LDADD = \ - $(top_builddir)/opal/libopen-pal.la \ + $(top_builddir)/opal/libompi-pal.la \ $(top_builddir)/test/support/libsupport.a opal_value_array_DEPENDENCIES = $(opal_value_array_LDADD) ompi_rb_tree_SOURCES = ompi_rb_tree.c ompi_rb_tree_LDADD = \ $(top_builddir)/ompi/libmpi.la \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a ompi_rb_tree_DEPENDENCIES = $(ompi_rb_tree_LDADD) Index: test/util/Makefile.am =================================================================== --- test/util/Makefile.am (revision 19940) +++ test/util/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -41,7 +42,7 @@ opal_error_SOURCES = opal_error.c opal_error_LDADD = \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la opal_error_DEPENDENCIES = $(opal_error_LDADD) @@ -78,7 +79,7 @@ orte_sys_info_SOURCES = orte_sys_info.c orte_sys_info_LDADD = \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a orte_sys_info_DEPENDENCIES = $(orte_sys_info_LDADD) @@ -91,14 +92,14 @@ orte_session_dir_SOURCES = orte_session_dir.c orte_session_dir_LDADD = \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a orte_session_dir_DEPENDENCIES = $(orte_session_dir_LDADD) orte_universe_setup_file_io_SOURCES = orte_universe_setup_file_io.c orte_universe_setup_file_io_LDADD = \ - $(top_builddir)/orte/libopen-rte.la \ + $(top_builddir)/orte/libompi-rte.la \ $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD) Index: ompi/tools/wrappers/mpif77-wrapper-data.txt.in =================================================================== --- ompi/tools/wrappers/mpif77-wrapper-data.txt.in (revision 19940) +++ ompi/tools/wrappers/mpif77-wrapper-data.txt.in (working copy) @@ -16,7 +16,7 @@ preprocessor_flags= compiler_flags=@OMPI_WRAPPER_EXTRA_FFLAGS@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ -libs=-lmpi_f77 -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ +libs=-lmpi_f77 -lmpi -lompi-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ required_file=@OMPI_WRAPPER_F77_REQUIRED_FILE@ includedir=${includedir} libdir=${libdir} Index: ompi/tools/wrappers/mpicc-wrapper-data.txt.in =================================================================== --- ompi/tools/wrappers/mpicc-wrapper-data.txt.in (revision 19940) +++ ompi/tools/wrappers/mpicc-wrapper-data.txt.in (working copy) @@ -16,7 +16,7 @@ preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@ compiler_flags=@OMPI_WRAPPER_EXTRA_CFLAGS@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ -libs=-lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ +libs=-lmpi -lompi-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ required_file= includedir=${includedir} libdir=${libdir} Index: ompi/tools/wrappers/mpic++-wrapper-data.txt.in =================================================================== --- ompi/tools/wrappers/mpic++-wrapper-data.txt.in (revision 19940) +++ ompi/tools/wrappers/mpic++-wrapper-data.txt.in (working copy) @@ -16,7 +16,7 @@ preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@ compiler_flags=@OMPI_WRAPPER_EXTRA_CXXFLAGS@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ -libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ +libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lompi-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@ includedir=${includedir} libdir=${libdir} Index: ompi/tools/wrappers/mpif90-wrapper-data.txt.in =================================================================== --- ompi/tools/wrappers/mpif90-wrapper-data.txt.in (revision 19940) +++ ompi/tools/wrappers/mpif90-wrapper-data.txt.in (working copy) @@ -17,7 +17,7 @@ preprocessor_flags= compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ -libs=-lmpi_f90 -lmpi_f77 -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ +libs=-lmpi_f90 -lmpi_f77 -lmpi -lompi-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ required_file=@OMPI_WRAPPER_F90_REQUIRED_FILE@ includedir=${includedir} libdir=${libdir} Index: ompi/Makefile.am =================================================================== --- ompi/Makefile.am (revision 19940) +++ ompi/Makefile.am (working copy) @@ -107,7 +107,7 @@ $(f77_base_lib) \ $(MCA_ompi_FRAMEWORK_LIBS) \ $(OMPI_LIBMPI_EXTRA_LIBS) \ - $(top_ompi_builddir)/orte/libopen-rte.la + $(top_ompi_builddir)/orte/libompi-rte.la libmpi_la_DEPENDENCIES = \ datatype/libdatatype.la \ debuggers/libdebuggers.la \ @@ -116,7 +116,7 @@ $(c_pmpi_lib) \ $(f77_base_lib) \ $(MCA_ompi_FRAMEWORK_LIBS) \ - $(top_ompi_builddir)/orte/libopen-rte.la + $(top_ompi_builddir)/orte/libompi-rte.la libmpi_la_LDFLAGS = \ $(OMPI_LIBMPI_EXTRA_LDFLAGS) Index: orte/mca/odls/bproc/Makefile.am =================================================================== --- orte/mca/odls/bproc/Makefile.am (revision 19940) +++ orte/mca/odls/bproc/Makefile.am (working copy) @@ -9,7 +9,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -39,10 +39,7 @@ mcacomponentdir = $(libdir)/openmpi 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) Index: orte/mca/ras/alps/Makefile.am =================================================================== --- orte/mca/ras/alps/Makefile.am (revision 19940) +++ orte/mca/ras/alps/Makefile.am (working copy) @@ -10,6 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008 UT-Battelle, LLC +# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -48,10 +49,7 @@ mcacomponent_LTLIBRARIES = $(component) mca_ras_alps_la_SOURCES = $(component_sources) mca_ras_alps_la_LDFLAGS = -module -avoid-version $(ras_alps_LDFLAGS) -mca_ras_alps_la_LIBADD = \ - $(ras_alps_LIBS) \ - $(top_ompi_builddir)/orte/libopen-rte.la \ - $(top_ompi_builddir)/opal/libopen-pal.la +mca_ras_alps_la_LIBADD = $(ras_alps_LIBS) noinst_LTLIBRARIES = $(lib) libmca_ras_alps_la_SOURCES = $(lib_sources) Index: orte/mca/ras/tm/Makefile.am =================================================================== --- orte/mca/ras/tm/Makefile.am (revision 19940) +++ orte/mca/ras/tm/Makefile.am (working copy) @@ -16,8 +16,6 @@ # $HEADER$ # -# Use the top-level Makefile.options - dist_pkgdata_DATA = help-ras-tm.txt Index: orte/mca/ras/ccp/Makefile.am =================================================================== --- orte/mca/ras/ccp/Makefile.am (revision 19940) +++ orte/mca/ras/ccp/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -16,10 +17,6 @@ # $HEADER$ # -# Use the top-level Makefile.options - - - AM_CPPFLAGS = $(ras_ccp_CPPFLAGS) sources = \ @@ -48,10 +45,7 @@ mcacomponent_LTLIBRARIES = $(component) mca_ras_ccp_la_SOURCES = $(component_sources) mca_ras_ccp_la_LDFLAGS = -module -avoid-version $(ras_ccp_LDFLAGS) -mca_ras_ccp_la_LIBADD = \ - $(ras_ccp_LIBS) \ - $(top_ompi_builddir)/orte/libopen-rte.la \ - $(top_ompi_builddir)/opal/libopen-pal.la +mca_ras_ccp_la_LIBADD = $(ras_ccp_LIBS) noinst_LTLIBRARIES = $(lib) libmca_ras_ccp_la_SOURCES = $(lib_sources) Index: orte/mca/ras/bjs/Makefile.am =================================================================== --- orte/mca/ras/bjs/Makefile.am (revision 19940) +++ orte/mca/ras/bjs/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -16,10 +17,6 @@ # $HEADER$ # -# Use the top-level Makefile.options - - - # Make the output library in this directory, and name it either # mca__.la (for DSO builds) or libmca__.la # (for static builds). @@ -42,10 +39,7 @@ mcacomponentdir = $(libdir)/openmpi 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) Index: orte/mca/plm/alps/Makefile.am =================================================================== --- orte/mca/plm/alps/Makefile.am (revision 19940) +++ orte/mca/plm/alps/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -39,9 +40,6 @@ mcacomponent_LTLIBRARIES = $(component_install) mca_plm_alps_la_SOURCES = $(sources) mca_plm_alps_la_LDFLAGS = -module -avoid-version -mca_plm_alps_la_LIBADD = \ - $(top_ompi_builddir)/orte/libopen-rte.la \ - $(top_ompi_builddir)/opal/libopen-pal.la noinst_LTLIBRARIES = $(component_noinst) libmca_plm_alps_la_SOURCES =$(sources) Index: orte/mca/plm/ccp/Makefile.am =================================================================== --- orte/mca/plm/ccp/Makefile.am (revision 19940) +++ orte/mca/plm/ccp/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -45,10 +46,7 @@ mcacomponent_LTLIBRARIES = $(component) mca_plm_ccp_la_SOURCES = $(component_sources) mca_plm_ccp_la_LDFLAGS = -module -avoid-version $(plm_ccp_LDFLAGS) -mca_plm_ccp_la_LIBADD = \ - $(plm_ccp_LIBS) \ - $(top_ompi_builddir)/orte/libopen-rte.la \ - $(top_ompi_builddir)/opal/libopen-pal.la +mca_plm_ccp_la_LIBADD = $(plm_ccp_LIBS) noinst_LTLIBRARIES = $(lib) libmca_plm_ccp_la_SOURCES = $(lib_sources) Index: orte/mca/plm/bproc/Makefile.am =================================================================== --- orte/mca/plm/bproc/Makefile.am (revision 19940) +++ orte/mca/plm/bproc/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -39,10 +40,7 @@ mcacomponentdir = $(libdir)/openmpi mcacomponent_LTLIBRARIES = $(component_install) mca_plm_bproc_la_SOURCES = $(sources) -mca_plm_bproc_la_LIBADD = \ - $(plm_bproc_LIBS) \ - $(top_ompi_builddir)/orte/libopen-rte.la \ - $(top_ompi_builddir)/opal/libopen-pal.la +mca_plm_bproc_la_LIBADD = $(plm_bproc_LIBS) mca_plm_bproc_la_LDFLAGS = -module -avoid-version $(plm_bproc_LDFLAGS) noinst_LTLIBRARIES = $(component_noinst) Index: orte/mca/plm/xgrid/Makefile.am =================================================================== --- orte/mca/plm/xgrid/Makefile.am (revision 19940) +++ orte/mca/plm/xgrid/Makefile.am (working copy) @@ -16,8 +16,6 @@ # $HEADER$ # -# Use the top-level Makefile.options - AM_CPPFLAGS = -I$(top_ompi_builddir)/include AM_OBJCFLAGS = $(plm_xgrid_OBJCFLAGS) Index: orte/mca/ess/alps/Makefile.am =================================================================== --- orte/mca/ess/alps/Makefile.am (revision 19940) +++ orte/mca/ess/alps/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -16,10 +17,6 @@ # $HEADER$ # -# Use the top-level Makefile.options - - - sources = \ ess_alps.h \ ess_alps_component.c \ @@ -41,9 +38,6 @@ mcacomponent_LTLIBRARIES = $(component_install) mca_ess_alps_la_SOURCES = $(sources) mca_ess_alps_la_LDFLAGS = -module -avoid-version -mca_ess_alps_la_LIBADD = \ - $(top_ompi_builddir)/orte/libopen-rte.la \ - $(top_ompi_builddir)/opal/libopen-pal.la noinst_LTLIBRARIES = $(component_noinst) libmca_ess_alps_la_SOURCES =$(sources) Index: orte/mca/ess/bproc/Makefile.am =================================================================== --- orte/mca/ess/bproc/Makefile.am (revision 19940) +++ orte/mca/ess/bproc/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -16,10 +17,6 @@ # $HEADER$ # -# Use the top-level Makefile.options - - - AM_CPPFLAGS = $(ess_bproc_CPPFLAGS) sources = \ @@ -43,10 +40,7 @@ mcacomponent_LTLIBRARIES = $(component_install) mca_ess_bproc_la_SOURCES = $(sources) mca_ess_bproc_la_LDFLAGS = -module -avoid-version $(ess_bproc_LDFLAGS) -mca_ess_bproc_la_LIBADD = \ - $(ess_bproc_LIBS) \ - $(top_ompi_builddir)/orte/libopen-rte.la \ - $(top_ompi_builddir)/opal/libopen-pal.la +mca_ess_bproc_la_LIBADD = $(ess_bproc_LIBS) noinst_LTLIBRARIES = $(component_noinst) libmca_ess_bproc_la_SOURCES =$(sources) Index: orte/tools/wrappers/ortecc-wrapper-data.txt.in =================================================================== --- orte/tools/wrappers/ortecc-wrapper-data.txt.in (revision 19940) +++ orte/tools/wrappers/ortecc-wrapper-data.txt.in (working copy) @@ -16,7 +16,7 @@ preprocessor_flags=@ORTE_WRAPPER_EXTRA_CPPFLAGS@ compiler_flags=@ORTE_WRAPPER_EXTRA_CFLAGS@ linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@ -libs=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@ +libs=-lompi-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@ required_file= includedir=${includedir} libdir=${libdir} Index: orte/tools/wrappers/ortec++-wrapper-data.txt.in =================================================================== --- orte/tools/wrappers/ortec++-wrapper-data.txt.in (revision 19940) +++ orte/tools/wrappers/ortec++-wrapper-data.txt.in (working copy) @@ -16,7 +16,7 @@ preprocessor_flags=@ORTE_WRAPPER_EXTRA_CPPFLAGS@ compiler_flags=@ORTE_WRAPPER_EXTRA_CXXFLAGS@ linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@ -libs=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@ +libs=-lompi-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@ required_file= includedir=${includedir} libdir=${libdir} Index: orte/tools/orte-iof/Makefile.am =================================================================== --- orte/tools/orte-iof/Makefile.am (revision 19940) +++ orte/tools/orte-iof/Makefile.am (working copy) @@ -40,7 +40,7 @@ endif # OMPI_INSTALL_BINARIES orte_iof_SOURCES = orte-iof.c -orte_iof_LDADD = $(top_builddir)/orte/libopen-rte.la +orte_iof_LDADD = $(top_builddir)/orte/libompi-rte.la endif # !ORTE_DISABLE_FULL_SUPPORT Index: orte/tools/orte-clean/Makefile.am =================================================================== --- orte/tools/orte-clean/Makefile.am (revision 19940) +++ orte/tools/orte-clean/Makefile.am (working copy) @@ -40,7 +40,7 @@ endif # OMPI_INSTALL_BINARIES orte_clean_SOURCES = orte-clean.c -orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la +orte_clean_LDADD = $(top_builddir)/orte/libompi-rte.la endif # !ORTE_DISABLE_FULL_SUPPORT Index: orte/tools/orte-ps/Makefile.am =================================================================== --- orte/tools/orte-ps/Makefile.am (revision 19940) +++ orte/tools/orte-ps/Makefile.am (working copy) @@ -40,7 +40,7 @@ endif # OMPI_INSTALL_BINARIES orte_ps_SOURCES = orte-ps.c -orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la +orte_ps_LDADD = $(top_builddir)/orte/libompi-rte.la endif # !ORTE_DISABLE_FULL_SUPPORT Index: orte/tools/orte-restart/Makefile.am =================================================================== --- orte/tools/orte-restart/Makefile.am (revision 19940) +++ orte/tools/orte-restart/Makefile.am (working copy) @@ -47,7 +47,7 @@ endif # OMPI_INSTALL_BINARIES orte_restart_SOURCES = orte-restart.c -orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la +orte_restart_LDADD = $(top_builddir)/orte/libompi-rte.la endif # WANT_FT endif # ORTE_DISABLE_FULL_SUPPORT Index: orte/tools/orted/Makefile.am =================================================================== --- orte/tools/orted/Makefile.am (revision 19940) +++ orte/tools/orted/Makefile.am (working copy) @@ -45,7 +45,7 @@ # nice for systems that don't have all the shared # libraries on the computes orted_LDFLAGS = -orted_LDADD = $(top_builddir)/orte/libopen-rte.la +orted_LDADD = $(top_builddir)/orte/libompi-rte.la endif # !ORTE_DISABLE_FULL_SUPPORT Index: orte/tools/orte-checkpoint/Makefile.am =================================================================== --- orte/tools/orte-checkpoint/Makefile.am (revision 19940) +++ orte/tools/orte-checkpoint/Makefile.am (working copy) @@ -47,7 +47,7 @@ endif # OMPI_INSTALL_BINARIES orte_checkpoint_SOURCES = orte-checkpoint.c -orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la +orte_checkpoint_LDADD = $(top_builddir)/orte/libompi-rte.la endif # WANT_FT endif # !ORTE_DISABLE_FULL_SUPPORT Index: orte/tools/orterun/Makefile.am =================================================================== --- orte/tools/orterun/Makefile.am (revision 19940) +++ orte/tools/orterun/Makefile.am (working copy) @@ -55,7 +55,7 @@ debuggers.h \ debuggers.c -orterun_LDADD = $(top_builddir)/orte/libopen-rte.la +orterun_LDADD = $(top_builddir)/orte/libompi-rte.la endif # !ORTE_DISABLE_FULL_SUPPORT Index: orte/runtime/Makefile.am =================================================================== --- orte/runtime/Makefile.am (revision 19940) +++ orte/runtime/Makefile.am (working copy) @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -28,7 +29,7 @@ runtime/runtime_internals.h \ runtime/data_type_support/orte_dt_support.h -libopen_rte_la_SOURCES += \ +libompi_rte_la_SOURCES += \ runtime/orte_finalize.c \ runtime/orte_init.c \ runtime/orte_locks.c \ @@ -50,7 +51,7 @@ runtime/orte_cr.h \ runtime/orte_data_server.h -libopen_rte_la_SOURCES += \ +libompi_rte_la_SOURCES += \ runtime/orte_wait.c \ runtime/orte_cr.c \ runtime/orte_data_server.c Index: orte/Makefile.am =================================================================== --- orte/Makefile.am (revision 19940) +++ orte/Makefile.am (working copy) @@ -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) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -32,12 +33,12 @@ # Build the main ORTE library -lib_LTLIBRARIES = libopen-rte.la -libopen_rte_la_SOURCES = -libopen_rte_la_LIBADD = \ +lib_LTLIBRARIES = libompi-rte.la +libompi_rte_la_SOURCES = +libompi_rte_la_LIBADD = \ $(MCA_orte_FRAMEWORK_LIBS) \ $(top_ompi_builddir)/opal/libopen-pal.la -libopen_rte_la_DEPENDENCIES = $(libopen_rte_la_LIBADD) +libompi_rte_la_DEPENDENCIES = $(libompi_rte_la_LIBADD) # included subdirectory Makefile.am's and appended-to variables @@ -45,7 +46,7 @@ noinst_LTLIBRARIES = nobase_orte_HEADERS = dist_pkgdata_DATA = -libopen_rte_la_SOURCES += $(headers) +libompi_rte_la_SOURCES += $(headers) # Conditionally install the header files Index: orte/orted/Makefile.am =================================================================== --- orte/orted/Makefile.am (revision 19940) +++ orte/orted/Makefile.am (working copy) @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -26,7 +27,7 @@ headers += \ orted/orted.h -libopen_rte_la_SOURCES += \ +libompi_rte_la_SOURCES += \ orted/orted_main.c \ orted/orted_comm.c endif Index: orte/util/Makefile.am =================================================================== --- orte/util/Makefile.am (revision 19940) +++ orte/util/Makefile.am (working copy) @@ -10,6 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -43,7 +44,7 @@ util/session_dir.h \ util/show_help.h -libopen_rte_la_SOURCES += \ +libompi_rte_la_SOURCES += \ util/error_strings.c \ util/name_fns.c \ util/proc_info.c \ @@ -62,7 +63,7 @@ util/comm/comm.h \ util/nidmap.h -libopen_rte_la_SOURCES += \ +libompi_rte_la_SOURCES += \ util/context_fns.c \ util/pre_condition_transports.c \ util/hnp_contact.c \