From 2fc377a408a6344f7c8ab47d25896e0d71fdbcf1 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Sat, 10 Jan 2004 21:32:32 +0000
Subject: [PATCH] Updates to reflect new directory structure

This commit was SVN r227.
---
 autogen.sh                                 |  2 +-
 configure.ac                               | 17 +++++++++------
 src/mpi/Makefile.am                        | 24 ++++++---------------
 src/mpi/communicator/Makefile.am           |  7 ++++++
 src/mpi/datatype/Makefile.am               | 12 +++++------
 src/mpi/interface/.cvsignore               |  4 ++++
 src/mpi/interface/Makefile.am              | 25 +++-------------------
 src/mpi/interface/c/alloc_mem.c            |  4 ++--
 src/mpi/interface/c/comm_set_name.c        |  2 +-
 src/mpi/interface/c/finalize.c             |  2 +-
 src/mpi/interface/c/free_mem.c             |  3 ++-
 src/mpi/interface/c/init.c                 |  2 +-
 src/mpi/interface/f77/alloc_mem_f.c        |  2 +-
 src/mpi/interface/f77/bindings.h           |  6 +++---
 src/mpi/interface/f77/comm_set_name_f.c    |  2 +-
 src/mpi/interface/f77/finalize_f.c         |  2 +-
 src/mpi/interface/f77/free_mem_f.c         |  2 +-
 src/mpi/interface/f77/init_f.c             |  2 +-
 src/mpi/interface/f77/profile/prototypes.h |  2 +-
 19 files changed, 53 insertions(+), 69 deletions(-)
 create mode 100644 src/mpi/communicator/Makefile.am
 create mode 100644 src/mpi/interface/.cvsignore

diff --git a/autogen.sh b/autogen.sh
index 279db3d802..ee60152c32 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -270,7 +270,7 @@ fi
 
 
 # make sure we are at the top of the tree
-if test -f VERSION -a -f configure.ac -a -f src/mpi/c/init.c ; then
+if test -f VERSION -a -f configure.ac -a -f src/mpi/interface/c/init.c ; then
     bad=0
 else
     cat <<EOF
diff --git a/configure.ac b/configure.ac
index d77beefd56..dd28e98c37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 
 # Init autoconf
 
-AC_INIT(./src/mpi/c/init.c)
+AC_INIT(./src/mpi/interface/c/init.c)
 AC_PREREQ(2.52)
 AC_CONFIG_AUX_DIR(./config)
 
@@ -416,12 +416,15 @@ AC_CONFIG_FILES([
     src/lam/util/Makefile
 
     src/mpi/Makefile
-    src/mpi/c/Makefile
-    src/mpi/c/profile/Makefile
-    src/mpi/cxx/Makefile
-    src/mpi/f77/Makefile
-    src/mpi/f77/profile/Makefile
-    src/mpi/f90/Makefile
+    src/mpi/communicator/Makefile
+    src/mpi/datatype/Makefile
+    src/mpi/interface/Makefile
+    src/mpi/interface/c/Makefile
+    src/mpi/interface/c/profile/Makefile
+    src/mpi/interface/cxx/Makefile
+    src/mpi/interface/f77/Makefile
+    src/mpi/interface/f77/profile/Makefile
+    src/mpi/interface/f90/Makefile
 
     src/mca/Makefile
     src/mca/common/Makefile
diff --git a/src/mpi/Makefile.am b/src/mpi/Makefile.am
index c6962e9d52..f18de0d85e 100644
--- a/src/mpi/Makefile.am
+++ b/src/mpi/Makefile.am
@@ -5,23 +5,7 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-# See if configure found a valid f77 compiler
-
-if BUILD_MPI_F77
-f77_lib = f77/libmpi_f77.la
-else
-f77_lib =
-endif
-
-# See if configure found a valid f90/f95 compiler
-
-if BUILD_MPI_F90
-f90_lib =
-else
-f90_lib =
-endif
-
-SUBDIRS = c cxx f77 f90
+SUBDIRS = communicator datatype interface
 
 # If the --enable-single-library flag was given to configure, then the
 # user wants to merge liblam and libmpi into a single big, honkin'
@@ -39,7 +23,11 @@ endif
 lib_LTLIBRARIES = $(install_lib)
 noinst_LTLIBRARIES = $(convenience_lib)
 
-sources = c/libmpi_c.la $(f77_lib) $(f90_lib)
+# To be added shortly
+#        communicator/libmpi_communicator.la \
+sources = \
+        datatype/libmpi_datatype.la \
+        interface/libmpi_interface.la
 
 libmpi_la_SOURCES =
 libmpi_la_LIBADD = $(sources)
diff --git a/src/mpi/communicator/Makefile.am b/src/mpi/communicator/Makefile.am
new file mode 100644
index 0000000000..343ec0a9c7
--- /dev/null
+++ b/src/mpi/communicator/Makefile.am
@@ -0,0 +1,7 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
diff --git a/src/mpi/datatype/Makefile.am b/src/mpi/datatype/Makefile.am
index 4f53a8fc20..b1edaa20f4 100644
--- a/src/mpi/datatype/Makefile.am
+++ b/src/mpi/datatype/Makefile.am
@@ -5,21 +5,21 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_LTLIBRARIES = libdatatype.la
+noinst_LTLIBRARIES = libmpi_datatype.la
 
 # Source code files
 
 headers = \
-	datatype.h
+        datatype.h
 
-liblfc_la_SOURCES = \
-	$(headers) \
-	datatype.c
+libmpi_datatype_la_SOURCES = \
+        $(headers) \
+        datatype.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-lamdir = $(includedir)/lam/lam/datatype
+lamdir = $(includedir)/lam/mpi/datatype
 lam_HEADERS = $(headers)
 else
 lamdir = $(includedir)
diff --git a/src/mpi/interface/.cvsignore b/src/mpi/interface/.cvsignore
new file mode 100644
index 0000000000..7bf5b21b3a
--- /dev/null
+++ b/src/mpi/interface/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+*.la
+.libs
diff --git a/src/mpi/interface/Makefile.am b/src/mpi/interface/Makefile.am
index c6962e9d52..f16151a614 100644
--- a/src/mpi/interface/Makefile.am
+++ b/src/mpi/interface/Makefile.am
@@ -23,26 +23,7 @@ endif
 
 SUBDIRS = c cxx f77 f90
 
-# If the --enable-single-library flag was given to configure, then the
-# user wants to merge liblam and libmpi into a single big, honkin'
-# libmpi.  So the libmpi in this directory should be a convenience
-# (noinst) library.  Otherwise, it should be installed into lib.
+noinst_LTLIBRARIES = libmpi_interface.la
 
-if WANT_SINGLE_MPI_LIBRARY
-install_lib =
-convenience_lib = libmpi_convenience.la
-else
-install_lib = libmpi.la
-convenience_lib =
-endif
-
-lib_LTLIBRARIES = $(install_lib)
-noinst_LTLIBRARIES = $(convenience_lib)
-
-sources = c/libmpi_c.la $(f77_lib) $(f90_lib)
-
-libmpi_la_SOURCES =
-libmpi_la_LIBADD = $(sources)
-
-libmpi_convenience_la_SOURCES =
-libmpi_convenience_la_LIBADD = $(sources)
+libmpi_interface_la_SOURCES =
+libmpi_interface_la_LIBADD = c/libmpi_c.la $(f77_lib) $(f90_lib)
diff --git a/src/mpi/interface/c/alloc_mem.c b/src/mpi/interface/c/alloc_mem.c
index d504da6fca..8c2119f199 100644
--- a/src/mpi/interface/c/alloc_mem.c
+++ b/src/mpi/interface/c/alloc_mem.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "mpi/c/bindings.h"
+#include "mpi/interface/c/bindings.h"
 
 #if LAM_WANT_MPI_PROFILING && LAM_HAVE_WEAK_SYMBOLS
 #pragma weak PMPI_Alloc_mem = MPI_Alloc_mem
@@ -19,7 +19,7 @@ int MPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr)
   if (size < 0) {
     /* Return error on MPI_COMM_WORLD */
   }
-  if (baseptr == NULL) {
+  if (NULL == baseptr) {
     /* Return error on MPI_COMM_WORLD */
   }
 
diff --git a/src/mpi/interface/c/comm_set_name.c b/src/mpi/interface/c/comm_set_name.c
index f002cc351c..41bd92c8d2 100644
--- a/src/mpi/interface/c/comm_set_name.c
+++ b/src/mpi/interface/c/comm_set_name.c
@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include "mpi.h"
-#include "mpi/c/bindings.h"
+#include "mpi/interface/c/bindings.h"
 #include "lam/util/strncpy.h"
 #include "lam/communicator.h"
 #include "lam/totalview.h"
diff --git a/src/mpi/interface/c/finalize.c b/src/mpi/interface/c/finalize.c
index d5ae3056f2..70b7c45c03 100644
--- a/src/mpi/interface/c/finalize.c
+++ b/src/mpi/interface/c/finalize.c
@@ -5,7 +5,7 @@
 #include "lam_config.h"
 
 #include "mpi.h"
-#include "mpi/c/bindings.h"
+#include "mpi/interface/c/bindings.h"
 
 #if LAM_WANT_MPI_PROFILING && LAM_HAVE_WEAK_SYMBOLS
 #pragma weak PMPI_Finalize = MPI_Finalize
diff --git a/src/mpi/interface/c/free_mem.c b/src/mpi/interface/c/free_mem.c
index 5323d160d1..a868f88b7f 100644
--- a/src/mpi/interface/c/free_mem.c
+++ b/src/mpi/interface/c/free_mem.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
+#include "mpi/interface/c/bindings.h"
 
 #if LAM_WANT_MPI_PROFILING && LAM_HAVE_WEAK_SYMBOLS
 #pragma weak PMPI_Free_mem = MPI_Free_mem
@@ -15,7 +16,7 @@
 
 int MPI_Free_mem(void *baseptr)
 {
-  if (baseptr == NULL) {
+  if (NULL == baseptr) {
     /* Return error on MPI_COMM_WORLD */
   }
 
diff --git a/src/mpi/interface/c/init.c b/src/mpi/interface/c/init.c
index f6822618f1..173ecbcd68 100644
--- a/src/mpi/interface/c/init.c
+++ b/src/mpi/interface/c/init.c
@@ -5,7 +5,7 @@
 #include "lam_config.h"
 
 #include "mpi.h"
-#include "mpi/c/bindings.h"
+#include "mpi/interface/c/bindings.h"
 
 #if LAM_WANT_MPI_PROFILING && LAM_HAVE_WEAK_SYMBOLS
 #pragma weak PMPI_Init = MPI_Init
diff --git a/src/mpi/interface/f77/alloc_mem_f.c b/src/mpi/interface/f77/alloc_mem_f.c
index de3226a8bd..f21b64b462 100644
--- a/src/mpi/interface/f77/alloc_mem_f.c
+++ b/src/mpi/interface/f77/alloc_mem_f.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "mpi/f77/bindings.h"
+#include "mpi/interface/f77/bindings.h"
 
 #if LAM_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_ALLOC_MEM = mpi_alloc_mem_f
diff --git a/src/mpi/interface/f77/bindings.h b/src/mpi/interface/f77/bindings.h
index 760c6486b8..13096ab35e 100644
--- a/src/mpi/interface/f77/bindings.h
+++ b/src/mpi/interface/f77/bindings.h
@@ -15,7 +15,7 @@
  * Yes, kids, that's one of 8 possible sets of #define's.  :-\
  */
 
-#include "mpi/f77/prototypes.h"
+#include "mpi/interface/f77/prototypes.h"
 
 #if LAM_HAVE_WEAK_SYMBOLS
 /* If we have weak symbols, then we compile the functions as the
@@ -27,7 +27,7 @@
    the profiled prototypes are generated with #defines that map
    mpi->pmpi and MPI->PMPI, which screws up the non-weak-symbols stuff
    (because they have their own #defines). */
-#include "mpi/f77/profile/prototypes.h"
+#include "mpi/interface/f77/profile/prototypes.h"
 #else
 /* We don't have weak symbols. */
 #if LAM_PROFILING_DEFINES
@@ -35,7 +35,7 @@
    LAM_PROFILING_DEFINES will be 1.  In this case, get the defines
    mapping from mpi_foo_f to the profiling name in the proper symbol
    convention. */
-#include "mpi/f77/profile/defines.h"
+#include "mpi/interface/f77/profile/defines.h"
 #else
 /* Otherwise, we're compiling in the main directory, so get the
    defines mapping from mpi_foo_f to the proper symbol convention. */
diff --git a/src/mpi/interface/f77/comm_set_name_f.c b/src/mpi/interface/f77/comm_set_name_f.c
index 3c099dc508..e621e8050a 100644
--- a/src/mpi/interface/f77/comm_set_name_f.c
+++ b/src/mpi/interface/f77/comm_set_name_f.c
@@ -5,7 +5,7 @@
 #include "lam_config.h"
 
 #include "mpi.h"
-#include "mpi/f77/bindings.h"
+#include "mpi/interface/f77/bindings.h"
 
 #if LAM_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_COMM_SET_NAME = mpi_comm_set_name_f
diff --git a/src/mpi/interface/f77/finalize_f.c b/src/mpi/interface/f77/finalize_f.c
index 7a4aada78c..98534012f1 100644
--- a/src/mpi/interface/f77/finalize_f.c
+++ b/src/mpi/interface/f77/finalize_f.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "mpi/f77/bindings.h"
+#include "mpi/interface/f77/bindings.h"
 
 #if LAM_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_FINALIZE = mpi_finalize_f
diff --git a/src/mpi/interface/f77/free_mem_f.c b/src/mpi/interface/f77/free_mem_f.c
index e8cc6886e8..087d9c43e2 100644
--- a/src/mpi/interface/f77/free_mem_f.c
+++ b/src/mpi/interface/f77/free_mem_f.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "mpi/f77/bindings.h"
+#include "mpi/interface/f77/bindings.h"
 
 #if LAM_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_FREE_MEM = mpi_free_mem_f
diff --git a/src/mpi/interface/f77/init_f.c b/src/mpi/interface/f77/init_f.c
index 69ececacb7..0295c12ecc 100644
--- a/src/mpi/interface/f77/init_f.c
+++ b/src/mpi/interface/f77/init_f.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "mpi/f77/bindings.h"
+#include "mpi/interface/f77/bindings.h"
 
 #if LAM_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_INIT = mpi_init_f
diff --git a/src/mpi/interface/f77/profile/prototypes.h b/src/mpi/interface/f77/profile/prototypes.h
index d27090028a..c3d3c886bb 100644
--- a/src/mpi/interface/f77/profile/prototypes.h
+++ b/src/mpi/interface/f77/profile/prototypes.h
@@ -49,6 +49,6 @@
 /*
  * Now include the real prototypes.  Magic.  :-)
  */
-#include "mpi/f77/prototypes.h"
+#include "mpi/interface/f77/prototypes.h"
 
 #endif /* LAM_F77_PROTOTYPES_PROFILING_H */