Next step in the project split, mainly source code re-arranging

  - move files out of toplevel include/ and etc/, moving it into the
    sub-projects
  - rather than including config headers with <project>/include, 
    have them as <project>
  - require all headers to be included with a project prefix, with
    the exception of the config headers ({opal,orte,ompi}_config.h
    mpi.h, and mpif.h)

This commit was SVN r8985.

Author: Brian Barrett

Makefile.am

@@ -16,7 +16,7 @@
 # $HEADER$
 #
 
-SUBDIRS = config include etc contrib $(MCA_PROJECT_SUBDIRS) test
+SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
 EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE
 
 dist-hook:

acinclude.m4

@@ -102,12 +102,4 @@ m4_include(config/mca_no_configure_components.m4)
 # mca_m4_config_include.m4 is generated by autogen.sh.  It includes
 # the list of all component configure.m4 macros.
 #
-# Some explination... There doesn't seem to be a good way to have 
-# this include file live in config/, because autoheader does it's
-# analysis without taking into account the directory in which the .m4
-# file calling m4_include is in, while autoconf does take the directory
-# into account.  So you end up with a situation where you need two
-# directories listed in the single m4_include.  If anyone knows a way
-# to move mca_m4_config_include.m4 into config/, I'd appreciate it.
-#
-m4_include(mca_m4_config_include.m4)
+m4_include(config/mca_m4_config_include.m4)

autogen.sh

@@ -79,9 +79,10 @@ ompi_automake=""
 mca_no_configure_components_file="config/mca_no_configure_components.m4"
 mca_no_config_list_file="mca_no_config_list"
 mca_no_config_env_file="mca_no_config_env"
-mca_m4_include_file="mca_m4_config_include.m4"
+mca_m4_include_file="config/mca_m4_config_include.m4"
 mca_m4_config_env_file="mca_m4_config_env"
 autogen_subdir_file="autogen.subdirs"
+topdir_file="opal/include/opal_config_bottom.h"
 
 ############################################################################
 #
@@ -380,7 +381,7 @@ EOF
 
     echo "*** Running GNU tools"
 
-    if test -f include/mpi.h.in; then
+    if test -f $topdir_file ; then
 	cd config
 	run_and_check $ompi_autom4te --language=m4sh ompi_get_version.m4sh -o ompi_get_version.sh
 	cd ..
@@ -396,7 +397,7 @@ EOF
     # We only need the libltdl stuff for the top-level
     # configure, not any of the MCA components.
 
-    if test -f include/mpi.h.in; then
+    if test -f $topdir_file ; then
 	rm -rf libltdl opal/libltdl opal/ltdl.h
 	run_and_check $ompi_libtoolize --automake --copy --ltdl
         if test -d libltdl; then
@@ -1076,7 +1077,7 @@ fi
 
 # figure out if we're at the top level of the OMPI tree, a component's
 # top-level directory, or somewhere else.
-if test -f VERSION -a -f configure.ac -a -f include/mpi.h.in ; then
+if test -f VERSION -a -f configure.ac -a -f $topdir_file ; then
     # locations to look for mca modules
     config_project_list="opal orte ompi"
     if test "$no_ompi" = "1" ; then

config/ompi_setup_wrappers.m4

@@ -139,7 +139,7 @@ AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
 
     AC_MSG_CHECKING([for OPAL extra include dirs])
     if test "$WANT_INSTALL_HEADERS" = "1" ; then
-        OPAL_WRAPPER_EXTRA_INCLUDES="openmpi openmpi/opal"
+        OPAL_WRAPPER_EXTRA_INCLUDES="openmpi"
     else
         OPAL_WRAPPER_EXTRA_INCLUDES=
     fi
@@ -179,11 +179,7 @@ AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
     AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_LIBS])
 
     AC_MSG_CHECKING([for ORTE extra include dirs])
-    if test "$WANT_INSTALL_HEADERS" = "1" ; then
-        ORTE_WRAPPER_EXTRA_INCLUDES="$OPAL_WRAPPER_EXTRA_INCLUDES openmpi openmpi/opal openmpi/orte"
-    else
-        ORTE_WRAPPER_EXTRA_INCLUDES="$OPAL_WRAPPER_EXTRA_INCLUDES"
-    fi
+    ORTE_WRAPPER_EXTRA_INCLUDES="$OPAL_WRAPPER_EXTRA_INCLUDES"
     AC_SUBST([ORTE_WRAPPER_EXTRA_INCLUDES])
     AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_INCLUDES])
 
@@ -231,9 +227,10 @@ AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
 
     AC_MSG_CHECKING([for OMPI extra include dirs])
     if test "$WANT_INSTALL_HEADERS" = "1" ; then
-        OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES openmpi openmpi/opal openmpi/orte openmpi/ompi"
+        # Always include openmpi in case C++ bindings get installed
+        OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES"
     else
-        OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES openmpi/ompi"
+        OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES openmpi"
     fi
     AC_SUBST([OMPI_WRAPPER_EXTRA_INCLUDES])
     AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_INCLUDES])

configure.ac

@@ -185,7 +185,7 @@ if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then
     AC_MSG_NOTICE([Detected VPATH build])
 fi
 
-# Setup the top of the include/ompi_config.h file
+# Setup the top of the opal/include/opal_config.h file
 
 AH_TOP([/* -*- c -*-
  *
@@ -206,12 +206,12 @@ AH_TOP([/* -*- c -*-
  * Function: - OS, CPU and compiler dependent configuration 
  */
 
-#ifndef OMPI_CONFIG_H
-#define OMPI_CONFIG_H
+#ifndef OPAL_CONFIG_H
+#define OPAL_CONFIG_H
 ])
 AH_BOTTOM([
-#include "ompi_config_bottom.h"
-#endif /* OMPI_CONFIG_H */
+#include "opal_config_bottom.h"
+#endif /* OPAL_CONFIG_H */
 ])
 
 # Other basic setup stuff (shared with components)
@@ -1485,14 +1485,18 @@ ompi_show_subtitle "Compiler flags"
 # '-I$(top_srcdir)' doesn't show up in any of the configure output --
 # purely aesthetic.
 #
-# JMS: Someday to remove the -I's for the individual ompi, orte, opal
-# directories -- the top-level ones will suffice after all #include's
-# throughout the tree are converted to use the full path of our header
-# files.
+# Because opal_config.h, orte_config.h, and ompi_config.h are all
+# created by AC_CONFIG_HEADERS, we don't need to -I the builddir for
+# <project>/include.  If we VPATH building, we do need to include the
+# source directories, however.
 #
-
-CPPFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/opal -I$(top_srcdir)/orte -I$(top_srcdir)/ompi'" $CPPFLAGS"
-CXXCPPFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/opal -I$(top_srcdir)/orte -I$(top_srcdir)/ompi'" $CXXCPPFLAGS"
+if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then
+    CPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_srcdir)/ompi/include'"$CPPFLAGS"
+    CXXCPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_srcdir)/ompi/include'"$CXXCPPFLAGS"
+else
+    CPPFLAGS='-I$(top_srcdir)'"$CPPFLAGS"
+    CXXCPPFLAGS='-I$(top_srcdir)'"$CXXCPPFLAGS"
+fi
 
 #
 # Do a final process of the CFLAGS to make a WITHOUT_OPTFLAGS version.
@@ -1541,19 +1545,17 @@ OMPI_SETUP_WRAPPER_FINAL
 
 ompi_show_subtitle "Final output" 
 
-AM_CONFIG_HEADER([include/ompi_config.h include/mpi.h])
+AM_CONFIG_HEADER([opal/include/opal_config.h orte/include/orte_config.h ompi/include/ompi_config.h ompi/include/mpi.h])
 AC_CONFIG_FILES([
     Makefile
 
     config/Makefile
 
-    include/Makefile
-    include/mpif.h
-
-    etc/Makefile
     contrib/Makefile
 
     opal/Makefile
+    opal/etc/Makefile
+    opal/include/Makefile
     opal/asm/Makefile
     opal/event/Makefile
     opal/event/compat/Makefile
@@ -1566,6 +1568,8 @@ AC_CONFIG_FILES([
     opal/tools/wrappers/opalc++-wrapper-data.txt
 
     orte/Makefile
+    orte/include/Makefile
+    orte/etc/Makefile
 
     orte/tools/console/Makefile
     orte/tools/orted/Makefile
@@ -1577,6 +1581,9 @@ AC_CONFIG_FILES([
     orte/tools/wrappers/ortec++-wrapper-data.txt
 
     ompi/Makefile
+    ompi/etc/Makefile
+    ompi/include/Makefile
+    ompi/include/mpif.h
 
     ompi/debuggers/Makefile
 

include/Makefile.am

@@ -52,7 +52,9 @@ f77_pmpi_lib =
 endif
 
 SUBDIRS = \
+	include \
         debuggers \
+	etc \
         mpi \
 	$(MCA_ompi_FRAMEWORKS_SUBDIRS) \
 	$(MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
@@ -97,7 +99,6 @@ else
 ompidir = $(includedir)
 endif
 
-include include/Makefile.am
 include class/Makefile.am
 
 include attribute/Makefile.am

ompi/Makefile.am

@@ -191,14 +191,14 @@
 
 #include "ompi_config.h"
 
-#include "attribute/attribute.h"
+#include "ompi/attribute/attribute.h"
 #include "opal/threads/mutex.h"
-#include "ompi/include/constants.h"
-#include "datatype/datatype.h"
-#include "communicator/communicator.h"
-#include "win/win.h"
-#include "mpi/f77/fint_2_int.h"
-#include "class/ompi_bitmap.h"
+#include "ompi/constants.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/win/win.h"
+#include "ompi/mpi/f77/fint_2_int.h"
+#include "ompi/class/ompi_bitmap.h"
 
 /*
  * Macros

ompi/attribute/attribute.c

@@ -29,10 +29,10 @@
 #include "mpi.h"
 
 #include "ompi_config.h"
-#include "ompi/include/constants.h"
+#include "ompi/constants.h"
 #include "opal/class/opal_object.h"
-#include "class/opal_hash_table.h"
-#include "mca/gpr/gpr_types.h"
+#include "opal/class/opal_hash_table.h"
+#include "orte/mca/gpr/gpr_types.h"
 
 #define ATTR_HASH_SIZE 10
 

ompi/attribute/attribute.h

@@ -80,7 +80,7 @@
 
 #include "mpi.h"
 
-#include "attribute/attribute.h"
+#include "ompi/attribute/attribute.h"
 
 #include "ompi/errhandler/errclass.h"
 #include "ompi/communicator/communicator.h"