Changes made to binary prefixing

Signed-off-by: Michael Ayele <whayel01@louisville.edu>

Author: Michael-uofl

config/prte_configure_options.m4

@@ -383,6 +383,8 @@ AC_MSG_CHECKING([if want custom PRTE binary prefix])
 AC_ARG_WITH([prte-binary-prefix],
     [AS_HELP_STRING([--with-prte-binary-prefix=STRING],
                     ["Optionally add a prefix to all PRTE binary names (executables and libraries) names"])])
+#Set default prefix to "ompi-"
+AS_IF([with_prte_binary_prefix=ompi-])
 
 AS_IF([test "$with_prte_binary_prefix" = "no" || \
            test "$with_prte_binary_prefix" = "yes" || \

contrib/libadd_mca_comp_update.py

@@ -8,7 +8,7 @@
 
 import glob, os, re, shutil
 
-projects= { 'prte' : ["$(top_builddir)/src/libprrte.la"],
+projects= { 'prte' : ["$(top_builddir)/src/lib@PRTE_BINARY_PREFIX@prrte.la"],
           }
 
 no_anchor_file = []

src/Makefile.am

@@ -43,15 +43,16 @@ DIST_SUBDIRS = \
 	$(MCA_prte_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
 
 # Build the main PRTE library
+#Add prte binary prefix to libprrte.la references
 
-lib_LTLIBRARIES = libprrte.la
-libprrte_la_SOURCES =
+lib_LTLIBRARIES = lib@PRTE_BINARY_PREFIX@prrte.la
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES =
 
-libprrte_la_LIBADD = \
-	util/libprrteutil.la \
+lib@PRTE_BINARY_PREFIX@prrte_la_LIBADD = \
+	util/lib@PRTE_BINARY_PREFIX@prrteutil.la \
 	$(MCA_prte_FRAMEWORK_LIBS)
-libprrte_la_DEPENDENCIES = \
-	util/libprrteutil.la \
+lib@PRTE_BINARY_PREFIX@prrte_la_DEPENDENCIES = \
+	util/lib@PRTE_BINARY_PREFIX@prrteutil.la \
 	$(MCA_prte_FRAMEWORK_LIBS)
 libprrte_la_LDFLAGS = -version-info $(libprrte_so_version)
 libprrte_la_CPPFLAGS =
@@ -61,7 +62,8 @@ headers =
 nodist_headers =
 noinst_LTLIBRARIES =
 dist_prtedata_DATA =
-libprrte_la_SOURCES += $(headers)
+#Add prte binary prefix here as well
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += $(headers)
 
 # Conditionally install the header files
 

src/event/Makefile.am

@@ -25,5 +25,5 @@
 headers += \
         event/event-internal.h
 
-libprrte_la_SOURCES += \
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
         event/event.c

src/hwloc/Makefile.am

@@ -15,7 +15,7 @@
 headers += \
         hwloc/hwloc-internal.h
 
-libprrte_la_SOURCES += \
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
         hwloc/hwloc.c \
         hwloc/hwloc_base_util.c \
         hwloc/hwloc_base_maffinity.c

src/include/Makefile.am

@@ -40,7 +40,7 @@ headers += \
 nodist_headers += \
         include/prte_config.h \
         include/version.h
-
-libprrte_la_SOURCES += \
+#Add prte binary prefix
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
         $(headers) \
         include/prte_frameworks.c

src/pmix/Makefile.am

@@ -28,5 +28,6 @@
 headers += \
         pmix/pmix-internal.h
 
-libprrte_la_SOURCES += \
+#Add PRTE binary prefix
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
         pmix/pmix.c

src/prted/Makefile.am

@@ -27,7 +27,8 @@
 headers += \
 	prted/prted.h
 
-libprrte_la_SOURCES += \
+#Add prte binary prefix
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
         prted/prted_comm.c \
         prted/prte_app_parse.c \
         prted/prun_common.c

src/prted/pmix/Makefile.am

@@ -13,7 +13,8 @@ headers += \
           prted/pmix/pmix_server.h \
           prted/pmix/pmix_server_internal.h
 
-libprrte_la_SOURCES += \
+#Add prrte binary prefix
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
           prted/pmix/pmix_server.c \
           prted/pmix/pmix_server_fence.c \
           prted/pmix/pmix_server_register_fns.c \

src/rml/Makefile.am

@@ -25,7 +25,7 @@ headers += \
     rml/rml_types.h \
     rml/rml_contact.h
 
-libprrte_la_SOURCES += \
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
     rml/rml.c \
     rml/rml_send.c \
     rml/rml_recv.c \

src/runtime/Makefile.am

@@ -35,7 +35,7 @@ headers += \
         runtime/prte_data_server.h \
         runtime/prte_progress_threads.h
 
-libprrte_la_SOURCES += \
+lib@PRTE_BINARY_PREFIX@prrte_la_SOURCES += \
         runtime/prte_finalize.c \
         runtime/prte_init.c \
         runtime/prte_locks.c \

src/tools/prte_info/Makefile.am

@@ -40,7 +40,8 @@ AM_CFLAGS = \
 
 AM_LDFLAGS = $(prte_hwloc_LDFLAGS) $(prte_libevent_LDFLAGS) $(prte_pmix_LDFLAGS)
 
-bin_PROGRAMS = prte_info
+#Applied binary prefix to the names
+bin_PROGRAMS = @PRTE_BINARY_PREFIX@prte_info
 
 prte_info_SOURCES = \
         pinfo.h \
@@ -54,4 +55,4 @@ prte_info_LDADD = \
     $(prte_libevent_LIBS) \
     $(prte_hwloc_LIBS) \
     $(prte_pmix_LIBS) \
-	$(top_builddir)/src/libprrte.la
+	$(top_builddir)/src/lib@PRTE_BINARY_PREFIX@prrte.la

src/tools/prted/Makefile.am

@@ -46,9 +46,9 @@ bin_PROGRAMS = @PRTE_BINARY_PREFIX@prted
 #  nothing to -all-static in the Makefile.in
 #  nice for systems that don't have all the shared
 #  libraries on the computes
-@PRTE_BINARY_PREFIX@prted_LDFLAGS =
-@PRTE_BINARY_PREFIX@prted_LDADD = \
+prted_LDFLAGS =
+prted_LDADD = \
     $(prte_libevent_LIBS) \
     $(prte_hwloc_LIBS) \
     $(prte_pmix_LIBS) \
-	$(top_builddir)/src/libprrte.la
+	$(top_builddir)/src/lib@PRTE_BINARY_PREFIX@prrte.la

src/tools/prun/Makefile.am

@@ -39,7 +39,8 @@ AM_CFLAGS = \
             -DPRTE_REPO_REV="\"@PRTE_REPO_REV@\"" \
             -DPMIX_RELEASE_DATE="\"@PMIX_RELEASE_DATE@\""
 
-bin_PROGRAMS = prun
+#Apply binary prefix to the names
+bin_PROGRAMS = @PRTE_BINARY_PREFIX@prun
 
 prun_SOURCES = \
         main.c \
@@ -50,4 +51,4 @@ prun_LDADD = \
     $(prte_libevent_LIBS) \
     $(prte_hwloc_LIBS) \
     $(prte_pmix_LIBS) \
-	$(top_builddir)/src/libprrte.la
+	$(top_builddir)/src/lib@PRTE_BINARY_PREFIX@prrte.la

src/tools/pterm/Makefile.am

@@ -24,7 +24,8 @@
 
 AM_LDFLAGS = $(prte_hwloc_LDFLAGS) $(prte_libevent_LDFLAGS) $(prte_pmix_LDFLAGS)
 
-bin_PROGRAMS = pterm
+#Apply binary prefix to the names
+bin_PROGRAMS = @PRTE_BINARY_PREFIX@pterm
 
 pterm_SOURCES = \
         pterm.c
@@ -33,4 +34,4 @@ pterm_LDADD = \
     $(prte_libevent_LIBS) \
     $(prte_hwloc_LIBS) \
     $(prte_pmix_LIBS) \
-	$(top_builddir)/src/libprrte.la
+	$(top_builddir)/src/lib@PRTE_BINARY_PREFIX@prrte.la

src/util/Makefile.am

@@ -28,7 +28,7 @@
 
 SUBDIRS = hostfile
 
-noinst_LTLIBRARIES = libprrteutil.la
+noinst_LTLIBRARIES = lib@PRTE_BINARY_PREFIX@prrteutil.la
 
 AM_CPPFLAGS = $(LTDLINCL)
 
@@ -56,7 +56,7 @@ headers = \
         sys_limits.h \
         uri.h
 
-libprrteutil_la_SOURCES = \
+lib@PRTE_BINARY_PREFIX@prrteutil_la_SOURCES = \
         $(headers) \
         attr.c \
         bipartite_graph.c \
@@ -76,10 +76,10 @@ libprrteutil_la_SOURCES = \
         sys_limits.c \
         uri.c
 
-libprrteutil_la_LIBADD = \
-        hostfile/libprrteutilhostfile.la
-libprrteutil_la_DEPENDENCIES = \
-        hostfile/libprrteutilhostfile.la
+lib@PRTE_BINARY_PREFIX@prrteutil_la_LIBADD = \
+        hostfile/lib@PRTE_BINARY_PREFIX@prrteutilhostfile.la
+lib@PRTE_BINARY_PREFIX@prrteutil_la_DEPENDENCIES = \
+        hostfile/lib@PRTE_BINARY_PREFIX@prrteutilhostfile.la
 
 # Conditionally install the header files
 

src/util/hostfile/Makefile.am

@@ -27,11 +27,11 @@ LEX_OUTPUT_ROOT = lex.prte_util_hostfile_
 # we do NOT want picky compilers down here
 CFLAGS = $(PMIX_CFLAGS_BEFORE_PICKY)
 
-noinst_LTLIBRARIES = libprrteutilhostfile.la
+noinst_LTLIBRARIES = lib@PRTE_BINARY_PREFIX@prrteutilhostfile.la
 
 # Source code files
 
-libprrteutilhostfile_la_SOURCES = \
+lib@PRTE_BINARY_PREFIX@prrteutilhostfile_la_SOURCES = \
 	hostfile_lex.h \
         hostfile_lex.l \
         hostfile.h \