Moved a bunch of header files from src/include/lam to here.

This commit was SVN r332.

src/lam/Makefile.am

@@ -7,6 +7,14 @@ include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS	= ctnetwork lfc mem os threads util
 
+headers = \
+        atomic.h \
+        constants.h \
+        lam.h \
+        stdint.h \
+        totalview.h \
+        types.h
+
 # 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
@@ -14,33 +22,42 @@ SUBDIRS	= ctnetwork lfc mem os threads util
 
 # List the input convenience libraries here
 
-sources 		= \
+sources = \
-			ctnetwork/libctnetwork.la \
+        ctnetwork/libctnetwork.la \
-			lfc/liblfc.la \
+        lfc/liblfc.la \
-			mem/libmem.la \
+        mem/libmem.la \
-			threads/libthreads.la \
+        threads/libthreads.la \
-			util/libutil.la 
+        util/libutil.la 
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif
 
 # List the names of the output libraries here
 
-convenience_lib_name	= liblam_convenience.la
+convenience_lib_name = liblam_convenience.la
-install_lib_name	= liblam.la
+install_lib_name = liblam.la
 
 # Setup for deciding which library form we'll build
 
 if WANT_SINGLE_MPI_LIBRARY
-install_lib		=
+install_lib =
-convenience_lib		= $(convenience_lib_name)
+convenience_lib = $(convenience_lib_name)
 else
-install_lib		= $(install_lib_name)
+install_lib = $(install_lib_name)
-convenience_lib		=
+convenience_lib =
 endif
 
-lib_LTLIBRARIES		= $(install_lib)
+lib_LTLIBRARIES = $(install_lib)
-noinst_LTLIBRARIES	= $(convenience_lib)
+noinst_LTLIBRARIES = $(convenience_lib)
 
-liblam_la_SOURCES	=
+liblam_la_SOURCES =
-liblam_la_LIBADD	= $(sources)
+liblam_la_LIBADD = $(sources)
 
 liblam_convenience_la_SOURCES =
 liblam_convenience_la_LIBADD = $(sources)