Merge pull request #4313 from rhc54/topic/connect

Since PMIx is moving to release v3.0, embed the new release candidate…

Author: Ralph Castain

.gitignore

@@ -310,36 +310,30 @@ opal/mca/hwloc/base/static-components.h.new.struct
 
 opal/mca/installdirs/config/install_dirs.h
 
-opal/mca/pmix/ext2x/ext2x.c
-opal/mca/pmix/ext2x/ext2x.h
-opal/mca/pmix/ext2x/ext2x_client.c
-opal/mca/pmix/ext2x/ext2x_component.c
-opal/mca/pmix/ext2x/ext2x_server_north.c
-opal/mca/pmix/ext2x/ext2x_server_south.c
 opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h
 opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h.in
 opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in
 opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
-opal/mca/pmix/pmix2x/pmix/src/include/frameworks.h
-opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
-opal/mca/pmix/pmix2x/pmix/config/autogen_found_items.m4
-opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h
-opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h.in
-opal/mca/pmix/pmix2x/pmix/include/pmix_rename.h
-opal/mca/pmix/pmix2x/pmix/include/pmix_version.h
-opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.c
-opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.c
-opal/mca/pmix/pmix2x/pmix/examples/alloc
-opal/mca/pmix/pmix2x/pmix/examples/client
-opal/mca/pmix/pmix2x/pmix/examples/debugger
-opal/mca/pmix/pmix2x/pmix/examples/debuggerd
-opal/mca/pmix/pmix2x/pmix/examples/dmodex
-opal/mca/pmix/pmix2x/pmix/examples/dynamic
-opal/mca/pmix/pmix2x/pmix/examples/fault
-opal/mca/pmix/pmix2x/pmix/examples/jctrl
-opal/mca/pmix/pmix2x/pmix/examples/pub
-opal/mca/pmix/pmix2x/pmix/examples/server
-opal/mca/pmix/pmix2x/pmix/examples/tool
+opal/mca/pmix/pmix*/pmix/src/include/frameworks.h
+opal/mca/pmix/pmix*/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
+opal/mca/pmix/pmix*/pmix/config/autogen_found_items.m4
+opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h
+opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h.in
+opal/mca/pmix/pmix*/pmix/include/pmix_rename.h
+opal/mca/pmix/pmix*/pmix/include/pmix_version.h
+opal/mca/pmix/pmix*/pmix/src/util/keyval/keyval_lex.c
+opal/mca/pmix/pmix*/pmix/src/util/show_help_lex.c
+opal/mca/pmix/pmix*/pmix/examples/alloc
+opal/mca/pmix/pmix*/pmix/examples/client
+opal/mca/pmix/pmix*/pmix/examples/debugger
+opal/mca/pmix/pmix*/pmix/examples/debuggerd
+opal/mca/pmix/pmix*/pmix/examples/dmodex
+opal/mca/pmix/pmix*/pmix/examples/dynamic
+opal/mca/pmix/pmix*/pmix/examples/fault
+opal/mca/pmix/pmix*/pmix/examples/jctrl
+opal/mca/pmix/pmix*/pmix/examples/pub
+opal/mca/pmix/pmix*/pmix/examples/server
+opal/mca/pmix/pmix*/pmix/examples/tool
 
 opal/tools/opal-checkpoint/opal-checkpoint
 opal/tools/opal-checkpoint/opal-checkpoint.1

opal/mca/pmix/ext2x/Makefile.am

@@ -14,18 +14,16 @@
 dist_opaldata_DATA = help-pmix-ext2x.txt
 
 sources = \
-        ext2x_local.c
-
-nodist_headers = \
-        ext2x.h
-
-nodist_sources = \
+        ext2x_local.c \
         ext2x.c \
         ext2x_client.c \
         ext2x_component.c \
         ext2x_server_north.c \
         ext2x_server_south.c
 
+headers = \
+        ext2x.h
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
@@ -38,23 +36,9 @@ component_noinst = libmca_pmix_ext2x.la
 component_install =
 endif
 
-#
-# Generate ext2x sources from the pmix2x component
-#
-$(nodist_headers):
-	pmix2xname=`echo $@ | sed -e s/ext2x/pmix2x/g` ; \
-	$(SED) 's/pmix2x/ext2x/g' $(top_srcdir)/opal/mca/pmix/pmix2x/$$pmix2xname > $@
-
-$(sources): $(nodist_headers)
-
-$(nodist_sources): $(nodist_headers)
-	pmix2xname=`echo $@ | sed -e s/ext2x/pmix2x/g` ; \
-	$(SED) 's/pmix2x/ext2x/g' $(top_srcdir)/opal/mca/pmix/pmix2x/$$pmix2xname > $@
-
 mcacomponentdir = $(opallibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pmix_ext2x_la_SOURCES = $(sources)
-nodist_mca_pmix_ext2x_la_SOURCES = $(nodist_sources)
 mca_pmix_ext2x_la_CFLAGS = $(opal_pmix_ext2x_CFLAGS)
 mca_pmix_ext2x_la_CPPFLAGS =$(opal_pmix_ext2x_CPPFLAGS)
 mca_pmix_ext2x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext2x_LDFLAGS)
@@ -67,6 +51,3 @@ libmca_pmix_ext2x_la_CFLAGS = $(opal_pmix_ext2x_CFLAGS)
 libmca_pmix_ext2x_la_CPPFLAGS = $(opal_pmix_ext2x_CPPFLAGS)
 libmca_pmix_ext2x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext2x_LDFLAGS)
 libmca_pmix_ext2x_la_LIBADD = $(opal_pmix_ext2x_LIBS)
-
-clean-local:
-	$(RM) -f $(nodist_sources) $(nodist_headers)