First cut of OMPI Makefile.am's, plus a few more catchup updates in orte

This commit was SVN r6286.

ompi/Makefile.am

@@ -65,7 +65,7 @@ WIN32_FILES = win32/ompi_declspec.h \
               win32/generated_include/pls-fork-version.h \
               win32/generated_include/pls-proxy-version.h \
               win32/generated_include/pls-rsh-version.h \
-              win32/generated_include/libltdl/ltdl.h            \
+              win32/generated_include/libltdl/ltdl.h \
               win32/generated_source/ltdl.c
 EXTRA_DIST = win_makefile $(WIN32_FILES)
 
@@ -104,26 +104,19 @@ endif
 
 SUBDIRS = \
         include \
-        $(LIBLTDL_SUBDIR) \
-	asm \
         attribute \
+        class \
         communicator \
         datatype \
-	dps \
         errhandler \
-        event \
         file \
         group \
         info \
-        class \
         mca \
         mpi \
         op \
         proc \
         request \
-        runtime \
-        threads \
-        util \
         win \
         . \
         dynamic-mca \
@@ -134,67 +127,25 @@ SUBDIRS = \
 lib_LTLIBRARIES = libmpi.la
 libmpi_la_SOURCES =
 libmpi_la_LIBADD = \
-        $(LIBLTDL_LTLIB) \
-	    asm/libasm.la \
         attribute/libattribute.la \
-        class/liblfc.la \
+        class/libclass.la \
         communicator/libcommunicator.la \
         datatype/libdatatype.la \
-	    dps/libdps.la \
         errhandler/liberrhandler.la \
-        event/libevent.la \
         file/libfile.la \
         group/libgroup.la \
         info/libinfo.la \
-        mca/base/libmca_base.la \
-        mca/allocator/base/libmca_allocator_base.la $(MCA_allocator_STATIC_LTLIBS) \
         mca/btl/base/libmca_btl_base.la $(MCA_btl_STATIC_LTLIBS) \
         mca/coll/base/libmca_coll_base.la $(MCA_coll_STATIC_LTLIBS) \
         $(MCA_common_STATIC_LTLIBS) \
-        mca/errmgr/base/libmca_errmgr_base.la \
-        mca/gpr/base/data_type_support/libmca_gpr_base_data_type.la \
-        mca/gpr/base/pack_api_cmd/libmca_gpr_base_pack.la \
-        mca/gpr/base/unpack_api_response/libmca_gpr_base_unpack.la \
-        mca/gpr/base/libmca_gpr_base.la $(MCA_gpr_STATIC_LTLIBS) \
         mca/io/base/libmca_io_base.la $(MCA_io_STATIC_LTLIBS) \
-        mca/iof/base/libmca_iof_base.la $(MCA_iof_STATIC_LTLIBS) \
-        mca/mpool/base/libmca_mpool_base.la $(MCA_mpool_STATIC_LTLIBS) \
-        mca/ns/base/libmca_ns_base.la $(MCA_ns_STATIC_LTLIBS) \
-        mca/ns/base/data_type_support/libmca_ns_base_data_type.la \
-        mca/oob/base/libmca_oob_base.la $(MCA_oob_STATIC_LTLIBS) \
-        mca/pls/base/libmca_pls_base.la $(MCA_pls_STATIC_LTLIBS) \
         mca/pml/base/libmca_pml_base.la $(MCA_pml_STATIC_LTLIBS) \
         mca/ptl/base/libmca_ptl_base.la $(MCA_ptl_STATIC_LTLIBS) \
-        mca/ras/base/libmca_ras_base.la $(MCA_ras_STATIC_LTLIBS) \
-        mca/rds/base/libmca_rds_base.la $(MCA_rds_STATIC_LTLIBS) \
-        mca/rmaps/base/libmca_rmaps_base.la $(MCA_rmaps_STATIC_LTLIBS) \
-        mca/rmgr/base/libmca_orte_rmgr_base.la $(MCA_rmgr_STATIC_LTLIBS) \
-        mca/rmgr/base/data_type_support/libmca_rmgr_base_data_type.la \
-        mca/rml/base/libmca_rml_base.la $(MCA_rml_STATIC_LTLIBS) \
-        mca/schema/base/libmca_schema_base.la $(MCA_schema_STATIC_LTLIBS) \
-        mca/soh/base/libmca_soh_base.la $(MCA_soh_STATIC_LTLIBS) \
-        mca/soh/base/data_type_support/libmca_soh_base_data_type.la \
         mca/topo/base/libmca_topo_base.la $(MCA_topo_STATIC_LTLIBS) \
         mpi/c/libmpi_c.la $(c_mpi_lib) $(c_pmpi_lib) \
         $(f77_base_lib) $(f77_mpi_lib) $(f77_pmpi_lib) \
         mpi/runtime/libmpiruntime.la \
         op/libop.la \
         proc/libproc.la \
-        request/librequest.la \
-        runtime/libruntime.la \
-        threads/libthreads.la \
-        util/libompiutil.la
+        request/librequest.la
 libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD)
-
-# Conditionally install the header files
-
-# This is somewhat of a hack -- libltdl is installed by libtoolize,
-# and us installing the header here is slightly less kludgey than
-# hacking their Makefile.am.
-
-if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/libltdl
-ompi_HEADERS = libltdl/ltdl.h
-else
-ompidir = $(includedir)
-endif

ompi/attribute/Makefile.am

@@ -31,7 +31,7 @@ libattribute_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/attribute
+ompidir = $(includedir)/openmpi/ompi/attribute
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/class/Makefile.am

@@ -0,0 +1,41 @@
+# -*- makefile -*-
+#
+# 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
+
+noinst_LTLIBRARIES = libclass.la
+
+# Source code files
+
+headers = \
+        ompi_bitmap.h \
+        ompi_pointer_array.h
+
+libclass_la_SOURCES = \
+	$(headers) \
+        ompi_bitmap.c \
+        ompi_pointer_array.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/ompi/class
+ompi_HEADERS = $(headers)
+else
+ompidir = $(includedir)
+endif
+

ompi/communicator/Makefile.am

@@ -35,7 +35,7 @@ libcommunicator_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/communicator
+ompidir = $(includedir)/openmpi/ompi/communicator
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/datatype/Makefile.am

@@ -33,7 +33,7 @@ libdatatype_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/datatype
+ompidir = $(includedir)/openmpi/ompi/datatype
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/dynamic-mca/Makefile.am

@@ -18,24 +18,9 @@ include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS = \
         common \
-        allocator \
         btl \
         coll \
-        errmgr \
-        gpr \
         io \
-        iof \
-        mpool \
-        ns \
-        oob \
-	pls \
         pml \
         ptl \
-        rml \
-	ras \
-	rds \
-	rmaps \
-	rmgr \
-	schema \
-        soh \
         topo

ompi/errhandler/Makefile.am

@@ -29,18 +29,18 @@ headers = \
         errhandler_predefined.h
 
 liberrhandler_la_SOURCES = \
-	$(headers) \
+        $(headers) \
         errhandler.c \
         errhandler_invoke.c \
         errhandler_predefined.c \
-	errcode.c \
-	errclass.c  \
-	errcode-internal.c
+        errcode.c \
+        errclass.c  \
+        errcode-internal.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/errhandler
+ompidir = $(includedir)/openmpi/ompi/errhandler
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/file/Makefile.am

@@ -30,7 +30,7 @@ libfile_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/file
+ompidir = $(includedir)/openmpi/ompi/file
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/group/Makefile.am

@@ -25,15 +25,15 @@ headers = \
         group.h
 
 libgroup_la_SOURCES = \
-	$(headers) \
-	group.c    \
-        mpi_group_init.c \
-        mpi_set_group_rank.c
+        $(headers) \
+        group.c \
+        group_init.c \
+        group_rank.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/group
+ompidir = $(includedir)/openmpi/ompi/group
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/include/Makefile.am

@@ -16,20 +16,16 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = sys
-
 noinst_HEADERS = \
         constants.h \
-        orte_constants.h \
-        orte_types.h \
+        ompi_socket_errno.h \
         totalview.h \
-        types.h \
-        ompi_socket_errno.h
+        types.h
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/include
+ompidir = $(includedir)/openmpi/ompi/include
 ompi_HEADERS = $(noinst_HEADERS)
 else
 ompidir = $(includedir)

ompi/info/Makefile.am

@@ -31,7 +31,7 @@ libinfo_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/info
+ompidir = $(includedir)/openmpi/ompi/info
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/Makefile.am

@@ -19,39 +19,10 @@ include $(top_srcdir)/config/Makefile.options
 EXTRA_DIST = win_makefile
 
 SUBDIRS = \
-        allocator \
-	base \
-	coll \
-	common \
-	errmgr \
-	io \
-	iof \
-	gpr \
-	mpool \
-	ns \
-	btl \
-	oob \
-	pls \
-	pml \
-	ptl \
-	rml \
-	ras \
-	rds \
-	rmaps \
-	rmgr \
-	schema \
-	soh \
-	topo
-
-# Source code files
-
-headers = mca.h
-
-# Conditionally install the header files
-
-if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca
-ompi_HEADERS = $(headers)
-else
-ompidir = $(includedir)
-endif
+        btl \
+        coll \
+        common \
+        io \
+        pml \
+        ptl \
+        topo

ompi/mca/btl/Makefile.am

@@ -26,7 +26,7 @@ headers = btl.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/btl
+ompidir = $(includedir)/openmpi/ompi/mca/btl
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/btl/base/Makefile.am

@@ -25,18 +25,18 @@ AM_CPPFLAGS = -I$(top_builddir)/src
 # Source code files
 
 headers = \
-    base.h
+        base.h
 
 libmca_btl_base_la_SOURCES = \
-    $(headers) \
-    btl_base_close.c \
-    btl_base_open.c \
-    btl_base_select.c
+        $(headers) \
+        btl_base_close.c \
+        btl_base_open.c \
+        btl_base_select.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/btl/base
+ompidir = $(includedir)/openmpi/ompi/mca/btl/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/coll/Makefile.am

@@ -26,7 +26,7 @@ headers = coll.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/coll
+ompidir = $(includedir)/openmpi/ompi/mca/coll
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/coll/base/Makefile.am

@@ -27,17 +27,17 @@ headers = \
         coll_tags.h
 
 libmca_coll_base_la_SOURCES = \
-	$(headers) \
-	coll_base_close.c \
-	coll_base_comm_select.c \
-	coll_base_comm_unselect.c \
-	coll_base_find_available.c \
-	coll_base_open.c
+        $(headers) \
+        coll_base_close.c \
+        coll_base_comm_select.c \
+        coll_base_comm_unselect.c \
+        coll_base_find_available.c \
+        coll_base_open.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/coll/base
+ompidir = $(includedir)/openmpi/ompi/mca/coll/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/common/sm/Makefile.am

@@ -82,7 +82,7 @@ libmca_common_sm_noinst_la_SOURCES = $(libmca_common_sm_la_SOURCES)
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/common/sm
+ompidir = $(includedir)/openmpi/ompi/mca/common/sm
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/io/Makefile.am

@@ -26,7 +26,7 @@ headers = io.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/io
+ompidir = $(includedir)/openmpi/ompi/mca/io
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/io/base/Makefile.am

@@ -23,19 +23,19 @@ headers = \
         io_base_request.h
 
 libmca_io_base_la_SOURCES = \
-	$(headers) \
-	io_base_component_list.c \
-	io_base_close.c \
+        $(headers) \
+        io_base_component_list.c \
+        io_base_close.c \
         io_base_delete.c \
-	io_base_file_select.c \
-	io_base_find_available.c \
-	io_base_open.c \
+        io_base_file_select.c \
+        io_base_find_available.c \
+        io_base_open.c \
         io_base_request.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/io/base
+ompidir = $(includedir)/openmpi/ompi/mca/io/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/pml/Makefile.am

@@ -27,7 +27,7 @@ nodist_headers = pml_direct_call.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/pml
+ompidir = $(includedir)/openmpi/ompi/mca/pml
 dist_ompi_HEADERS = $(headers)
 nodist_ompi_HEADERS = $(nodist_headers)
 else

ompi/mca/pml/base/Makefile.am

@@ -26,25 +26,25 @@ AM_CPPFLAGS = -I$(top_builddir)/src
 
 headers = \
         base.h \
-	pml_base_bsend.h \
-	pml_base_request.h \
-	pml_base_recvreq.h \
-	pml_base_sendreq.h
+        pml_base_bsend.h \
+        pml_base_request.h \
+        pml_base_recvreq.h \
+        pml_base_sendreq.h
 
 libmca_pml_base_la_SOURCES = \
         $(headers) \
-	pml_base_bsend.c \
-	pml_base_close.c \
-	pml_base_request.c \
-	pml_base_open.c \
-	pml_base_select.c \
-	pml_base_recvreq.c \
-	pml_base_sendreq.c
+        pml_base_bsend.c \
+        pml_base_close.c \
+        pml_base_request.c \
+        pml_base_open.c \
+        pml_base_select.c \
+        pml_base_recvreq.c \
+        pml_base_sendreq.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/pml/base
+ompidir = $(includedir)/openmpi/ompi/mca/pml/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/ptl/Makefile.am

@@ -26,7 +26,7 @@ headers = ptl.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/ptl
+ompidir = $(includedir)/openmpi/ompi/mca/ptl
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/ptl/base/Makefile.am

@@ -25,33 +25,33 @@ AM_CPPFLAGS = -I$(top_builddir)/src
 # Source code files
 
 headers = \
-    base.h \
-	ptl_base_comm.h \
-	ptl_base_fragment.h \
-	ptl_base_header.h \
-	ptl_base_match.h \
-	ptl_base_recvfrag.h \
-	ptl_base_recvreq.h \
-	ptl_base_sendfrag.h \
-    ptl_base_sendreq.h
+        base.h \
+        ptl_base_comm.h \
+        ptl_base_fragment.h \
+        ptl_base_header.h \
+        ptl_base_match.h \
+        ptl_base_recvfrag.h \
+        ptl_base_recvreq.h \
+        ptl_base_sendfrag.h \
+        ptl_base_sendreq.h
 
 libmca_ptl_base_la_SOURCES = \
-    $(headers) \
-    ptl_base_close.c \
-    ptl_base_comm.c \
-    ptl_base_fragment.c \
-	ptl_base_match.c \
-    ptl_base_open.c \
-    ptl_base_recvfrag.c \
-    ptl_base_recvreq.c \
-    ptl_base_select.c \
-    ptl_base_sendfrag.c \
-    ptl_base_sendreq.c
+        $(headers) \
+        ptl_base_close.c \
+        ptl_base_comm.c \
+        ptl_base_fragment.c \
+        ptl_base_match.c \
+        ptl_base_open.c \
+        ptl_base_recvfrag.c \
+        ptl_base_recvreq.c \
+        ptl_base_select.c \
+        ptl_base_sendfrag.c \
+        ptl_base_sendreq.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/ptl/base
+ompidir = $(includedir)/openmpi/ompi/mca/ptl/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/topo/Makefile.am

@@ -26,7 +26,7 @@ headers = topo.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/topo
+ompidir = $(includedir)/openmpi/ompi/mca/topo
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mca/topo/base/Makefile.am

@@ -44,7 +44,7 @@ libmca_topo_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/topo/base
+ompidir = $(includedir)/openmpi/ompi/mca/topo/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mpi/c/Makefile.am

@@ -370,7 +370,7 @@ endif
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mpi/c
+ompidir = $(includedir)/openmpi/ompi/mpi/c
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mpi/c/profile/Makefile.am

@@ -361,7 +361,7 @@ $(nodist_libmpi_c_pmpi_la_SOURCES):
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mpi/c/profile
+ompidir = $(includedir)/openmpi/ompi/mpi/c/profile
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mpi/cxx/Makefile.am

@@ -60,9 +60,9 @@ headers = \
         errhandler_inln.h \
         status_inln.h
 
-ompidir = $(includedir)/openmpi/mpi/cxx
+ompidir = $(includedir)/openmpi/ompi/mpi/cxx
 ompi_HEADERS = \
-	$(headers)
+        $(headers)
 else
 ompidir = $(includedir)
 endif

ompi/mpi/f77/Makefile.am

@@ -366,7 +366,7 @@ endif
 #
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mpi/f77
+ompidir = $(includedir)/openmpi/ompi/mpi/f77
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mpi/f77/profile/Makefile.am

@@ -341,7 +341,7 @@ $(nodist_libmpi_f77_pmpi_la_SOURCES):
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mpi/f77/profile
+ompidir = $(includedir)/openmpi/ompi/mpi/f77/profile
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/mpi/runtime/Makefile.am

@@ -27,20 +27,20 @@ pkgdata_DATA = help-mpi-runtime.txt
 # Source code files
 
 headers = \
-	mpiruntime.h \
+        mpiruntime.h \
         params.h
 
 libmpiruntime_la_SOURCES = \
-	$(headers) \
-	ompi_mpi_abort.c \
-    ompi_mpi_init.c \
-    ompi_mpi_finalize.c \
-    ompi_mpi_params.c
+        $(headers) \
+        ompi_mpi_abort.c \
+        ompi_mpi_init.c \
+        ompi_mpi_finalize.c \
+        ompi_mpi_params.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mpi/runtime
+ompidir = $(includedir)/openmpi/ompi/mpi/runtime
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/op/Makefile.am

@@ -26,14 +26,14 @@ headers = \
         op_predefined.h
 
 libop_la_SOURCES = \
-	$(headers) \
+        $(headers) \
         op.c \
         op_predefined.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/op
+ompidir = $(includedir)/openmpi/ompi/op
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/proc/Makefile.am

@@ -25,13 +25,13 @@ headers = \
         proc.h
 
 libproc_la_SOURCES = \
-	$(headers) \
-	proc.c
+        $(headers) \
+        proc.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/proc
+ompidir = $(includedir)/openmpi/ompi/proc
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/request/Makefile.am

@@ -22,20 +22,20 @@ noinst_LTLIBRARIES = librequest.la
 # Source code files
 
 headers = \
-    grequest.h \
-    request.h
+        grequest.h \
+        request.h
 
 librequest_la_SOURCES = \
-    $(headers) \
-    grequest.c \
-	request.c \
-    req_test.c \
-    req_wait.c
+        $(headers) \
+        grequest.c \
+        request.c \
+        req_test.c \
+        req_wait.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/request
+ompidir = $(includedir)/openmpi/ompi/request
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

ompi/tools/Makefile.am

@@ -19,4 +19,4 @@ include $(top_srcdir)/config/Makefile.options
 
 EXTRA_DIST = win_makefile
 
-SUBDIRS		= ompi_info wrappers openmpi
+SUBDIRS = ompi_info wrappers

ompi/tools/ompi_info/Makefile.am

@@ -48,7 +48,10 @@ pkgdata_DATA = help-ompi_info.txt
 
 EXTRA_DIST = $(pkgdata_DATA)
 
-libs = $(top_builddir)/src/libmpi.la
+libs = \
+        $(top_builddir)/ompi/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 
 bin_PROGRAMS = ompi_info
 ompi_info_SOURCES = \

ompi/tools/wrappers/Makefile.am

@@ -32,7 +32,8 @@ pkgdata_DATA = help-wrapper.txt
 
 bin_PROGRAMS = mpicc mpic++ mpif77 mpif90
 
-libs = $(top_builddir)/src/libmpi.la
+libs = \
+        $(top_builddir)/opal/libopal.la
 
 wrap_sources = wrap.cc wrap_engine.cc ompi_wrap.h
 

ompi/tools/wrappers/wrap.cc

@@ -215,7 +215,7 @@ ompi_wrap_build_xppflags(const ompi_sv_t & env_list,
     }
 
 #if OMPI_WANT_CXX_BINDINGS
-    xppflags.push_back("-I" + incdir + "/openmpi");
+    xppflags.push_back("-I" + incdir + "/openmpi/ompi");
 #endif
 
 #if defined(WIN32) && WIN32

ompi/win/Makefile.am

@@ -26,12 +26,12 @@ headers = \
 
 libwin_la_SOURCES = \
         $(headers) \
-	win.c
+        win.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/win
+ompidir = $(includedir)/openmpi/ompi/win
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

orte/tools/Makefile.am

@@ -17,4 +17,4 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = console orted orteprobe orterun
+SUBDIRS = console openmpi orted orteprobe orterun

orte/tools/console/Makefile.am

@@ -16,7 +16,9 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-libs = $(top_builddir)/src/libmpi.la
+libs = \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 
 bin_PROGRAMS = \
         orteconsole

orte/tools/openmpi/Makefile.am

@@ -28,12 +28,14 @@ AM_CPPFLAGS = \
             -DOMPI_CONFIGURE_HOST="\"@OMPI_CONFIGURE_HOST@\"" \
             -DOMPI_CONFIGURE_DATE="\"@OMPI_CONFIGURE_DATE@\""
 
-libs = $(top_builddir)/src/libmpi.la
+libs = \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 
 bin_PROGRAMS = openmpi
 
 openmpi_SOURCES = openmpi.h openmpi.c
-openmpi_LDADD = $(libs) $(LIBMPI_EXTRA_LIBS) $(top_builddir)/src/libmpi.la
+openmpi_LDADD = $(LIBMPI_EXTRA_LIBS) $(libs)
 openmpi_DFLAGS = $(LIBMPI_EXTRA_LDFLAGS)
 openmpi_DEPENDENCIES = $(libs)
 

orte/tools/orted/Makefile.am

@@ -35,7 +35,9 @@ AM_CPPFLAGS = \
             -DOMPI_BUILD_LDFLAGS="\"@LDFLAGS@\"" \
             -DOMPI_BUILD_LIBS="\"@LIBS@\""
 
-libs = $(top_builddir)/src/libmpi.la
+libs = \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 
 bin_PROGRAMS = orted
 orted_SOURCES = \

orte/tools/orteprobe/Makefile.am

@@ -35,7 +35,9 @@ AM_CPPFLAGS = \
             -DOMPI_BUILD_LDFLAGS="\"@LDFLAGS@\"" \
             -DOMPI_BUILD_LIBS="\"@LIBS@\""
 
-libs = $(top_builddir)/src/libmpi.la
+libs = \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 
 bin_PROGRAMS = orteprobe
 orteprobe_SOURCES = \

orte/tools/orterun/Makefile.am

@@ -19,7 +19,9 @@ include $(top_srcdir)/config/Makefile.options
 EXTRA_DIST = $(pkgdata_DATA)
 pkgdata_DATA = help-orterun.txt
 
-libs = $(top_builddir)/src/libmpi.la
+libs = \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 
 bin_PROGRAMS = orterun