Skip to content

Commit 01fd96b

Browse files
jsquyresjsquyres
committed
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 63f619f.
1 parent 75e8387 commit 01fd96b

File tree

45 files changed

+91
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+91
-95
lines changed

‎configure.ac

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,18 +1406,14 @@ opalincludedir='${includedir}/openmpi'
14061406
AC_SUBST(opaldatadir)
14071407
AC_SUBST(opallibdir)
14081408
AC_SUBST(opalincludedir)
1409-
OPAL_LIB="open-pal"
1410-
AC_SUBST(OPAL_LIB)
14111409
14121410
m4_ifdef([project_orte],
14131411
[ortedatadir="$opaldatadir"
14141412
AC_SUBST(ortedatadir)
14151413
ortelibdir="$opallibdir"
14161414
AC_SUBST(ortelibdir)
14171415
orteincludedir="$opalincludedir"
1418-
AC_SUBST(orteincludedir)
1419-
ORTE_LIB="open-rte"
1420-
AC_SUBST(ORTE_LIB)])
1416+
AC_SUBST(orteincludedir)])
14211417
m4_ifdef([project_ompi],
14221418
[ompidatadir="$opaldatadir"
14231419
AC_SUBST(ompidatadir)

‎ompi/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ libmpi_la_LIBADD = \
145145

146146
if OMPI_RTE_ORTE
147147
libmpi_la_LIBADD += \
148-
$(OMPI_TOP_BUILDDIR)/orte/lib@ORTE_LIB@.la
148+
$(OMPI_TOP_BUILDDIR)/orte/libopen-rte.la
149149
endif
150150
libmpi_la_LIBADD += \
151-
$(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB@.la
151+
$(OMPI_TOP_BUILDDIR)/opal/libopen-pal.la
152152
libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD)
153153
libmpi_la_LDFLAGS = \
154154
-version-info $(libmpi_so_version) \

‎ompi/mca/rte/orte/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ endif
2424
noinst_LTLIBRARIES = libmca_rte_orte.la
2525
libmca_rte_orte_la_SOURCES =$(sources) $(headers)
2626
libmca_rte_orte_la_LDFLAGS = -module -avoid-version
27-
libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB@.la
27+
libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/libopen-rte.la
2828

2929
man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1 ompi-top.1 ompi-server.1
3030

‎ompi/tools/mpisync/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ mpisync_SOURCES = \
7171

7272
mpisync_LDADD = $(top_builddir)/ompi/libmpi.la
7373
if OMPI_RTE_ORTE
74-
mpisync_LDADD += $(top_builddir)/orte/lib@ORTE_LIB@.la
74+
mpisync_LDADD += $(top_builddir)/orte/libopen-rte.la
7575
endif
76-
mpisync_LDADD += $(top_builddir)/opal/lib@OPAL_LIB@.la
76+
mpisync_LDADD += $(top_builddir)/opal/libopen-pal.la
7777

7878
clean-local:
7979
test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)

‎ompi/tools/ompi_info/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ ompi_info_SOURCES = \
6363

6464
ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la
6565
if OMPI_RTE_ORTE
66-
ompi_info_LDADD += $(top_builddir)/orte/lib@ORTE_LIB@.la
66+
ompi_info_LDADD += $(top_builddir)/orte/libopen-rte.la
6767
endif
68-
ompi_info_LDADD += $(top_builddir)/opal/lib@OPAL_LIB@.la
68+
ompi_info_LDADD += $(top_builddir)/opal/libopen-pal.la
6969

7070
clean-local:
7171
test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)

‎ompi/tools/wrappers/mpic++-wrapper-data.txt.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2121
# pulled in implicitly) because we intend MPI applications to only use
2222
# the MPI API.
2323
libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi
24-
libs_static=@OMPI_WRAPPER_CXX_LIB@ -lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ @OMPI_WRAPPER_EXTRA_LIBS@
24+
libs_static=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
2525
dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
2626
static_lib_file=libmpi.a
2727
required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@

‎ompi/tools/wrappers/mpicc-wrapper-data.txt.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2121
# pulled in implicitly) because we intend MPI applications to only use
2222
# the MPI API.
2323
libs=-lmpi
24-
libs_static=-lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ @OMPI_WRAPPER_EXTRA_LIBS@
24+
libs_static=-lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
2525
dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
2626
static_lib_file=libmpi.a
2727
required_file=

‎ompi/tools/wrappers/mpifort-wrapper-data.txt.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2020
# pulled in implicitly) because we intend MPI applications to only use
2121
# the MPI API.
2222
libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi
23-
libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ @OMPI_WRAPPER_EXTRA_LIBS@
23+
libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
2424
dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
2525
static_lib_file=libmpi.a
2626
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

‎ompi/tools/wrappers/ompi_wrapper_script.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ my $linker_flags = $libdir_flag . $libdir . " " . $extra_ldflags;
6262
# pulled in implicitly) because we intend MPI applications to only use
6363
# the MPI API.
6464
my $libs = "-lmpi " . $extra_libs;
65-
my $libs_static = "-lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ " . $extra_libs;
65+
my $libs_static = "-lmpi -lopen-rte -lopen-pal " . $extra_libs;
6666

6767
my $have_dynamic = 0;
6868
if (-e $libdir . "/libmpi." . $dynamic_lib_suffix) {

‎opal/Makefile.am

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ DIST_SUBDIRS = \
4646

4747
# Build the main OPAL library
4848

49-
lib_LTLIBRARIES = lib@OPAL_LIB@.la
50-
lib@OPAL_LIB@_la_SOURCES =
51-
lib@OPAL_LIB@_la_LIBADD = \
49+
lib_LTLIBRARIES = libopen-pal.la
50+
libopen_pal_la_SOURCES =
51+
libopen_pal_la_LIBADD = \
5252
$(LIBLTDL) \
5353
asm/libasm.la \
5454
datatype/libdatatype.la \
5555
mca/base/libmca_base.la \
5656
util/libopalutil.la \
5757
$(MCA_opal_FRAMEWORK_LIBS)
58-
lib@OPAL_LIB@_la_DEPENDENCIES = $(lib@OPAL_LIB@_la_LIBADD)
59-
lib@OPAL_LIB@_la_LDFLAGS = -version-info $(libopen_pal_so_version)
58+
libopen_pal_la_DEPENDENCIES = $(libopen_pal_la_LIBADD)
59+
libopen_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version)
6060

6161
# included subdirectory Makefile.am's and appended-to variables
6262
headers =
6363
noinst_LTLIBRARIES =
6464
dist_opaldata_DATA =
65-
lib@OPAL_LIB@_la_SOURCES += $(headers)
65+
libopen_pal_la_SOURCES += $(headers)
6666

6767
# Conditionally install the header files
6868

‎opal/class/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ headers += \
3737
class/opal_rb_tree.h \
3838
class/ompi_free_list.h
3939

40-
lib@OPAL_LIB@_la_SOURCES += \
40+
libopen_pal_la_SOURCES += \
4141
class/opal_bitmap.c \
4242
class/opal_free_list.c \
4343
class/opal_hash_table.c \

‎opal/dss/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ headers += \
2525
dss/dss_types.h \
2626
dss/dss_internal.h
2727

28-
lib@OPAL_LIB@_la_SOURCES += \
28+
libopen_pal_la_SOURCES += \
2929
dss/dss_internal_functions.c \
3030
dss/dss_compare.c \
3131
dss/dss_copy.c \

‎opal/memoryhooks/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ headers += \
2323
memoryhooks/memory.h \
2424
memoryhooks/memory_internal.h
2525

26-
lib@OPAL_LIB@_la_SOURCES += \
26+
libopen_pal_la_SOURCES += \
2727
memoryhooks/memory.c

‎opal/runtime/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ headers += \
3737
runtime/opal_params.h \
3838
runtime/opal_progress_threads.h
3939

40-
lib@OPAL_LIB@_la_SOURCES += \
40+
libopen_pal_la_SOURCES += \
4141
runtime/opal_progress.c \
4242
runtime/opal_finalize.c \
4343
runtime/opal_init.c \

‎opal/threads/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ headers += \
2727
threads/threads.h \
2828
threads/tsd.h
2929

30-
lib@OPAL_LIB@_la_SOURCES += \
30+
libopen_pal_la_SOURCES += \
3131
threads/condition.c \
3232
threads/mutex.c \
3333
threads/thread.c \

‎opal/tools/opal-checkpoint/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dist_opaldata_DATA = help-opal-checkpoint.txt
4141
endif # OPAL_INSTALL_BINARIES
4242

4343
opal_checkpoint_SOURCES = opal-checkpoint.c
44-
opal_checkpoint_LDADD = $(top_builddir)/opal/lib@OPAL_LIB@.la
44+
opal_checkpoint_LDADD = $(top_builddir)/opal/libopen-pal.la
4545

4646
endif # WANT_FT_CR
4747

‎opal/tools/opal-restart/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dist_opaldata_DATA = help-opal-restart.txt
4141
endif # OPAL_INSTALL_BINARIES
4242

4343
opal_restart_SOURCES = opal-restart.c
44-
opal_restart_LDADD = $(top_builddir)/opal/lib@OPAL_LIB@.la
44+
opal_restart_LDADD = $(top_builddir)/opal/libopen-pal.la
4545

4646
endif # WANT_FT_CR
4747

‎opal/tools/wrappers/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ endif # OPAL_INSTALL_BINARIES
6060
endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
6161

6262
opal_wrapper_SOURCES = opal_wrapper.c
63-
opal_wrapper_LDADD = $(top_builddir)/opal/lib@OPAL_LIB@.la
63+
opal_wrapper_LDADD = $(top_builddir)/opal/libopen-pal.la
6464

6565
# Ensure that the man pages are rebuilt if the opal_config.h file
6666
# changes; a "good enough" way to know if configure was run again (and

‎opal/tools/wrappers/opal.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ libdir=@libdir@
1414
# (they're pulled in via libopen-pal.so's implicit dependencies), so
1515
# list them in Libs.private.
1616
#
17-
Libs: -L${libdir} @OPAL_WRAPPER_EXTRA_LDFLAGS@ -l@OPAL_LIB@
17+
Libs: -L${libdir} @OPAL_WRAPPER_EXTRA_LDFLAGS@ -lopen-pal
1818
Libs.private: @OPAL_WRAPPER_EXTRA_LIBS@
1919
#
2020
# It is safe to hard-wire the -I before the EXTRA_INCLUDES because we

‎opal/tools/wrappers/opalc++-wrapper-data.txt.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ preprocessor_flags=@OPAL_WRAPPER_EXTRA_CPPFLAGS@
1616
compiler_flags_prefix=@OPAL_WRAPPER_EXTRA_CXXFLAGS_PREFIX@
1717
compiler_flags=@OPAL_WRAPPER_EXTRA_CXXFLAGS@
1818
linker_flags=@OPAL_WRAPPER_EXTRA_LDFLAGS@
19-
libs=-l@OPAL_LIB@
20-
libs_static=-l@OPAL_LIB@ @OPAL_WRAPPER_EXTRA_LIBS@
21-
dyn_lib_file=lib@OPAL_LIB@.@OPAL_DYN_LIB_SUFFIX@
22-
static_lib_file=lib@OPAL_LIB@.a
19+
libs=-lopen-pal
20+
libs_static=-lopen-pal @OPAL_WRAPPER_EXTRA_LIBS@
21+
dyn_lib_file=libopen-pal.@OPAL_DYN_LIB_SUFFIX@
22+
static_lib_file=libopen-pal.a
2323
required_file=
2424
includedir=${includedir}
2525
libdir=${libdir}

‎opal/tools/wrappers/opalcc-wrapper-data.txt.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ preprocessor_flags=@OPAL_WRAPPER_EXTRA_CPPFLAGS@
1616
compiler_flags_prefix=@OPAL_WRAPPER_EXTRA_CFLAGS_PREFIX@
1717
compiler_flags=@OPAL_WRAPPER_EXTRA_CFLAGS@
1818
linker_flags=@OPAL_WRAPPER_EXTRA_LDFLAGS@
19-
libs=-l@OPAL_LIB@
20-
libs_static=-l@OPAL_LIB@ @OPAL_WRAPPER_EXTRA_LIBS@
21-
dyn_lib_file=lib@OPAL_LIB@.@OPAL_DYN_LIB_SUFFIX@
22-
static_lib_file=lib@OPAL_LIB@.a
19+
libs=-lopen-pal
20+
libs_static=-lopen-pal @OPAL_WRAPPER_EXTRA_LIBS@
21+
dyn_lib_file=libopen-pal.@OPAL_DYN_LIB_SUFFIX@
22+
static_lib_file=libopen-pal.a
2323
required_file=
2424
includedir=${includedir}
2525
libdir=${libdir}

‎orte/Makefile.am

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ DIST_SUBDIRS = \
3333

3434
# Build the main ORTE library
3535

36-
lib_LTLIBRARIES = lib@ORTE_LIB@.la
37-
lib@ORTE_LIB@_la_SOURCES =
38-
lib@ORTE_LIB@_la_LIBADD = \
36+
lib_LTLIBRARIES = libopen-rte.la
37+
libopen_rte_la_SOURCES =
38+
libopen_rte_la_LIBADD = \
3939
$(MCA_orte_FRAMEWORK_LIBS) \
40-
$(ORTE_TOP_BUILDDIR)/opal/lib@OPAL_LIB@.la
41-
lib@ORTE_LIB@_la_DEPENDENCIES = $(lib@ORTE_LIB@_la_LIBADD)
42-
lib@ORTE_LIB@_la_LDFLAGS = -version-info $(libopen_rte_so_version)
40+
$(ORTE_TOP_BUILDDIR)/opal/libopen-pal.la
41+
libopen_rte_la_DEPENDENCIES = $(libopen_rte_la_LIBADD)
42+
libopen_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version)
4343

4444
# included subdirectory Makefile.am's and appended-to variables
4545
headers =
4646
noinst_LTLIBRARIES =
4747
dist_ortedata_DATA =
48-
lib@ORTE_LIB@_la_SOURCES += $(headers)
48+
libopen_rte_la_SOURCES += $(headers)
4949

5050
# Conditionally install the header files
5151

‎orte/orted/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dist_ortedata_DATA += orted/help-orted.txt
2424
headers += \
2525
orted/orted.h
2626

27-
lib@ORTE_LIB@_la_SOURCES += \
27+
libopen_rte_la_SOURCES += \
2828
orted/orted_main.c \
2929
orted/orted_comm.c
3030

‎orte/orted/pmix/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ headers += \
1111
orted/pmix/pmix_server.h \
1212
orted/pmix/pmix_server_internal.h
1313

14-
lib@ORTE_LIB@_la_SOURCES += \
14+
libopen_rte_la_SOURCES += \
1515
orted/pmix/pmix_server.c \
1616
orted/pmix/pmix_server_connection.c \
1717
orted/pmix/pmix_server_sendrecv.c

‎orte/runtime/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ headers += \
3636
runtime/orte_data_server.h \
3737
runtime/orte_info_support.h
3838

39-
lib@ORTE_LIB@_la_SOURCES += \
39+
libopen_rte_la_SOURCES += \
4040
runtime/orte_finalize.c \
4141
runtime/orte_init.c \
4242
runtime/orte_locks.c \

‎orte/tools/orte-checkpoint/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dist_ortedata_DATA = help-orte-checkpoint.txt
4141
endif # OPAL_INSTALL_BINARIES
4242

4343
orte_checkpoint_SOURCES = orte-checkpoint.c
44-
orte_checkpoint_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
44+
orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
4545

4646
endif # WANT_FT_CR
4747

‎orte/tools/orte-clean/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dist_ortedata_DATA = help-orte-clean.txt
3939
endif # OPAL_INSTALL_BINARIES
4040

4141
orte_clean_SOURCES = orte-clean.c
42-
orte_clean_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
42+
orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
4343

4444
distclean-local:
4545
rm -f $(man_pages)

‎orte/tools/orte-info/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ orte_info_SOURCES = \
6464
components.c \
6565
version.c
6666

67-
orte_info_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
67+
orte_info_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
6868

6969
clean-local:
7070
test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)

‎orte/tools/orte-migrate/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dist_ortedata_DATA = help-orte-migrate.txt
3434
endif # OPAL_INSTALL_BINARIES
3535

3636
orte_migrate_SOURCES = orte-migrate.c
37-
orte_migrate_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
37+
orte_migrate_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
3838

3939
endif # WANT_FT_CR
4040

‎orte/tools/orte-ps/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dist_ortedata_DATA = help-orte-ps.txt
3939
endif # OPAL_INSTALL_BINARIES
4040

4141
orte_ps_SOURCES = orte-ps.c
42-
orte_ps_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
42+
orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
4343

4444
distclean-local:
4545
rm -f $(man_pages)

‎orte/tools/orte-restart/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dist_ortedata_DATA = help-orte-restart.txt
4141
endif # OPAL_INSTALL_BINARIES
4242

4343
orte_restart_SOURCES = orte-restart.c
44-
orte_restart_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
44+
orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
4545

4646
endif # WANT_FT_CR
4747

‎orte/tools/orte-server/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
3939
endif # OPAL_INSTALL_BINARIES
4040

4141
orte_server_SOURCES = orte-server.c
42-
orte_server_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
42+
orte_server_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
4343

4444
distclean-local:
4545
rm -f $(man_pages)

‎orte/tools/orte-top/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dist_ortedata_DATA = help-orte-top.txt
3939
endif # OPAL_INSTALL_BINARIES
4040

4141
orte_top_SOURCES = orte-top.c
42-
orte_top_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
42+
orte_top_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
4343

4444
distclean-local:
4545
rm -f $(man_pages)

‎orte/tools/orted/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ orted_SOURCES = orted.c
4444
# nice for systems that don't have all the shared
4545
# libraries on the computes
4646
orted_LDFLAGS =
47-
orted_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
47+
orted_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
4848

4949
distclean-local:
5050
rm -f $(man_pages)

‎orte/tools/orterun/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ orterun_SOURCES = \
5252
orterun.c \
5353
orterun.h
5454

55-
orterun_LDADD = $(top_builddir)/orte/lib@ORTE_LIB@.la $(top_builddir)/opal/lib@OPAL_LIB@.la
55+
orterun_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
5656

5757
distclean-local:
5858
rm -f $(man_pages)

‎orte/tools/wrappers/orte_wrapper_script.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ my $preproc_flags = $include_flag . $includedir;
5151
my $comp_flags = "";
5252
my $comp_flags_prefix = "";
5353
my $linker_flags = $libdir_flag . $libdir . " " . $extra_ldflags;
54-
my $libs = "-l@ORTE_LIB@ -l@OPAL_LIB@ " . $extra_libs;
54+
my $libs = "-lopen-rte -lopen-pal " . $extra_libs;
5555

5656

5757
sub check_env {

0 commit comments

Comments
 (0)