* fix "make distclean" error in PML

* turns out (duh!) that there was a reason that the <projectdir>dir
  variable was set in the AM conditional.  If not, stupid directories
  are created and not needed...  duh.

This commit was SVN r8205.

ompi/mca/allocator/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_allocator.la
 libmca_allocator_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/allocator
 
 # local files
 headers = allocator.h
@@ -31,6 +30,9 @@ libmca_allocator_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

ompi/mca/bml/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_bml.la
 libmca_bml_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/bml
 
 # local files
 headers = bml.h
@@ -31,6 +30,9 @@ libmca_bml_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

ompi/mca/btl/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_btl.la
 libmca_btl_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/btl
 
 # local files
 headers = btl.h
@@ -31,6 +30,9 @@ libmca_btl_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

ompi/mca/coll/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_coll.la
 libmca_coll_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/coll
 
 # local files
 headers = coll.h
@@ -31,6 +30,9 @@ libmca_coll_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

ompi/mca/io/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_io.la
 libmca_io_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/io
 
 # local files
 headers = io.h
@@ -31,6 +30,9 @@ libmca_io_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

ompi/mca/mpool/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_mpool.la
 libmca_mpool_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/mpool
 
 # local files
 headers = mpool.h
@@ -31,6 +30,9 @@ libmca_mpool_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

ompi/mca/pml/Makefile.am

@@ -21,19 +21,24 @@ noinst_LTLIBRARIES = libmca_pml.la
 libmca_pml_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/pml
+nobase_nodist_ompi_HEADERS =
 
 # local files
 headers = pml.h
-libmca_pml_la_SOURCES += $(headers)
+nodist_headers = pml_direct_call.h
+libmca_pml_la_SOURCES += $(headers) $(nodist_headers)
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+nobase_nodist_ompi_HEADERS += $(nodist_headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am
 
 distclean-local:
-	rm -f base/static-components.h
+	rm -f base/static-components.h pml_direct_call.h

ompi/mca/ptl/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_ptl.la
 libmca_ptl_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/ptl
 
 # local files
 headers = ptl.h
@@ -31,6 +30,9 @@ libmca_ptl_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

ompi/mca/rcache/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_rcache.la
 libmca_rcache_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/rcache
 
 # local files
 headers = rcache.h
@@ -31,6 +30,9 @@ libmca_rcache_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

ompi/mca/topo/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_topo.la
 libmca_topo_la_SOURCES =
 
 # header setup
-nobase_ompi_HEADERS = $(headers)
+nobase_ompi_HEADERS =
-ompidir = $(includedir)/openmpi/ompi/mca/topo
 
 # local files
 headers = topo.h
@@ -31,6 +30,9 @@ libmca_topo_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_ompi_HEADERS += $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am

opal/mca/maffinity/Makefile.am

@@ -22,7 +22,6 @@ libmca_maffinity_la_SOURCES =
 
 # header setup
 nobase_opal_HEADERS =
-opaldir = $(includedir)/openmpi/opal/mca/maffinity
 
 # local files
 headers = maffinity.h maffinity_types.h
@@ -31,6 +30,9 @@ libmca_maffinity_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_opal_HEADERS += $(headers)
+opaldir = $(includedir)/openmpi/opal/mca/maffinity
+else
+opaldir = $(includedir)
 endif
 
 include base/Makefile.am

opal/mca/memory/Makefile.am

@@ -22,7 +22,6 @@ libmca_memory_la_SOURCES =
 
 # header setup
 nobase_opal_HEADERS =
-opaldir = $(includedir)/openmpi/opal/mca/memory
 
 # local files
 headers = memory.h
@@ -31,6 +30,9 @@ libmca_memory_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_opal_HEADERS += $(headers)
+opaldir = $(includedir)/openmpi/opal/mca/memory
+else
+opaldir = $(includedir)
 endif
 
 include base/Makefile.am

opal/mca/paffinity/Makefile.am

@@ -22,7 +22,6 @@ libmca_paffinity_la_SOURCES =
 
 # header setup
 nobase_opal_HEADERS =
-opaldir = $(includedir)/openmpi/opal/mca/paffinity
 
 # local files
 headers = paffinity.h
@@ -31,6 +30,9 @@ libmca_paffinity_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_opal_HEADERS += $(headers)
+opaldir = $(includedir)/openmpi/opal/mca/paffinity
+else
+opaldir = $(includedir)
 endif
 
 include base/Makefile.am

opal/mca/timer/Makefile.am

@@ -23,7 +23,6 @@ libmca_timer_la_SOURCES =
 # header setup
 nobase_opal_HEADERS =
 nobase_nodist_opal_HEADERS =
-opaldir = $(includedir)/openmpi/opal/mca/timer
 
 # local files
 headers = timer.h
@@ -34,6 +33,9 @@ libmca_timer_la_SOURCES += $(headers)
 if WANT_INSTALL_HEADERS
 nobase_opal_HEADERS += $(headers)
 nobase_nodist_opal_HEADERS += $(nodist_headers)
+opaldir = $(includedir)/openmpi/opal/mca/timer
+else
+opaldir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/errmgr/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_errmgr.la
 libmca_errmgr_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/errmgr
 
 # local files
 headers = errmgr.h
@@ -31,6 +30,9 @@ libmca_errmgr_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/gpr/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_gpr.la
 libmca_gpr_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/gpr
 
 # local files
 headers = gpr.h gpr_types.h
@@ -31,6 +30,9 @@ libmca_gpr_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/iof/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_iof.la
 libmca_iof_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/iof
 
 # local files
 headers = iof.h
@@ -31,6 +30,9 @@ libmca_iof_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/ns/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_ns.la
 libmca_ns_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/ns
 
 # local files
 headers = ns.h ns_types.h
@@ -31,6 +30,9 @@ libmca_ns_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/oob/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_oob.la
 libmca_oob_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/oob
 
 # local files
 headers = oob.h oob_types.h
@@ -31,6 +30,9 @@ libmca_oob_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/pls/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_pls.la
 libmca_pls_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/pls
 
 # local files
 headers = pls.h
@@ -31,6 +30,9 @@ libmca_pls_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/ras/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_ras.la
 libmca_ras_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/ras
 
 # local files
 headers = ras.h ras_types.h
@@ -31,6 +30,9 @@ libmca_ras_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/rds/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_rds.la
 libmca_rds_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/rds
 
 # local files
 headers = rds.h rds_types.h
@@ -31,6 +30,9 @@ libmca_rds_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/rmaps/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_rmaps.la
 libmca_rmaps_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/rmaps
 
 # local files
 headers = rmaps.h rmaps_types.h
@@ -31,6 +30,9 @@ libmca_rmaps_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/rmgr/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_rmgr.la
 libmca_rmgr_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/rmgr
 
 # local files
 headers = rmgr.h rmgr_types.h
@@ -31,6 +30,9 @@ libmca_rmgr_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/rml/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_rml.la
 libmca_rml_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/rml
 
 # local files
 headers = rml.h rml_types.h
@@ -31,6 +30,9 @@ libmca_rml_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/schema/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_schema.la
 libmca_schema_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/schema
 
 # local files
 headers = schema.h schema_types.h
@@ -31,6 +30,9 @@ libmca_schema_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/sds/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_sds.la
 libmca_sds_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/sds
 
 # local files
 headers = sds.h
@@ -31,6 +30,9 @@ libmca_sds_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am

orte/mca/soh/Makefile.am

@@ -21,8 +21,7 @@ noinst_LTLIBRARIES = libmca_soh.la
 libmca_soh_la_SOURCES =
 
 # header setup
-nobase_orte_HEADERS = $(headers)
+nobase_orte_HEADERS =
-ortedir = $(includedir)/openmpi/orte/mca/soh
 
 # local files
 headers = soh.h soh_types.h
@@ -31,6 +30,9 @@ libmca_soh_la_SOURCES += $(headers)
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
 nobase_orte_HEADERS += $(headers)
+ortedir = $(includedir)/openmpi/orte/mca/errmgr
+else
+ortedir = $(includedir)
 endif
 
 include base/Makefile.am