More orte Makefile.am updates

This commit was SVN r6287.

orte/class/Makefile.am

@@ -37,8 +37,8 @@ libclass_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/orte/class
+ortedir = $(includedir)/openmpi/orte/class
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/dps/Makefile.am

@@ -39,8 +39,8 @@ libdps_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/orte/dps
+ortedir = $(includedir)/openmpi/orte/dps
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/include/Makefile.am

@@ -23,8 +23,8 @@ noinst_HEADERS = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/orte/include
+ortedir = $(includedir)/openmpi/orte/include
-ompi_HEADERS = $(noinst_HEADERS)
+orte_HEADERS = $(noinst_HEADERS)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/Makefile.am

@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+SUBDIRS = \
+        errmgr \
+        gpr \
+        iof \
+        ns \
+        oob \
+        pls \
+        ras \
+        rds \
+        rmaps \
+        rmgr \
+        rml \
+        schema \
+        soh

orte/mca/errmgr/Makefile.am

@@ -27,8 +27,8 @@ headers = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/errmgr
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/errmgr/base/Makefile.am

@@ -40,8 +40,8 @@ libmca_errmgr_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/errmgr/base
+ortedir = $(includedir)/openmpi/orte/mca/errmgr/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/gpr/Makefile.am

@@ -27,8 +27,8 @@ headers = gpr.h \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/gpr
+ortedir = $(includedir)/openmpi/orte/mca/gpr
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/gpr/base/Makefile.am

@@ -39,9 +39,9 @@ libmca_gpr_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/gpr/base
+ortedir = $(includedir)/openmpi/orte/mca/gpr/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/gpr/base/data_type_support/Makefile.am

@@ -30,9 +30,9 @@ libmca_gpr_base_data_type_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/gpr/base/data_type_support
+ortedir = $(includedir)/openmpi/orte/mca/gpr/base/data_type_support
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/gpr/base/pack_api_cmd/Makefile.am

@@ -34,9 +34,9 @@ libmca_gpr_base_pack_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/gpr/base/pack_api_cmd
+ortedir = $(includedir)/openmpi/orte/mca/gpr/base/pack_api_cmd
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/gpr/base/unpack_api_response/Makefile.am

@@ -35,9 +35,9 @@ libmca_gpr_base_unpack_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/gpr/base/unpack_api_response
+ortedir = $(includedir)/openmpi/orte/mca/gpr/base/unpack_api_response
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/iof/Makefile.am

@@ -26,8 +26,8 @@ headers = iof.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/iof
+ortedir = $(includedir)/openmpi/orte/mca/iof
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/iof/base/Makefile.am

@@ -44,9 +44,9 @@ libmca_iof_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/iof/base
+ortedir = $(includedir)/openmpi/orte/mca/iof/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/ns/Makefile.am

@@ -28,8 +28,8 @@ headers = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/ns
+ortedir = $(includedir)/openmpi/orte/mca/ns
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/ns/base/Makefile.am

@@ -47,8 +47,8 @@ libmca_ns_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/ns/base
+ortedir = $(includedir)/openmpi/orte/mca/ns/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/ns/base/data_type_support/Makefile.am

@@ -30,9 +30,9 @@ libmca_ns_base_data_type_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/ns/base/data_type_support
+ortedir = $(includedir)/openmpi/orte/mca/ns/base/data_type_support
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/oob/Makefile.am

@@ -28,8 +28,8 @@ headers = oob.h \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/oob
+ortedir = $(includedir)/openmpi/orte/mca/oob
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/oob/base/Makefile.am

@@ -45,8 +45,8 @@ libmca_oob_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/oob/base
+ortedir = $(includedir)/openmpi/orte/mca/oob/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/pls/Makefile.am

@@ -26,8 +26,8 @@ headers = pls.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/pls
+ortedir = $(includedir)/openmpi/orte/mca/pls
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/pls/base/Makefile.am

@@ -37,9 +37,9 @@ libmca_pls_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/pls/base
+ortedir = $(includedir)/openmpi/orte/mca/pls/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/ras/Makefile.am

@@ -28,8 +28,8 @@ headers = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/ras
+ortedir = $(includedir)/openmpi/orte/mca/ras
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/ras/base/Makefile.am

@@ -42,8 +42,8 @@ libmca_ras_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/ras/base
+ortedir = $(includedir)/openmpi/orte/mca/ras/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/rds/Makefile.am

@@ -28,8 +28,8 @@ headers = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rds
+ortedir = $(includedir)/openmpi/orte/mca/rds
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/rds/base/Makefile.am

@@ -41,8 +41,8 @@ libmca_rds_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rds/base
+ortedir = $(includedir)/openmpi/orte/mca/rds/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/rmaps/Makefile.am

@@ -28,8 +28,8 @@ headers = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rmaps
+ortedir = $(includedir)/openmpi/orte/mca/rmaps
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/rmaps/base/Makefile.am

@@ -41,8 +41,8 @@ libmca_rmaps_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rmaps/base
+ortedir = $(includedir)/openmpi/orte/mca/rmaps/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/rmgr/Makefile.am

@@ -28,8 +28,8 @@ headers = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rmgr
+ortedir = $(includedir)/openmpi/orte/mca/rmgr
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/rmgr/base/Makefile.am

@@ -46,8 +46,8 @@ libmca_orte_rmgr_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rmgr/base
+ortedir = $(includedir)/openmpi/orte/mca/rmgr/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/rmgr/base/data_type_support/Makefile.am

@@ -30,9 +30,9 @@ libmca_rmgr_base_data_type_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rmgr/base/data_type_support
+ortedir = $(includedir)/openmpi/orte/mca/rmgr/base/data_type_support
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/rml/Makefile.am

@@ -28,8 +28,8 @@ headers = rml.h \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rml
+ortedir = $(includedir)/openmpi/orte/mca/rml
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/rml/base/Makefile.am

@@ -36,9 +36,9 @@ libmca_rml_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rml/base
+ortedir = $(includedir)/openmpi/orte/mca/rml/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/schema/Makefile.am

@@ -27,8 +27,8 @@ headers = schema.h \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/schema
+ortedir = $(includedir)/openmpi/orte/mca/schema
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/schema/base/Makefile.am

@@ -39,9 +39,9 @@ libmca_schema_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/schema/base
+ortedir = $(includedir)/openmpi/orte/mca/schema/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/mca/soh/Makefile.am

@@ -27,8 +27,8 @@ headers = soh.h \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/soh
+ortedir = $(includedir)/openmpi/orte/mca/soh
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/soh/base/Makefile.am

@@ -44,8 +44,8 @@ libmca_soh_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/soh/base
+ortedir = $(includedir)/openmpi/orte/mca/soh/base
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/mca/soh/base/data_type_support/Makefile.am

@@ -30,9 +30,9 @@ libmca_soh_base_data_type_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/soh/base/data_type_support
+ortedir = $(includedir)/openmpi/orte/mca/soh/base/data_type_support
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif
 

orte/runtime/Makefile.am

@@ -47,8 +47,8 @@ libruntime_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/orte/runtime
+ortedir = $(includedir)/openmpi/orte/runtime
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif

orte/util/Makefile.am

@@ -40,8 +40,8 @@ liborteutil_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/orte/util
+ortedir = $(includedir)/openmpi/orte/util
-ompi_HEADERS = $(headers)
+orte_HEADERS = $(headers)
 else
-ompidir = $(includedir)
+ortedir = $(includedir)
 endif