Merge pull request #5883 from ggouaillardet/topic/pmix_ext

pmix/ext: misc fixes

Author: ggouaillardet

opal/mca/pmix/ext2x/Makefile.am

@@ -1,8 +1,8 @@
 #
 # Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
 # Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2015      Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2015-2018 Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2017      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -38,15 +38,15 @@ endif
 
 mcacomponentdir = $(opallibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
-mca_pmix_ext2x_la_SOURCES = $(sources)
+mca_pmix_ext2x_la_SOURCES = $(sources) $(headers)
 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)
 mca_pmix_ext2x_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
 	$(opal_pmix_ext2x_LIBS)
 
 noinst_LTLIBRARIES = $(component_noinst)
-libmca_pmix_ext2x_la_SOURCES =$(sources)
+libmca_pmix_ext2x_la_SOURCES =$(sources) $(headers)
 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)

opal/mca/pmix/ext3x/Makefile.am

@@ -16,7 +16,7 @@ dist_opaldata_DATA = help-pmix-ext3x.txt
 sources = \
         ext3x_local.c
 
-nodist_headers = \
+headers = \
         ext3x.h
 
 nodist_sources = \
@@ -40,7 +40,7 @@ endif
 
 mcacomponentdir = $(opallibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
-mca_pmix_ext3x_la_SOURCES = $(sources)
+mca_pmix_ext3x_la_SOURCES = $(sources) $(headers)
 nodist_mca_pmix_ext3x_la_SOURCES = $(nodist_sources)
 mca_pmix_ext3x_la_CFLAGS = $(opal_pmix_ext3x_CFLAGS)
 mca_pmix_ext3x_la_CPPFLAGS =$(opal_pmix_ext3x_CPPFLAGS)
@@ -49,12 +49,12 @@ mca_pmix_ext3x_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 	$(opal_pmix_ext3x_LIBS)
 
 noinst_LTLIBRARIES = $(component_noinst)
-libmca_pmix_ext3x_la_SOURCES =$(sources)
+libmca_pmix_ext3x_la_SOURCES =$(sources) $(headers)
 nodist_libmca_pmix_ext3x_la_SOURCES = $(nodist_sources)
 libmca_pmix_ext3x_la_CFLAGS = $(opal_pmix_ext3x_CFLAGS)
 libmca_pmix_ext3x_la_CPPFLAGS = $(opal_pmix_ext3x_CPPFLAGS)
 libmca_pmix_ext3x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext3x_LDFLAGS)
 libmca_pmix_ext3x_la_LIBADD = $(opal_pmix_ext3x_LIBS)
 
 clean-local:
-	$(RM) -f $(nodist_sources) $(nodist_headers)
+	$(RM) -f $(nodist_sources)

opal/mca/pmix/ext3x/ext3x.c

@@ -1,8 +1,8 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
- * Copyright (c) 2014-2017 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2018 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2014-2015 Mellanox Technologies, Inc.
  *                         All rights reserved.
  * Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
@@ -1257,7 +1257,7 @@ static void errreg_cbfunc (pmix_status_t status,
     OPAL_ACQUIRE_OBJECT(op);
     op->event->index = errhandler_ref;
     opal_output_verbose(5, opal_pmix_base_framework.framework_output,
-                        "PMIX2x errreg_cbfunc - error handler registered status=%d, reference=%lu",
+                        "PMIX3x errreg_cbfunc - error handler registered status=%d, reference=%lu",
                         status, (unsigned long)errhandler_ref);
     if (NULL != op->evregcbfunc) {
         op->evregcbfunc(pmix3x_convert_rc(status), errhandler_ref, op->cbdata);

opal/mca/pmix/ext3x/ext3x.h

@@ -3,8 +3,8 @@
  * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2015 Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2016      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016-2018 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2017      Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -14,8 +14,8 @@
  * $HEADER$
  */
 
-#ifndef MCA_PMIX_PMIX2X_H
-#define MCA_PMIX_PMIX2X_H
+#ifndef MCA_PMIX_PMIX3X_H
+#define MCA_PMIX_PMIX3X_H
 
 #include "opal_config.h"
 
@@ -348,4 +348,4 @@ OPAL_MODULE_DECLSPEC pmix_proc_state_t ext3x_convert_opalstate(int state);
 
 END_C_DECLS
 
-#endif /* MCA_PMIX_EXTERNAL_H */
+#endif /* MCA_PMIX_PMIX3X_H */