build: Remove unused component CFLAGS

A number of components AC_SUBSTed per-component CFLAGS, despite never
setting or (in all but one case) using the variable in the component's
Makefile.am.  Remove this dead code.

Signed-off-by: Brian Barrett <[email protected]>

Author: bwbarrett

ompi/mca/coll/hcoll/configure.m4

@@ -4,6 +4,7 @@
 # Copyright (c) 2011      Mellanox Technologies. All rights reserved.
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -30,7 +31,6 @@ AC_DEFUN([MCA_ompi_coll_hcoll_CONFIG],[
           [$2])
 
     # substitute in the things needed to build hcoll
-    AC_SUBST([coll_hcoll_CFLAGS])
     AC_SUBST([coll_hcoll_CPPFLAGS])
     AC_SUBST([coll_hcoll_LDFLAGS])
     AC_SUBST([coll_hcoll_LIBS])

ompi/mca/coll/ucc/configure.m4

@@ -33,7 +33,6 @@ AC_DEFUN([MCA_ompi_coll_ucc_CONFIG],[
     OPAL_SUMMARY_ADD([Miscellaneous], [Open UCC], [], [$coll_ucc_happy])
 
     # substitute in the things needed to build ucc
-    AC_SUBST([coll_ucc_CFLAGS])
     AC_SUBST([coll_ucc_CPPFLAGS])
     AC_SUBST([coll_ucc_LDFLAGS])
     AC_SUBST([coll_ucc_LIBS])

ompi/mca/mtl/psm2/configure.m4

@@ -13,6 +13,7 @@
 # Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Sandia National Laboratories.  All rights reserved.
 # Copyright (c) 2014      Intel Corporation. All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -42,7 +43,6 @@ AC_DEFUN([MCA_ompi_mtl_psm2_CONFIG],[
           [$2])
 
     # substitute in the things needed to build psm2
-    AC_SUBST([mtl_psm2_CFLAGS])
     AC_SUBST([mtl_psm2_CPPFLAGS])
     AC_SUBST([mtl_psm2_LDFLAGS])
     AC_SUBST([mtl_psm2_LIBS])

ompi/mca/topo/treematch/configure.m4

@@ -9,7 +9,7 @@
 # Copyright (c) 2015      Intel, Inc. All rights reserved.
 # Copyright (c) 2019      Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
-# Copyright (c) 2020      Amazon.com, Inc. or its affiliates.
+# Copyright (c) 2020-2022 Amazon.com, Inc. or its affiliates.  All Rights reserved.
 #                         All Rights reserved.
 # $COPYRIGHT$
 #
@@ -25,7 +25,6 @@ AC_DEFUN([MCA_ompi_topo_treematch_CONFIG], [
     OPAL_CONFIG_TREEMATCH([topo_treematch], [$1], [$2])
     AC_CONFIG_FILES([ompi/mca/topo/treematch/Makefile])
 
-    AC_SUBST([topo_treematch_CFLAGS])
     AC_SUBST([topo_treematch_CPPFLAGS])
     AC_SUBST([topo_treematch_LDFLAGS])
     AC_SUBST([topo_treematch_LIBS])

opal/mca/common/ucx/Makefile.am

@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2018      Mellanox Technologies.  All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -53,8 +54,6 @@ endif
 
 lib@OPAL_LIB_NAME@mca_common_ucx_la_SOURCES = \
         $(headers) $(sources)
-lib@OPAL_LIB_NAME@mca_common_ucx_la_CFLAGS = \
-		$(common_ucx_CFLAGS)
 lib@OPAL_LIB_NAME@mca_common_ucx_la_CPPFLAGS = \
 		$(common_ucx_CPPFLAGS)
 lib@OPAL_LIB_NAME@mca_common_ucx_la_LDFLAGS = \
@@ -66,8 +65,6 @@ lib@OPAL_LIB_NAME@mca_common_ucx_la_LIBADD = \
 		$(OMPI_TOP_BUILDDIR)/opal/mca/memory/libmca_memory.la
 lib@OPAL_LIB_NAME@mca_common_ucx_noinst_la_SOURCES = \
         $(headers) $(sources)
-lib@OPAL_LIB_NAME@mca_common_ucx_noinst_la_CFLAGS = \
-		$(common_ucx_CFLAGS)
 lib@OPAL_LIB_NAME@mca_common_ucx_noinst_la_CPPFLAGS = \
 		$(common_ucx_CPPFLAGS)
 lib@OPAL_LIB_NAME@mca_common_ucx_noinst_la_LDFLAGS = \

opal/mca/common/ucx/configure.m4

@@ -1,6 +1,7 @@
 # -*- shell-script -*-
 #
 # Copyright (c) 2018      Mellanox Technologies.  All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -24,9 +25,7 @@ AC_DEFUN([MCA_opal_common_ucx_CONFIG],[
           [$1],
           [$2])
 
-
     # substitute in the things needed to build common_ucx
-    AC_SUBST([common_ucx_CFLAGS])
     AC_SUBST([common_ucx_CPPFLAGS])
     AC_SUBST([common_ucx_LDFLAGS])
     AC_SUBST([common_ucx_LIBS])

opal/mca/smsc/cma/configure.m4

@@ -9,6 +9,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2021      Google, LLC. All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -24,7 +25,6 @@ AC_DEFUN([MCA_opal_smsc_cma_CONFIG],[
 
     OPAL_CHECK_CMA([smsc_cma], [AC_CHECK_HEADER([sys/prctl.h]) $1], [$2])
 
-    AC_SUBST([smsc_cma_CFLAGS])
     AC_SUBST([smsc_cma_CPPFLAGS])
     AC_SUBST([smsc_cma_LDFLAGS])
     AC_SUBST([smsc_cma_LIBS])

opal/mca/smsc/knem/configure.m4

@@ -9,6 +9,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2021      Google, LLC. All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -24,7 +25,6 @@ AC_DEFUN([MCA_opal_smsc_knem_CONFIG],[
 
     OPAL_CHECK_KNEM([smsc_knem], [$1], [$2])
 
-    AC_SUBST([smsc_knem_CFLAGS])
     AC_SUBST([smsc_knem_CPPFLAGS])
     AC_SUBST([smsc_knem_LDFLAGS])
     AC_SUBST([smsc_knem_LIBS])

opal/mca/smsc/xpmem/configure.m4

@@ -9,6 +9,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2021      Google, LLC. All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -24,7 +25,6 @@ AC_DEFUN([MCA_opal_smsc_xpmem_CONFIG],[
 
     OPAL_CHECK_XPMEM([smsc_xpmem], [$1], [$2])
 
-    AC_SUBST([smsc_xpmem_CFLAGS])
     AC_SUBST([smsc_xpmem_CPPFLAGS])
     AC_SUBST([smsc_xpmem_LDFLAGS])
     AC_SUBST([smsc_xpmem_LIBS])

oshmem/mca/atomic/ucx/configure.m4

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2015      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -24,7 +25,6 @@ AC_DEFUN([MCA_oshmem_atomic_ucx_CONFIG],[
 
 
     # substitute in the things needed to build ucx 
-    AC_SUBST([atomic_ucx_CFLAGS])
     AC_SUBST([atomic_ucx_CPPFLAGS])
     AC_SUBST([atomic_ucx_LDFLAGS])
     AC_SUBST([atomic_ucx_LIBS])