From 01fd96bfa5637d8235b8f08a7cba168d330e5f02 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 21 Oct 2014 14:59:07 -0700 Subject: [PATCH] Revert "Provide a mechanism by which an upstream project can rename the OPAL and ORTE libraries. This is required by projects such as ORCM that have their own ORTE and OPAL libraries in order to avoid library confusion. By renaming their version of the libraries, the OMPI applications can correctly dynamically load the correct one for their build." This reverts commit 63f619f8719fb853d76130d667f228b0a523bd60. --- configure.ac | 6 +---- ompi/Makefile.am | 4 +-- ompi/mca/rte/orte/Makefile.am | 2 +- ompi/tools/mpisync/Makefile.am | 4 +-- ompi/tools/ompi_info/Makefile.am | 4 +-- .../tools/wrappers/mpic++-wrapper-data.txt.in | 2 +- ompi/tools/wrappers/mpicc-wrapper-data.txt.in | 2 +- .../wrappers/mpifort-wrapper-data.txt.in | 2 +- ompi/tools/wrappers/ompi_wrapper_script.in | 2 +- opal/Makefile.am | 12 ++++----- opal/class/Makefile.am | 2 +- opal/dss/Makefile.am | 2 +- opal/memoryhooks/Makefile.am | 2 +- opal/runtime/Makefile.am | 2 +- opal/threads/Makefile.am | 2 +- opal/tools/opal-checkpoint/Makefile.am | 2 +- opal/tools/opal-restart/Makefile.am | 2 +- opal/tools/wrappers/Makefile.am | 2 +- opal/tools/wrappers/opal.pc.in | 2 +- .../wrappers/opalc++-wrapper-data.txt.in | 8 +++--- .../tools/wrappers/opalcc-wrapper-data.txt.in | 8 +++--- orte/Makefile.am | 14 +++++----- orte/orted/Makefile.am | 2 +- orte/orted/pmix/Makefile.am | 2 +- orte/runtime/Makefile.am | 2 +- orte/tools/orte-checkpoint/Makefile.am | 2 +- orte/tools/orte-clean/Makefile.am | 2 +- orte/tools/orte-info/Makefile.am | 2 +- orte/tools/orte-migrate/Makefile.am | 2 +- orte/tools/orte-ps/Makefile.am | 2 +- orte/tools/orte-restart/Makefile.am | 2 +- orte/tools/orte-server/Makefile.am | 2 +- orte/tools/orte-top/Makefile.am | 2 +- orte/tools/orted/Makefile.am | 2 +- orte/tools/orterun/Makefile.am | 2 +- orte/tools/wrappers/orte_wrapper_script.in | 2 +- .../tools/wrappers/ortecc-wrapper-data.txt.in | 6 ++--- orte/util/Makefile.am | 2 +- oshmem/tools/oshmem_info/Makefile.am | 4 +-- test/class/Makefile.am | 12 ++++----- test/datatype/Makefile.am | 2 +- test/event/Makefile.am | 6 ++--- test/runtime/Makefile.am | 8 +++--- test/threads/Makefile.am | 4 +-- test/util/Makefile.am | 26 +++++++++---------- 45 files changed, 91 insertions(+), 95 deletions(-) diff --git a/configure.ac b/configure.ac index 79c7724e88..c54f601102 100644 --- a/configure.ac +++ b/configure.ac @@ -1406,8 +1406,6 @@ opalincludedir='${includedir}/openmpi' AC_SUBST(opaldatadir) AC_SUBST(opallibdir) AC_SUBST(opalincludedir) -OPAL_LIB="open-pal" -AC_SUBST(OPAL_LIB) m4_ifdef([project_orte], [ortedatadir="$opaldatadir" @@ -1415,9 +1413,7 @@ m4_ifdef([project_orte], ortelibdir="$opallibdir" AC_SUBST(ortelibdir) orteincludedir="$opalincludedir" - AC_SUBST(orteincludedir) - ORTE_LIB="open-rte" - AC_SUBST(ORTE_LIB)]) + AC_SUBST(orteincludedir)]) m4_ifdef([project_ompi], [ompidatadir="$opaldatadir" AC_SUBST(ompidatadir) diff --git a/ompi/Makefile.am b/ompi/Makefile.am index b8868c06c6..947c23cf11 100644 --- a/ompi/Makefile.am +++ b/ompi/Makefile.am @@ -145,10 +145,10 @@ libmpi_la_LIBADD = \ if OMPI_RTE_ORTE libmpi_la_LIBADD += \ - $(OMPI_TOP_BUILDDIR)/orte/lib@ORTE_LIB@.la + $(OMPI_TOP_BUILDDIR)/orte/libopen-rte.la endif libmpi_la_LIBADD += \ - $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB@.la + $(OMPI_TOP_BUILDDIR)/opal/libopen-pal.la libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD) libmpi_la_LDFLAGS = \ -version-info $(libmpi_so_version) \ diff --git a/ompi/mca/rte/orte/Makefile.am b/ompi/mca/rte/orte/Makefile.am index 051a3341d1..6e41f04906 100644 --- a/ompi/mca/rte/orte/Makefile.am +++ b/ompi/mca/rte/orte/Makefile.am @@ -24,7 +24,7 @@ endif noinst_LTLIBRARIES = libmca_rte_orte.la libmca_rte_orte_la_SOURCES =$(sources) $(headers) libmca_rte_orte_la_LDFLAGS = -module -avoid-version -libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB@.la +libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/libopen-rte.la man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1 ompi-top.1 ompi-server.1 diff --git a/ompi/tools/mpisync/Makefile.am b/ompi/tools/mpisync/Makefile.am index 4208f8f61c..ce32bc4ac1 100644 --- a/ompi/tools/mpisync/Makefile.am +++ b/ompi/tools/mpisync/Makefile.am @@ -71,9 +71,9 @@ mpisync_SOURCES = \ mpisync_LDADD = $(top_builddir)/ompi/libmpi.la if OMPI_RTE_ORTE -mpisync_LDADD += $(top_builddir)/orte/lib@ORTE_LIB@.la +mpisync_LDADD += $(top_builddir)/orte/libopen-rte.la endif -mpisync_LDADD += $(top_builddir)/opal/lib@OPAL_LIB@.la +mpisync_LDADD += $(top_builddir)/opal/libopen-pal.la clean-local: test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY) diff --git a/ompi/tools/ompi_info/Makefile.am b/ompi/tools/ompi_info/Makefile.am index c93a2bbc00..de9d1e6097 100644 --- a/ompi/tools/ompi_info/Makefile.am +++ b/ompi/tools/ompi_info/Makefile.am @@ -63,9 +63,9 @@ ompi_info_SOURCES = \ ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la if OMPI_RTE_ORTE -ompi_info_LDADD += $(top_builddir)/orte/lib@ORTE_LIB@.la +ompi_info_LDADD += $(top_builddir)/orte/libopen-rte.la endif -ompi_info_LDADD += $(top_builddir)/opal/lib@OPAL_LIB@.la +ompi_info_LDADD += $(top_builddir)/opal/libopen-pal.la clean-local: test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY) diff --git a/ompi/tools/wrappers/mpic++-wrapper-data.txt.in b/ompi/tools/wrappers/mpic++-wrapper-data.txt.in index f46c869413..d51f9f090d 100644 --- a/ompi/tools/wrappers/mpic++-wrapper-data.txt.in +++ b/ompi/tools/wrappers/mpic++-wrapper-data.txt.in @@ -21,7 +21,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ # pulled in implicitly) because we intend MPI applications to only use # the MPI API. libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi -libs_static=@OMPI_WRAPPER_CXX_LIB@ -lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ @OMPI_WRAPPER_EXTRA_LIBS@ +libs_static=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@ static_lib_file=libmpi.a required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@ diff --git a/ompi/tools/wrappers/mpicc-wrapper-data.txt.in b/ompi/tools/wrappers/mpicc-wrapper-data.txt.in index b479c51556..8946f3acf4 100644 --- a/ompi/tools/wrappers/mpicc-wrapper-data.txt.in +++ b/ompi/tools/wrappers/mpicc-wrapper-data.txt.in @@ -21,7 +21,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ # pulled in implicitly) because we intend MPI applications to only use # the MPI API. libs=-lmpi -libs_static=-lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ @OMPI_WRAPPER_EXTRA_LIBS@ +libs_static=-lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@ static_lib_file=libmpi.a required_file= diff --git a/ompi/tools/wrappers/mpifort-wrapper-data.txt.in b/ompi/tools/wrappers/mpifort-wrapper-data.txt.in index 64567209dc..3eafc773fa 100644 --- a/ompi/tools/wrappers/mpifort-wrapper-data.txt.in +++ b/ompi/tools/wrappers/mpifort-wrapper-data.txt.in @@ -20,7 +20,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ # pulled in implicitly) because we intend MPI applications to only use # the MPI API. libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ @OMPI_WRAPPER_EXTRA_LIBS@ +libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@ static_lib_file=libmpi.a required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@ diff --git a/ompi/tools/wrappers/ompi_wrapper_script.in b/ompi/tools/wrappers/ompi_wrapper_script.in index d8d8a6b62b..47f59027fa 100644 --- a/ompi/tools/wrappers/ompi_wrapper_script.in +++ b/ompi/tools/wrappers/ompi_wrapper_script.in @@ -62,7 +62,7 @@ my $linker_flags = $libdir_flag . $libdir . " " . $extra_ldflags; # pulled in implicitly) because we intend MPI applications to only use # the MPI API. my $libs = "-lmpi " . $extra_libs; -my $libs_static = "-lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ " . $extra_libs; +my $libs_static = "-lmpi -lopen-rte -lopen-pal " . $extra_libs; my $have_dynamic = 0; if (-e $libdir . "/libmpi." . $dynamic_lib_suffix) { diff --git a/opal/Makefile.am b/opal/Makefile.am index ca9933971b..7a49910492 100644 --- a/opal/Makefile.am +++ b/opal/Makefile.am @@ -46,23 +46,23 @@ DIST_SUBDIRS = \ # Build the main OPAL library -lib_LTLIBRARIES = lib@OPAL_LIB@.la -lib@OPAL_LIB@_la_SOURCES = -lib@OPAL_LIB@_la_LIBADD = \ +lib_LTLIBRARIES = libopen-pal.la +libopen_pal_la_SOURCES = +libopen_pal_la_LIBADD = \ $(LIBLTDL) \ asm/libasm.la \ datatype/libdatatype.la \ mca/base/libmca_base.la \ util/libopalutil.la \ $(MCA_opal_FRAMEWORK_LIBS) -lib@OPAL_LIB@_la_DEPENDENCIES = $(lib@OPAL_LIB@_la_LIBADD) -lib@OPAL_LIB@_la_LDFLAGS = -version-info $(libopen_pal_so_version) +libopen_pal_la_DEPENDENCIES = $(libopen_pal_la_LIBADD) +libopen_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version) # included subdirectory Makefile.am's and appended-to variables headers = noinst_LTLIBRARIES = dist_opaldata_DATA = -lib@OPAL_LIB@_la_SOURCES += $(headers) +libopen_pal_la_SOURCES += $(headers) # Conditionally install the header files diff --git a/opal/class/Makefile.am b/opal/class/Makefile.am index 32de133af7..08238e8340 100644 --- a/opal/class/Makefile.am +++ b/opal/class/Makefile.am @@ -37,7 +37,7 @@ headers += \ class/opal_rb_tree.h \ class/ompi_free_list.h -lib@OPAL_LIB@_la_SOURCES += \ +libopen_pal_la_SOURCES += \ class/opal_bitmap.c \ class/opal_free_list.c \ class/opal_hash_table.c \ diff --git a/opal/dss/Makefile.am b/opal/dss/Makefile.am index 058242369e..cb9f6969fa 100644 --- a/opal/dss/Makefile.am +++ b/opal/dss/Makefile.am @@ -25,7 +25,7 @@ headers += \ dss/dss_types.h \ dss/dss_internal.h -lib@OPAL_LIB@_la_SOURCES += \ +libopen_pal_la_SOURCES += \ dss/dss_internal_functions.c \ dss/dss_compare.c \ dss/dss_copy.c \ diff --git a/opal/memoryhooks/Makefile.am b/opal/memoryhooks/Makefile.am index 8ff8f84d1b..f3be572c66 100644 --- a/opal/memoryhooks/Makefile.am +++ b/opal/memoryhooks/Makefile.am @@ -23,5 +23,5 @@ headers += \ memoryhooks/memory.h \ memoryhooks/memory_internal.h -lib@OPAL_LIB@_la_SOURCES += \ +libopen_pal_la_SOURCES += \ memoryhooks/memory.c diff --git a/opal/runtime/Makefile.am b/opal/runtime/Makefile.am index a40823a89d..063cdfdc55 100644 --- a/opal/runtime/Makefile.am +++ b/opal/runtime/Makefile.am @@ -37,7 +37,7 @@ headers += \ runtime/opal_params.h \ runtime/opal_progress_threads.h -lib@OPAL_LIB@_la_SOURCES += \ +libopen_pal_la_SOURCES += \ runtime/opal_progress.c \ runtime/opal_finalize.c \ runtime/opal_init.c \ diff --git a/opal/threads/Makefile.am b/opal/threads/Makefile.am index 328de85736..29e7b1b6e3 100644 --- a/opal/threads/Makefile.am +++ b/opal/threads/Makefile.am @@ -27,7 +27,7 @@ headers += \ threads/threads.h \ threads/tsd.h -lib@OPAL_LIB@_la_SOURCES += \ +libopen_pal_la_SOURCES += \ threads/condition.c \ threads/mutex.c \ threads/thread.c \ diff --git a/opal/tools/opal-checkpoint/Makefile.am b/opal/tools/opal-checkpoint/Makefile.am index 4aca511507..3bbdb587e5 100644 --- a/opal/tools/opal-checkpoint/Makefile.am +++ b/opal/tools/opal-checkpoint/Makefile.am @@ -41,7 +41,7 @@ dist_opaldata_DATA = help-opal-checkpoint.txt endif # OPAL_INSTALL_BINARIES opal_checkpoint_SOURCES = opal-checkpoint.c -opal_checkpoint_LDADD = $(top_builddir)/opal/lib@OPAL_LIB@.la +opal_checkpoint_LDADD = $(top_builddir)/opal/libopen-pal.la endif # WANT_FT_CR diff --git a/opal/tools/opal-restart/Makefile.am b/opal/tools/opal-restart/Makefile.am index de80821457..5322fdc9ea 100644 --- a/opal/tools/opal-restart/Makefile.am +++ b/opal/tools/opal-restart/Makefile.am @@ -41,7 +41,7 @@ dist_opaldata_DATA = help-opal-restart.txt endif # OPAL_INSTALL_BINARIES opal_restart_SOURCES = opal-restart.c -opal_restart_LDADD = $(top_builddir)/opal/lib@OPAL_LIB@.la +opal_restart_LDADD = $(top_builddir)/opal/libopen-pal.la endif # WANT_FT_CR diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am index d140810d87..3befabcf8f 100644 --- a/opal/tools/wrappers/Makefile.am +++ b/opal/tools/wrappers/Makefile.am @@ -60,7 +60,7 @@ endif # OPAL_INSTALL_BINARIES endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS opal_wrapper_SOURCES = opal_wrapper.c -opal_wrapper_LDADD = $(top_builddir)/opal/lib@OPAL_LIB@.la +opal_wrapper_LDADD = $(top_builddir)/opal/libopen-pal.la # Ensure that the man pages are rebuilt if the opal_config.h file # changes; a "good enough" way to know if configure was run again (and diff --git a/opal/tools/wrappers/opal.pc.in b/opal/tools/wrappers/opal.pc.in index f416dd19c2..c9ef205a32 100644 --- a/opal/tools/wrappers/opal.pc.in +++ b/opal/tools/wrappers/opal.pc.in @@ -14,7 +14,7 @@ libdir=@libdir@ # (they're pulled in via libopen-pal.so's implicit dependencies), so # list them in Libs.private. # -Libs: -L${libdir} @OPAL_WRAPPER_EXTRA_LDFLAGS@ -l@OPAL_LIB@ +Libs: -L${libdir} @OPAL_WRAPPER_EXTRA_LDFLAGS@ -lopen-pal Libs.private: @OPAL_WRAPPER_EXTRA_LIBS@ # # It is safe to hard-wire the -I before the EXTRA_INCLUDES because we diff --git a/opal/tools/wrappers/opalc++-wrapper-data.txt.in b/opal/tools/wrappers/opalc++-wrapper-data.txt.in index 5041fd7ac4..21dd7f2274 100644 --- a/opal/tools/wrappers/opalc++-wrapper-data.txt.in +++ b/opal/tools/wrappers/opalc++-wrapper-data.txt.in @@ -16,10 +16,10 @@ preprocessor_flags=@OPAL_WRAPPER_EXTRA_CPPFLAGS@ compiler_flags_prefix=@OPAL_WRAPPER_EXTRA_CXXFLAGS_PREFIX@ compiler_flags=@OPAL_WRAPPER_EXTRA_CXXFLAGS@ linker_flags=@OPAL_WRAPPER_EXTRA_LDFLAGS@ -libs=-l@OPAL_LIB@ -libs_static=-l@OPAL_LIB@ @OPAL_WRAPPER_EXTRA_LIBS@ -dyn_lib_file=lib@OPAL_LIB@.@OPAL_DYN_LIB_SUFFIX@ -static_lib_file=lib@OPAL_LIB@.a +libs=-lopen-pal +libs_static=-lopen-pal @OPAL_WRAPPER_EXTRA_LIBS@ +dyn_lib_file=libopen-pal.@OPAL_DYN_LIB_SUFFIX@ +static_lib_file=libopen-pal.a required_file= includedir=${includedir} libdir=${libdir} diff --git a/opal/tools/wrappers/opalcc-wrapper-data.txt.in b/opal/tools/wrappers/opalcc-wrapper-data.txt.in index 11ee5b8be3..2c0aec029a 100644 --- a/opal/tools/wrappers/opalcc-wrapper-data.txt.in +++ b/opal/tools/wrappers/opalcc-wrapper-data.txt.in @@ -16,10 +16,10 @@ preprocessor_flags=@OPAL_WRAPPER_EXTRA_CPPFLAGS@ compiler_flags_prefix=@OPAL_WRAPPER_EXTRA_CFLAGS_PREFIX@ compiler_flags=@OPAL_WRAPPER_EXTRA_CFLAGS@ linker_flags=@OPAL_WRAPPER_EXTRA_LDFLAGS@ -libs=-l@OPAL_LIB@ -libs_static=-l@OPAL_LIB@ @OPAL_WRAPPER_EXTRA_LIBS@ -dyn_lib_file=lib@OPAL_LIB@.@OPAL_DYN_LIB_SUFFIX@ -static_lib_file=lib@OPAL_LIB@.a +libs=-lopen-pal +libs_static=-lopen-pal @OPAL_WRAPPER_EXTRA_LIBS@ +dyn_lib_file=libopen-pal.@OPAL_DYN_LIB_SUFFIX@ +static_lib_file=libopen-pal.a required_file= includedir=${includedir} libdir=${libdir} diff --git a/orte/Makefile.am b/orte/Makefile.am index 334df8cd23..1f4e4aebd6 100644 --- a/orte/Makefile.am +++ b/orte/Makefile.am @@ -33,19 +33,19 @@ DIST_SUBDIRS = \ # Build the main ORTE library -lib_LTLIBRARIES = lib@ORTE_LIB@.la -lib@ORTE_LIB@_la_SOURCES = -lib@ORTE_LIB@_la_LIBADD = \ +lib_LTLIBRARIES = libopen-rte.la +libopen_rte_la_SOURCES = +libopen_rte_la_LIBADD = \ $(MCA_orte_FRAMEWORK_LIBS) \ - $(ORTE_TOP_BUILDDIR)/opal/lib@OPAL_LIB@.la -lib@ORTE_LIB@_la_DEPENDENCIES = $(lib@ORTE_LIB@_la_LIBADD) -lib@ORTE_LIB@_la_LDFLAGS = -version-info $(libopen_rte_so_version) + $(ORTE_TOP_BUILDDIR)/opal/libopen-pal.la +libopen_rte_la_DEPENDENCIES = $(libopen_rte_la_LIBADD) +libopen_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version) # included subdirectory Makefile.am's and appended-to variables headers = noinst_LTLIBRARIES = dist_ortedata_DATA = -lib@ORTE_LIB@_la_SOURCES += $(headers) +libopen_rte_la_SOURCES += $(headers) # Conditionally install the header files diff --git a/orte/orted/Makefile.am b/orte/orted/Makefile.am index e52c59d955..180a72f6fd 100644 --- a/orte/orted/Makefile.am +++ b/orte/orted/Makefile.am @@ -24,7 +24,7 @@ dist_ortedata_DATA += orted/help-orted.txt headers += \ orted/orted.h -lib@ORTE_LIB@_la_SOURCES += \ +libopen_rte_la_SOURCES += \ orted/orted_main.c \ orted/orted_comm.c diff --git a/orte/orted/pmix/Makefile.am b/orte/orted/pmix/Makefile.am index 8215c98ec2..86c45749d7 100644 --- a/orte/orted/pmix/Makefile.am +++ b/orte/orted/pmix/Makefile.am @@ -11,7 +11,7 @@ headers += \ orted/pmix/pmix_server.h \ orted/pmix/pmix_server_internal.h -lib@ORTE_LIB@_la_SOURCES += \ +libopen_rte_la_SOURCES += \ orted/pmix/pmix_server.c \ orted/pmix/pmix_server_connection.c \ orted/pmix/pmix_server_sendrecv.c diff --git a/orte/runtime/Makefile.am b/orte/runtime/Makefile.am index 29345a5ee5..e772f62758 100644 --- a/orte/runtime/Makefile.am +++ b/orte/runtime/Makefile.am @@ -36,7 +36,7 @@ headers += \ runtime/orte_data_server.h \ runtime/orte_info_support.h -lib@ORTE_LIB@_la_SOURCES += \ +libopen_rte_la_SOURCES += \ runtime/orte_finalize.c \ runtime/orte_init.c \ runtime/orte_locks.c \ diff --git a/orte/tools/orte-checkpoint/Makefile.am b/orte/tools/orte-checkpoint/Makefile.am index 972e51ba12..0c487c8608 100644 --- a/orte/tools/orte-checkpoint/Makefile.am +++ b/orte/tools/orte-checkpoint/Makefile.am @@ -41,7 +41,7 @@ dist_ortedata_DATA = help-orte-checkpoint.txt endif # OPAL_INSTALL_BINARIES orte_checkpoint_SOURCES = orte-checkpoint.c -orte_checkpoint_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la endif # WANT_FT_CR diff --git a/orte/tools/orte-clean/Makefile.am b/orte/tools/orte-clean/Makefile.am index 6a0d0031f8..f15f4be8db 100644 --- a/orte/tools/orte-clean/Makefile.am +++ b/orte/tools/orte-clean/Makefile.am @@ -39,7 +39,7 @@ dist_ortedata_DATA = help-orte-clean.txt endif # OPAL_INSTALL_BINARIES orte_clean_SOURCES = orte-clean.c -orte_clean_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la distclean-local: rm -f $(man_pages) diff --git a/orte/tools/orte-info/Makefile.am b/orte/tools/orte-info/Makefile.am index 10ffc1ec62..e58a7b73c3 100644 --- a/orte/tools/orte-info/Makefile.am +++ b/orte/tools/orte-info/Makefile.am @@ -64,7 +64,7 @@ orte_info_SOURCES = \ components.c \ version.c -orte_info_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orte_info_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la clean-local: test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY) diff --git a/orte/tools/orte-migrate/Makefile.am b/orte/tools/orte-migrate/Makefile.am index 349cba4f82..d23552c2fe 100644 --- a/orte/tools/orte-migrate/Makefile.am +++ b/orte/tools/orte-migrate/Makefile.am @@ -34,7 +34,7 @@ dist_ortedata_DATA = help-orte-migrate.txt endif # OPAL_INSTALL_BINARIES orte_migrate_SOURCES = orte-migrate.c -orte_migrate_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orte_migrate_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la endif # WANT_FT_CR diff --git a/orte/tools/orte-ps/Makefile.am b/orte/tools/orte-ps/Makefile.am index 1ae08d0a61..777db5ca1f 100644 --- a/orte/tools/orte-ps/Makefile.am +++ b/orte/tools/orte-ps/Makefile.am @@ -39,7 +39,7 @@ dist_ortedata_DATA = help-orte-ps.txt endif # OPAL_INSTALL_BINARIES orte_ps_SOURCES = orte-ps.c -orte_ps_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la distclean-local: rm -f $(man_pages) diff --git a/orte/tools/orte-restart/Makefile.am b/orte/tools/orte-restart/Makefile.am index 87518cd1d2..7cbc8f59dc 100644 --- a/orte/tools/orte-restart/Makefile.am +++ b/orte/tools/orte-restart/Makefile.am @@ -41,7 +41,7 @@ dist_ortedata_DATA = help-orte-restart.txt endif # OPAL_INSTALL_BINARIES orte_restart_SOURCES = orte-restart.c -orte_restart_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la endif # WANT_FT_CR diff --git a/orte/tools/orte-server/Makefile.am b/orte/tools/orte-server/Makefile.am index 5a1db594e6..45b22d39ad 100644 --- a/orte/tools/orte-server/Makefile.am +++ b/orte/tools/orte-server/Makefile.am @@ -39,7 +39,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h endif # OPAL_INSTALL_BINARIES orte_server_SOURCES = orte-server.c -orte_server_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orte_server_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la distclean-local: rm -f $(man_pages) diff --git a/orte/tools/orte-top/Makefile.am b/orte/tools/orte-top/Makefile.am index de03e9976e..7b344c9122 100644 --- a/orte/tools/orte-top/Makefile.am +++ b/orte/tools/orte-top/Makefile.am @@ -39,7 +39,7 @@ dist_ortedata_DATA = help-orte-top.txt endif # OPAL_INSTALL_BINARIES orte_top_SOURCES = orte-top.c -orte_top_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orte_top_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la distclean-local: rm -f $(man_pages) diff --git a/orte/tools/orted/Makefile.am b/orte/tools/orted/Makefile.am index 2a521ccf13..a5c706cbe0 100644 --- a/orte/tools/orted/Makefile.am +++ b/orte/tools/orted/Makefile.am @@ -44,7 +44,7 @@ orted_SOURCES = orted.c # nice for systems that don't have all the shared # libraries on the computes orted_LDFLAGS = -orted_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orted_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la distclean-local: rm -f $(man_pages) diff --git a/orte/tools/orterun/Makefile.am b/orte/tools/orterun/Makefile.am index cd33e1860d..9386a81359 100644 --- a/orte/tools/orterun/Makefile.am +++ b/orte/tools/orterun/Makefile.am @@ -52,7 +52,7 @@ orterun_SOURCES = \ orterun.c \ orterun.h -orterun_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la +orterun_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la distclean-local: rm -f $(man_pages) diff --git a/orte/tools/wrappers/orte_wrapper_script.in b/orte/tools/wrappers/orte_wrapper_script.in index 7ea02df0a3..7f9a46897f 100644 --- a/orte/tools/wrappers/orte_wrapper_script.in +++ b/orte/tools/wrappers/orte_wrapper_script.in @@ -51,7 +51,7 @@ my $preproc_flags = $include_flag . $includedir; my $comp_flags = ""; my $comp_flags_prefix = ""; my $linker_flags = $libdir_flag . $libdir . " " . $extra_ldflags; -my $libs = "-l@ORTE_LIB@ -l@OPAL_LIB@ " . $extra_libs; +my $libs = "-lopen-rte -lopen-pal " . $extra_libs; sub check_env { diff --git a/orte/tools/wrappers/ortecc-wrapper-data.txt.in b/orte/tools/wrappers/ortecc-wrapper-data.txt.in index 2f6705da4b..fc5c8cab76 100644 --- a/orte/tools/wrappers/ortecc-wrapper-data.txt.in +++ b/orte/tools/wrappers/ortecc-wrapper-data.txt.in @@ -20,10 +20,10 @@ linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@ # intentionally always link in open-pal and open-rte in # ortecc/ortec++ because we intend ORTE applications to use both the # ORTE and OPAL APIs. -libs=-l@ORTE_LIB@ -l@OPAL_LIB@ -libs_static=-l@ORTE_LIB@ -l@OPAL_LIB@ @ORTE_WRAPPER_EXTRA_LIBS@ +libs=-lopen-rte -lopen-pal +libs_static=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@ dyn_lib_file=libopen-rte.@OPAL_DYN_LIB_SUFFIX@ -static_lib_file=lib@ORTE_LIB@.a +static_lib_file=libopen-rte.a required_file= includedir=${includedir} libdir=${libdir} diff --git a/orte/util/Makefile.am b/orte/util/Makefile.am index 8d0bb0abcc..3c89db7c04 100644 --- a/orte/util/Makefile.am +++ b/orte/util/Makefile.am @@ -58,7 +58,7 @@ headers += \ util/regex.h \ util/attr.h -lib@ORTE_LIB@_la_SOURCES += \ +libopen_rte_la_SOURCES += \ util/error_strings.c \ util/name_fns.c \ util/proc_info.c \ diff --git a/oshmem/tools/oshmem_info/Makefile.am b/oshmem/tools/oshmem_info/Makefile.am index a17b6555c7..11605f6a5b 100644 --- a/oshmem/tools/oshmem_info/Makefile.am +++ b/oshmem/tools/oshmem_info/Makefile.am @@ -69,9 +69,9 @@ oshmem_info_SOURCES = \ oshmem_info_LDADD = $(top_builddir)/ompi/libmpi.la oshmem_info_LDADD += $(top_builddir)/oshmem/liboshmem.la if OMPI_RTE_ORTE -oshmem_info_LDADD += $(top_builddir)/orte/lib@ORTE_LIB@.la +oshmem_info_LDADD += $(top_builddir)/orte/libopen-rte.la endif -oshmem_info_LDADD += $(top_builddir)/opal/lib@OPAL_LIB@.la +oshmem_info_LDADD += $(top_builddir)/opal/libopen-pal.la clean-local: test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY) diff --git a/test/class/Makefile.am b/test/class/Makefile.am index a9b63c58b8..20de5634cc 100644 --- a/test/class/Makefile.am +++ b/test/class/Makefile.am @@ -38,37 +38,37 @@ TESTS = opal_bitmap_SOURCES = opal_bitmap.c opal_bitmap_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la \ + $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_bitmap_DEPENDENCIES = $(opal_bitmap_LDADD) opal_list_SOURCES = opal_list.c opal_list_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la \ + $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_list_DEPENDENCIES = $(opal_list_LDADD) opal_tree_SOURCES = opal_tree.c opal_tree_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la \ + $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_tree_DEPENDENCIES = $(opal_tree_LDADD) opal_hash_table_SOURCES = opal_hash_table.c opal_hash_table_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la \ + $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_hash_table_DEPENDENCIES = $(opal_hash_table_LDADD) opal_pointer_array_SOURCES = opal_pointer_array.c opal_pointer_array_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.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/lib@OPAL_LIB@.la \ + $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_value_array_DEPENDENCIES = $(opal_value_array_LDADD) diff --git a/test/datatype/Makefile.am b/test/datatype/Makefile.am index dd5fd2144c..4b6856eddc 100644 --- a/test/datatype/Makefile.am +++ b/test/datatype/Makefile.am @@ -55,5 +55,5 @@ to_self_LDADD = $(top_builddir)/ompi/libmpi.la opal_datatype_test_SOURCES = opal_datatype_test.c opal_ddt_lib.c opal_ddt_lib.h opal_datatype_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) -opal_datatype_test_LDADD = $(top_builddir)/opal/lib@OPAL_LIB@.la +opal_datatype_test_LDADD = $(top_builddir)/opal/libopen-pal.la diff --git a/test/event/Makefile.am b/test/event/Makefile.am index eea25534df..da0381ceb8 100644 --- a/test/event/Makefile.am +++ b/test/event/Makefile.am @@ -28,17 +28,17 @@ TESTS = $(check_PROGRAMS) signal_test_SOURCES = signal-test.c signal_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) signal_test_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la + $(top_builddir)/opal/libopen-pal.la signal_test_DEPENDENCIES = $(signal_test_LDADD) time_test_SOURCES = time-test.c time_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) time_test_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la + $(top_builddir)/opal/libopen-pal.la time_test_DEPENDENCIES = $(time_test_LDADD) event_test_SOURCES = event-test.c event_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) event_test_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la + $(top_builddir)/opal/libopen-pal.la event_test_DEPENDENCIES = $(event_test_LDADD) diff --git a/test/runtime/Makefile.am b/test/runtime/Makefile.am index 05931be8a5..785cc47caa 100644 --- a/test/runtime/Makefile.am +++ b/test/runtime/Makefile.am @@ -31,26 +31,26 @@ TESTS = \ sigchld_SOURCES = \ sigchld.c sigchld_LDADD = \ - $(top_builddir)/orte/lib@ORTE_LIB@.la \ + $(top_builddir)/orte/libopen-rte.la \ $(top_builddir)/test/support/libsupport.a sigchld_DEPENDENCIES = $(sigchld_LDADD) start_shut_SOURCES = \ start_shut.c start_shut_LDADD = \ - $(top_builddir)/orte/lib@ORTE_LIB@.la \ + $(top_builddir)/orte/libopen-rte.la \ $(top_builddir)/test/support/libsupport.a start_shut_DEPENDENCIES = $(start_shut_LDADD) orte_init_finalize_SOURCES = \ orte_init_finalize.c orte_init_finalize_LDADD = \ - $(top_builddir)/orte/lib@ORTE_LIB@.la \ + $(top_builddir)/orte/libopen-rte.la \ orte_init_finalize_DEPENDENCIES = $(orte_init_finalize_LDADD) opal_init_finalize_SOURCES = \ opal_init_finalize.c opal_init_finalize_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la \ + $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_init_finalize_DEPENDENCIES = $(opal_init_finalize_LDADD) diff --git a/test/threads/Makefile.am b/test/threads/Makefile.am index a2cfa3121a..edd8ce4831 100644 --- a/test/threads/Makefile.am +++ b/test/threads/Makefile.am @@ -32,12 +32,12 @@ TESTS = opal_thread_SOURCES = opal_thread.c opal_thread_LDADD = \ $(top_builddir)/test/support/libsupport.a \ - $(top_builddir)/opal/lib@OPAL_LIB@.la + $(top_builddir)/opal/libopen-pal.la opal_thread_DEPENDENCIES = $(opal_thread_LDADD) opal_condition_SOURCES = opal_condition.c opal_condition_LDADD = \ $(top_builddir)/test/support/libsupport.a \ - $(top_builddir)/opal/lib@OPAL_LIB@.la + $(top_builddir)/opal/libopen-pal.la opal_condition_DEPENDENCIES = $(opal_condition_LDADD) diff --git a/test/util/Makefile.am b/test/util/Makefile.am index e5076bf246..35b1efa728 100644 --- a/test/util/Makefile.am +++ b/test/util/Makefile.am @@ -40,80 +40,80 @@ TESTS = \ #ompi_numtostr_SOURCES = ompi_numtostr.c #ompi_numtostr_LDADD = \ -# $(top_builddir)/opal/lib@OPAL_LIB@.la \ +# $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #ompi_numtostr_DEPENDENCIES = $(ompi_numtostr_LDADD) #opal_error_SOURCES = opal_error.c #opal_error_LDADD = \ -# $(top_builddir)/orte/lib@ORTE_LIB@.la \ +# $(top_builddir)/orte/libopen-rte.la \ #opal_error_DEPENDENCIES = $(opal_error_LDADD) #opal_if_SOURCES = opal_if.c #opal_if_LDADD = \ -# $(top_builddir)/opal/lib@OPAL_LIB@.la \ +# $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #opal_if_DEPENDENCIES = $(opal_if_LDADD) #opal_argv_SOURCES = opal_argv.c #opal_argv_LDADD = \ -# $(top_builddir)/opal/lib@OPAL_LIB@.la \ +# $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #opal_argv_DEPENDENCIES = $(opal_argv_LDADD) #opal_basename_SOURCES = opal_basename.c #opal_basename_LDADD = \ -# $(top_builddir)/opal/lib@OPAL_LIB@.la \ +# $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #opal_basename_DEPENDENCIES = $(opal_basename_LDADD) opal_bit_ops_SOURCES = opal_bit_ops.c opal_bit_ops_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la \ + $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_bit_ops_DEPENDENCIES = $(opal_path_nfs_LDADD) opal_path_nfs_SOURCES = opal_path_nfs.c opal_path_nfs_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB@.la \ + $(top_builddir)/opal/libopen-pal.la \ $(top_builddir)/test/support/libsupport.a opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD) #opal_os_path_SOURCES = opal_os_path.c #opal_os_path_LDADD = \ -# $(top_builddir)/opal/lib@OPAL_LIB@.la \ +# $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #opal_os_path_DEPENDENCIES = $(opal_os_path_LDADD) #opal_timer_SOURCES = opal_timer.c #opal_timer_LDADD = \ -# $(top_builddir)/opal/lib@OPAL_LIB@.la \ +# $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #opal_timer_DEPENDENCIES = $(opal_timer_LDADD) #orte_sys_info_SOURCES = orte_sys_info.c #orte_sys_info_LDADD = \ -# $(top_builddir)/orte/lib@ORTE_LIB@.la \ +# $(top_builddir)/orte/libopen-rte.la \ # $(top_builddir)/test/support/libsupport.a #orte_sys_info_DEPENDENCIES = $(orte_sys_info_LDADD) #opal_os_create_dirpath_SOURCES = opal_os_create_dirpath.c #opal_os_create_dirpath_LDADD = \ -# $(top_builddir)/opal/lib@OPAL_LIB@.la \ +# $(top_builddir)/opal/libopen-pal.la \ # $(top_builddir)/test/support/libsupport.a #opal_os_create_dirpath_DEPENDENCIES = $(opal_os_create_dirpath_LDADD) #orte_session_dir_SOURCES = orte_session_dir.c #orte_session_dir_LDADD = \ -# $(top_builddir)/orte/lib@ORTE_LIB@.la \ +# $(top_builddir)/orte/libopen-rte.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/lib@ORTE_LIB@.la \ +# $(top_builddir)/orte/libopen-rte.la \ # $(top_builddir)/test/support/libsupport.a #orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD)