First rename OMPI_LIB_PREFIX to OMPI_LIBMPI_NAME

Author: jjhursey

config/opal_set_lib_prefix.m4

@@ -49,7 +49,7 @@ AC_DEFUN([OMPI_SET_LIB_PREFIX],[
            AC_MSG_WARN([This is a configury programming error])
            AC_MSG_ERROR([Cannot continue])])
 
-    OMPI_LIB_PREFIX=$1
+    OMPI_LIBMPI_NAME=$1
     ompi_lib_prefix_set=yes
-    AC_SUBST(OMPI_LIB_PREFIX)
+    AC_SUBST(OMPI_LIBMPI_NAME)
 ])dnl

ompi/Makefile.am

@@ -129,9 +129,9 @@ DIST_SUBDIRS = \
 
 # Build the main MPI library
 
-lib_LTLIBRARIES = lib@OMPI_LIB_PREFIX@.la
-lib@OMPI_LIB_PREFIX@_la_SOURCES =
-lib@OMPI_LIB_PREFIX@_la_LIBADD = \
+lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@.la
+lib@OMPI_LIBMPI_NAME@_la_SOURCES =
+lib@OMPI_LIBMPI_NAME@_la_LIBADD = \
         datatype/libdatatype.la \
         debuggers/libdebuggers.la \
         mpi/c/libmpi_c.la \
@@ -145,13 +145,13 @@ lib@OMPI_LIB_PREFIX@_la_LIBADD = \
 
 
 if OMPI_RTE_ORTE
-lib@OMPI_LIB_PREFIX@_la_LIBADD += \
+lib@OMPI_LIBMPI_NAME@_la_LIBADD += \
         $(OMPI_TOP_BUILDDIR)/orte/lib@[email protected]
 endif
-lib@OMPI_LIB_PREFIX@_la_LIBADD += \
+lib@OMPI_LIBMPI_NAME@_la_LIBADD += \
         $(OMPI_TOP_BUILDDIR)/opal/lib@[email protected]
-lib@OMPI_LIB_PREFIX@_la_DEPENDENCIES = $(lib@OMPI_LIB_PREFIX@_la_LIBADD)
-lib@OMPI_LIB_PREFIX@_la_LDFLAGS = \
+lib@OMPI_LIBMPI_NAME@_la_DEPENDENCIES = $(lib@OMPI_LIBMPI_NAME@_la_LIBADD)
+lib@OMPI_LIBMPI_NAME@_la_LDFLAGS = \
        -version-info $(libmpi_so_version) \
         $(OMPI_LIBMPI_EXTRA_LDFLAGS)
 
@@ -160,7 +160,7 @@ headers =
 noinst_LTLIBRARIES =
 include_HEADERS =
 dist_ompidata_DATA =
-lib@OMPI_LIB_PREFIX@_la_SOURCES += $(headers)
+lib@OMPI_LIBMPI_NAME@_la_SOURCES += $(headers)
 nodist_man_MANS =
 
 # Conditionally install the header files

ompi/attribute/Makefile.am

@@ -22,6 +22,6 @@
 headers += \
         attribute/attribute.h
 
-lib@OMPI_LIB_PREFIX@_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
         attribute/attribute.c \
         attribute/attribute_predefined.c

ompi/class/Makefile.am

@@ -23,6 +23,6 @@
 headers += \
         class/ompi_seq_tracker.h
 
-lib@OMPI_LIB_PREFIX@_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
         class/ompi_seq_tracker.c
 

ompi/communicator/Makefile.am

@@ -29,7 +29,7 @@ headers += \
 	communicator/comm_request.h \
 	communicator/comm_helpers.h
 
-lib@OMPI_LIB_PREFIX@_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
         communicator/comm_init.c \
 	communicator/comm.c \
 	communicator/comm_cid.c \

ompi/debuggers/Makefile.am

@@ -45,13 +45,13 @@ headers = \
 
 dlopen_test_SOURCES = dlopen_test.c
 dlopen_test_LDADD = \
-        $(top_builddir)/ompi/lib@OMPI_LIB_PREFIX@.la \
+        $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
         $(top_builddir)/opal/lib@[email protected]
 dlopen_test_DEPENDENCIES = $(ompi_predefined_LDADD)
 
 predefined_gap_test_SOURCES = predefined_gap_test.c
 predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
-predefined_gap_test_LDADD = $(top_builddir)/ompi/lib@OMPI_LIB_PREFIX@.la
+predefined_gap_test_LDADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
 predefined_gap_test_DEPENDENCIES = $(ompi_predefined_LDADD)
 
 libdebuggers_la_SOURCES = \
@@ -79,7 +79,7 @@ libompi_dbg_msgq_la_LDFLAGS = -module -avoid-version
 # and "make check" will *build* a test in runtime/, but it won't *run*
 # it.  :-(
 predefined_pad_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
-predefined_pad_test_LDADD = $(top_builddir)/ompi/lib@OMPI_LIB_PREFIX@.la
+predefined_pad_test_LDADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
 predefined_pad_test_DEPENDENCIES = $(ompi_predefined_LDADD)
 
 # Conditionally install the header files

ompi/dpm/Makefile.am

@@ -14,6 +14,6 @@
 headers += \
         dpm/dpm.h
 
-lib@OMPI_LIB_PREFIX@_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
         dpm/dpm.c
 

ompi/errhandler/Makefile.am

@@ -29,7 +29,7 @@ headers += \
         errhandler/errhandler.h \
         errhandler/errhandler_predefined.h
 
-lib@OMPI_LIB_PREFIX@_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
         errhandler/errhandler.c \
         errhandler/errhandler_invoke.c \
         errhandler/errhandler_predefined.c \

ompi/file/Makefile.am

@@ -22,5 +22,5 @@
 headers += \
         file/file.h
 
-lib@OMPI_LIB_PREFIX@_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
         file/file.c

ompi/group/Makefile.am

@@ -25,7 +25,7 @@ headers += \
         group/group.h \
 	group/group_dbg.h
 
-lib@OMPI_LIB_PREFIX@_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
         group/group.c \
         group/group_init.c \
         group/group_set_rank.c \