Commit c4df55f1 authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r6492] Change the name of the proxy to hydra_pmi_proxy to avoid namespace

conflicts.
parent 0f942616
......@@ -6,19 +6,19 @@
AM_CPPFLAGS += -I$(top_srcdir)/pm/utils
bin_PROGRAMS += pmi_proxy
bin_PROGRAMS += hydra_pmi_proxy
pmi_proxy_SOURCES = $(top_srcdir)/pm/pmiserv/pmip.c \
hydra_pmi_proxy_SOURCES = $(top_srcdir)/pm/pmiserv/pmip.c \
$(top_srcdir)/pm/pmiserv/pmip_cb.c \
$(top_srcdir)/pm/pmiserv/pmip_utils.c \
$(top_srcdir)/pm/pmiserv/pmip_pmi_v1.c \
$(top_srcdir)/pm/pmiserv/pmip_pmi_v2.c \
$(top_srcdir)/pm/pmiserv/pmi_common.c \
$(top_srcdir)/pm/pmiserv/pmi_v2_common.c
pmi_proxy_CFLAGS = $(AM_CFLAGS)
pmi_proxy_LDFLAGS = $(external_ldflags) -L$(top_builddir)
pmi_proxy_LDADD = -lhydra $(external_libs)
pmi_proxy_DEPENDENCIES = libhydra.la
hydra_pmi_proxy_CFLAGS = $(AM_CFLAGS)
hydra_pmi_proxy_LDFLAGS = $(external_ldflags) -L$(top_builddir)
hydra_pmi_proxy_LDADD = -lhydra $(external_libs)
hydra_pmi_proxy_DEPENDENCIES = libhydra.la
libpm_la_SOURCES += $(top_srcdir)/pm/pmiserv/pmiserv_pmi.c \
$(top_srcdir)/pm/pmiserv/pmiserv_pmi_v1.c \
......
......@@ -36,7 +36,7 @@ HYD_status HYD_pmcd_pmi_fill_in_proxy_args(char **proxy_args, char *control_port
i = 0;
path_str[i++] = HYDU_strdup(HYD_handle.base_path);
path_str[i++] = HYDU_strdup("pmi_proxy");
path_str[i++] = HYDU_strdup("hydra_pmi_proxy");
path_str[i] = NULL;
status = HYDU_str_alloc_and_join(path_str, &proxy_args[arg++]);
HYDU_ERR_POP(status, "unable to join strings\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment