Re-separate out the always-installable headers from the

LAM-development headers.

This commit was SVN r925.

Makefile.am

@@ -5,6 +5,6 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = config src
+SUBDIRS = config include src
 
 EXTRA_DIST = VERSION Doxyfile

autogen.sh

@@ -335,7 +335,7 @@ EOF
     # We only need the libltdl stuff for the top-level
     # configure, not any of the MCA modules.
 
-    if test -f src/include/mpi.h; then
+    if test -f include/mpi.h; then
 	rm -rf libltdl src/libltdl src/ltdl.h
 	run_and_check $lam_libtoolize --automake --copy --ltdl
 	mv libltdl src
@@ -699,7 +699,7 @@ fi
 
 # figure out if we're at the top level of the LAM tree, a module's
 # top-level directory, or somewhere else.
-if test -f VERSION -a -f configure.ac -a -f src/include/mpi.h ; then
+if test -f VERSION -a -f configure.ac -a -f include/mpi.h ; then
     # Top level of LAM tree
     lamdir="`pwd`"
 elif test -f configure.in -o -f configure.ac -o -f configure.params ; then

configure.ac

@@ -70,7 +70,7 @@ if test "$LAM_TOP_BUILDDIR" != "$LAM_TOP_SRCDIR"; then
     AC_MSG_NOTICE([Detected VPATH build])
 fi
 
-# Setup the top of the src/include/lam_config.h file
+# Setup the top of the include/lam_config.h file
 
 AH_TOP([/* -*- c -*-
  *
@@ -643,8 +643,8 @@ lam_show_subtitle "Wrapper compiler flags"
 # purely aesthetic.
 #
 
-CPPFLAGS='-I$(top_srcdir)/src -I$(top_srcdir)/src/include -I$(top_builddir)/src'" $CPPFLAGS"
-CXXCPPFLAGS='-I$(top_srcdir)/src  -I$(top_srcdir)/src/include -I$(top_builddir)/src'" $CXXCPPFLAGS"
+CPPFLAGS='-I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src'" $CPPFLAGS"
+CXXCPPFLAGS='-I$(top_srcdir)/src  -I$(top_srcdir)/include -I$(top_builddir)/src'" $CXXCPPFLAGS"
 
 #
 # Adding WRAPPER_* flags so that extra flags needed for wrappper compilers
@@ -715,12 +715,14 @@ AC_SUBST(FFLAGS)
 
 lam_show_subtitle "Final output" 
 
-AM_CONFIG_HEADER([src/include/lam_config.h])
+AM_CONFIG_HEADER([include/lam_config.h])
 AC_CONFIG_FILES([
     Makefile
 
     config/Makefile
 
+    include/Makefile
+
     src/Makefile
     src/include/Makefile
 

include/Makefile.am

@@ -0,0 +1,25 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+include_HEADERS = \
+	lam_config.h \
+	lam_config_bottom.h \
+	mpi.h \
+	mpif.h
+
+# Add a hook to run *after* the file lam_config.h has been installed
+# out to the target location.  It changes the pesky PACKAGE_* macros
+# that autoconf automatically generates (and there is no way of
+# turning off) into LAM_MPI_PACKAGE_* in order to make <mpi.h> safe to
+# include with other files.
+
+install-data-hook:
+	sed -e 's/define PACKAGE/define LAM_MPI_PACKAGE/' \
+		$(DESTDIR)$(includedir)/lam_config.h \
+		> $(DESTDIR)$(includedir)/lam_config.h.install
+	mv $(DESTDIR)$(includedir)/lam_config.h.install \
+		$(DESTDIR)$(includedir)/lam_config.h

src/datatype/datatype.h

@@ -12,10 +12,10 @@
 #define DATATYPE_H_HAS_BEEN_INCLUDED
 
 #include "lam_config.h"
-#include "constants.h"
+#include "include/constants.h"
+#include "include/types.h"
 #include "lfc/lam_object.h"
 #include "lfc/lam_hash_table.h"
-#include "types.h"
 #include "mpi.h"
 
 #define DT_LOOP            0x00

src/event/event.c

@@ -60,8 +60,8 @@
 #endif
 
 #include "event.h"
-#include "types.h"
-#include "constants.h"
+#include "include/types.h"
+#include "include/constants.h"
 #include "lfc/lam_object.h"
 #include "threads/mutex.h"
 #include "threads/thread.h"

src/group/mpi_group_init.c

@@ -3,7 +3,7 @@
  */
 
 #include "group/group.h"
-#include "constants.h"
+#include "include/constants.h"
 #include "mpi.h"
 
 /* define class information */

src/group/mpi_set_group_rank.c

@@ -3,7 +3,7 @@
  */
 
 #include "group/group.h"
-#include "constants.h"
+#include "include/constants.h"
 
 void lam_set_group_rank(lam_group_t *group, lam_proc_t *proc_pointer)
 {

src/include/Makefile.am

@@ -6,20 +6,8 @@
 include $(top_srcdir)/config/Makefile.options
 
 include_HEADERS = \
-	lam_config.h \
-	lam_config_bottom.h \
-	mpi.h \
-	mpif.h
-
-# Add a hook to run *after* the file lam_config.h has been installed
-# out to the target location.  It changes the pesky PACKAGE_* macros
-# that autoconf automatically generates (and there is no way of
-# turning off) into LAM_MPI_PACKAGE_* in order to make <mpi.h> safe to
-# include with other files.
-
-install-data-hook:
-	sed -e 's/define PACKAGE/define LAM_MPI_PACKAGE/' \
-		$(DESTDIR)$(includedir)/lam_config.h \
-		> $(DESTDIR)$(includedir)/lam_config.h.install
-	mv $(DESTDIR)$(includedir)/lam_config.h.install \
-		$(DESTDIR)$(includedir)/lam_config.h
+        atomic.h \
+        constants.h \
+        lam.h \
+        totalview.h \
+        types.h

src/info/info.h

@@ -10,7 +10,7 @@
 #include "mpi.h"
 #include "util/strncpy.h"
 #include "lfc/lam_list.h"
-#include "lam.h"
+#include "include/lam.h"
 
 
 /**

src/lfc/lam_bitmap.h

@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include "lam_config.h"
-#include "types.h"
+#include "include/types.h"
 #include "lfc/lam_object.h"
 
 /* VPS: Just to compile right now, has to move later on */

src/lfc/lam_hash_table.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 #include "lam_config.h"
-#include "constants.h"
+#include "include/constants.h"
 #include "util/output.h"
 #include "lfc/lam_hash_table.h"
 

src/lfc/lam_hash_table.h

@@ -13,7 +13,7 @@
 #define LAM_HASH_TABLE_H
 
 #include "lam_config.h"
-#include "types.h"
+#include "include/types.h"
 #include "lfc/lam_list.h"
 
 

src/lfc/lam_object.c

@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_object.h"
 
 /*

src/lfc/lam_pointer_array.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_pointer_array.h"
 #include "util/output.h"
 

src/lfc/lam_value_array.h

@@ -7,8 +7,8 @@
 
 #include <string.h>
 #include "lam_config.h"
-#include "constants.h"
-#include "types.h"
+#include "include/constants.h"
+#include "include/types.h"
 #include "lfc/lam_object.h"
 #if LAM_ENABLE_DEBUG
 #include "util/output.h"

src/mca/base/mca_base_cmd_line.c

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "util/cmd_line.h"
 #include "util/argv.h"
 #include "mca/base/base.h"

src/mca/base/mca_base_init_select_modules.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_list.h"
 #include "mca/base/base.h"
 #include "mca/coll/coll.h"

src/mca/base/mca_base_module_find.c

@@ -12,7 +12,7 @@
 /* Ensure to get the right <ltdl.h> */ 
 #include "libltdl/ltdl.h"
 
-#include "constants.h"
+#include "include/constants.h"
 #include "util/output.h"
 #include "lfc/lam_list.h"
 #include "mca/mca.h"

src/mca/base/mca_base_module_registry.c

@@ -12,7 +12,7 @@
 /* Ensure to get the right <ltdl.h> */ 
 #include "libltdl/ltdl.h"
 
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_list.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"

src/mca/base/mca_base_param.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_value_array.h"
 #include "mca/mca.h"
 #include "mca/base/mca_base_param.h"

src/mca/coll/base/coll_base_close.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/coll/coll.h"

src/mca/oob/base/base.h

@@ -8,7 +8,7 @@
 
 #include "lam_config.h"
 
-#include "types.h"
+#include "include/types.h"
 #include "mca/mca.h"
 #include "mca/oob/oob.h"
 

src/mca/oob/base/oob_base_close.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/oob/oob.h"

src/mca/oob/oob.h

@@ -35,7 +35,7 @@
 
 #include "lam_config.h"
 
-#include "types.h"
+#include "include/types.h"
 #include "mca/mca.h"
 
 /*

src/mca/pcm/base/base.h

@@ -8,7 +8,7 @@
 
 #include "lam_config.h"
 
-#include "types.h"
+#include "include/types.h"
 #include "mca/mca.h"
 #include "mca/pcm/pcm.h"
 

src/mca/pcm/base/pcm_base_close.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/pcm/pcm.h"

src/mca/pcm/pcm.h

@@ -57,7 +57,7 @@
 #include "lam_config.h"
 
 #include "mca/mca.h"
-#include "types.h"
+#include "include/types.h"
 
 #include <sys/param.h>
 

src/mca/pml/base/pml_base_close.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/pml/pml.h"

src/mca/pml/pml.h

@@ -6,7 +6,7 @@
 #define MCA_PML_H
 
 #include "lam_config.h"
-#include "lam.h"
+#include "include/lam.h"
 #include "lfc/lam_list.h"
 #include "communicator/communicator.h"
 #include "datatype/datatype.h"

src/mca/ptl/base/ptl_base_close.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/ptl/ptl.h"

src/mca/ptl/base/ptl_base_match.c

@@ -8,7 +8,7 @@
 
 #include "lfc/lam_list.h"
 #include "threads/mutex.h"
-#include "constants.h"
+#include "include/constants.h"
 #include "communicator/communicator.h"
 #include "mca/pml/pml.h"
 #include "mca/ptl/ptl.h"

src/mca/ptl/base/ptl_base_recvreq.c

@@ -3,7 +3,7 @@
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include "types.h"
+#include "include/types.h"
 #include "mca/ptl/base/ptl_base_comm.h"
 #include "mca/ptl/base/ptl_base_recvreq.h"
 #include "mca/ptl/base/ptl_base_recvfrag.h"

src/mca/ptl/ptl.h

@@ -8,7 +8,7 @@
 #define MCA_PTL_H
 
 #include "mca/mca.h"
-#include "lam.h"
+#include "include/lam.h"
 #include "lfc/lam_list.h"
 #include "proc/proc.h"
 #include "mca/pml/pml.h"

src/mca/registry/base/registry_base_close.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/registry/registry.h"

src/mem/free_list.h

@@ -7,7 +7,7 @@
 
 #include "lam_config.h"
 #include "lfc/lam_list.h"
-#include "constants.h"
+#include "include/constants.h"
 #include "mem/seg_list.h"
 #include "mem/mem_pool.h"
 

src/mem/mem_globals.c

@@ -4,7 +4,7 @@
 
 #include <unistd.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_object.h"
 #include "mem/mem_globals.h"
 

src/mem/mem_pool.c

@@ -8,7 +8,7 @@
 #include <sys/errno.h>
 #include <unistd.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "mem/mem_pool.h"
 #include "mem/sharedmem_util.h"

src/mem/mem_pool.h

@@ -5,7 +5,7 @@
 #ifndef LAM_MEMORY_POOL_H
 #define LAM_MEMORY_POOL_H
 
-#include "types.h"
+#include "include/types.h"
 #include "lfc/lam_object.h"
 #include "mem/allocator.h"
 #include "threads/mutex.h"

src/mpi/c/comm_get_name.c

@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include "util/strncpy.h"
-#include "totalview.h"
+#include "include/totalview.h"
 #include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"

src/mpi/c/comm_set_name.c

@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include "util/strncpy.h"
-#include "totalview.h"
+#include "include/totalview.h"
 #include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"

src/os/numa.h

@@ -2,7 +2,7 @@
  * $HEADER$
  */
 
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_object.h"
 
 typedef int     affinity_t;

src/proc/proc.h

@@ -5,7 +5,7 @@
 #ifndef LAM_PROC
 #define LAM_PROC
 
-#include "types.h"
+#include "include/types.h"
 #include "lfc/lam_list.h"
 
 

src/runtime/lam_abort.c

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "util/output.h"
 

src/runtime/lam_finalize.c

@@ -4,7 +4,7 @@
 
 #include "lam_config.h"
 
-#include "constants.h"
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "util/output.h"
 

src/runtime/lam_init.c

@@ -6,7 +6,7 @@
 
 #include "lam_config.h"
 
-#include "constants.h"
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "util/output.h"
 #include "threads/mutex.h"

src/runtime/lam_mpi_finalize.c

@@ -4,7 +4,7 @@
 
 #include "lam_config.h"
 
-#include "constants.h"
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "mpi.h"
 #include "group/group.h"

src/runtime/lam_mpi_init.c

@@ -4,7 +4,7 @@
 
 #include "lam_config.h"
 
-#include "constants.h"
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "mpi.h"
 #include "runtime/runtime.h"

src/runtime/lam_rte_finalize.c

@@ -6,7 +6,7 @@
 
 #include "lam_config.h"
 
-#include "constants.h"
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "util/output.h"
 #include "threads/mutex.h"

src/runtime/lam_rte_init.c

@@ -6,7 +6,7 @@
 
 #include "lam_config.h"
 
-#include "constants.h"
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "util/output.h"
 #include "threads/mutex.h"

src/threads/thread.c

@@ -2,7 +2,7 @@
  * $HEADER$
  */
 
-#include "constants.h"
+#include "include/constants.h"
 #include "threads/thread.h"
 
 

src/util/argv.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "util/argv.h"
 #include "util/strncpy.h"
 

src/util/argv.h

@@ -5,7 +5,7 @@
 #ifndef LAM_ARGV_H
 #define LAM_ARGV_H
 
-#include "types.h"
+#include "include/types.h"
 
 #ifdef __cplusplus
 extern "C" {

src/util/cmd_line.h

@@ -8,7 +8,7 @@
 #define LAM_CMD_LINE_H
 
 #include "lam_config.h"
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_list.h"
 #include "threads/mutex.h"
 #include "util/argv.h"

src/util/few.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "util/few.h"
 
 /** @file **/

src/util/if.c

@@ -13,7 +13,7 @@
 #include <net/if.h>
 #include <netdb.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "lfc/lam_list.h"
 #include "util/if.h"
 #include "util/output.h"

src/util/output.c

@@ -16,7 +16,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "constants.h"
+#include "include/constants.h"
 #include "util/output.h"
 #include "threads/mutex.h"