More fixes for bug 625 -- make all .h files get [conditionally] installed.

This commit was SVN r169.

src/include/Makefile.am

@@ -5,23 +5,31 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
-		communicator.h \
-		datatype.h \
-		group.h \
-		lam_constants.h \
-		lam.h \
-		lam_stdint.h \
-		lam_types.h \
-		proc.h \
-		totalview.h
+headers = \
+	communicator.h \
+	datatype.h \
+	group.h \
+	lam_constants.h \
+	lam.h \
+	lam_stdint.h \
+	lam_types.h \
+	proc.h \
+	totalview.h
 
-include_HEADERS	= \
-		lam_config.h \
-		lam_config_bottom.h \
-		lam_stdint.h \
-		mpi.h \
-		mpif.h
+include_HEADERS = \
+	lam_config.h \
+	lam_config_bottom.h \
+	mpi.h \
+	mpif.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif
 
 # 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

src/mpi/interface/c/Makefile.am

@@ -9,23 +9,35 @@ include $(top_srcdir)/config/Makefile.options
 # into the profile directory.
 
 if COMPILE_PROFILING_SEPARATELY
-profile_dir		= profile
-profile_lib		= profile/libmpi_c_profile.la
+profile_dir = profile
+profile_lib = profile/libmpi_c_profile.la
 else
-profile_dir		=
-profile_lib		=
+profile_dir =
+profile_lib =
 endif
 
-SUBDIRS			= $(profile_dir)
-DIST_SUBDIRS		= profile
+SUBDIRS = $(profile_dir)
+DIST_SUBDIRS = profile
 
-noinst_LTLIBRARIES	= libmpi_c.la
+noinst_LTLIBRARIES = libmpi_c.la
+
+headers = \
+	bindings.h \
+	bindings_profiling.h
+
+libmpi_c_la_SOURCES = \
+	comm_get_name.c \
+	comm_set_name.c \
+	init.c \
+	finalize.c
 
-libmpi_c_la_SOURCES	= \
-			bindings.h \
-			bindings_profiling.h \
-			comm_get_name.c \
-			comm_set_name.c \
-			init.c \
-			finalize.c \
 libmpi_c_la_LIBADD	= $(profile_lib)
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/c
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/mpi/interface/c/profile/Makefile.am

@@ -5,17 +5,17 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS		= -DLAM_PROFILING_DEFINES=1
+AM_CPPFLAGS = -DLAM_PROFILING_DEFINES=1
 
-noinst_LTLIBRARIES	= libmpi_c_profile.la
+noinst_LTLIBRARIES = libmpi_c_profile.la
 
-noinst_HEADERS		= defines.h
+headers = defines.h
 
-nodist_libmpi_c_profile_la_SOURCES= \
-			pcomm_get_name.c \
-			pcomm_set_name.c \
-			pinit.c \
-			pfinalize.c
+nodist_libmpi_c_profile_la_SOURCES = \
+	pcomm_get_name.c \
+	pcomm_set_name.c \
+	pinit.c \
+	pfinalize.c
 
 # Sym link in the sources from the real MPI directory
 
@@ -25,6 +25,15 @@ $(nodist_libmpi_c_profile_la_SOURCES):
 		ln -s $(top_srcdir)/src/mpi/c/$$pname $@ ; \
 	fi
 
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/c/profile
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif
+
 # These files were created by targets above
 
 MAINTAINERCLEANFILES = $(nodist_libmpi_c_profile_la_SOURCES)

src/mpi/interface/f77/Makefile.am

@@ -9,24 +9,35 @@ include $(top_srcdir)/config/Makefile.options
 # into the profile directory.
 
 if COMPILE_PROFILING_SEPARATELY
-profile_dir		= profile
-profile_lib		= profile/libmpi_f77_profile.la
+profile_dir = profile
+profile_lib = profile/libmpi_f77_profile.la
 else
-profile_dir		=
-profile_lib		=
+profile_dir =
+profile_lib =
 endif
 
-SUBDIRS			= $(profile_dir)
-DIST_SUBDIRS		= profile
+SUBDIRS = $(profile_dir)
+DIST_SUBDIRS = profile
 
-noinst_LTLIBRARIES	= libmpi_f77.la
+noinst_LTLIBRARIES = libmpi_f77.la
 
-libmpi_f77_la_SOURCES	= \
-			bindings.h \
-			comm_get_name_f.c \
-			comm_set_name_f.c \
-			init_f.c \
-			finalize_f.c \
-			prototypes.h
+headers = \
+	bindings.h \
+	prototypes.h
+
+libmpi_f77_la_SOURCES = \
+	comm_get_name_f.c \
+	comm_set_name_f.c \
+	init_f.c \
+	finalize_f.c
 
 libmpi_f77_la_LIBADD	= $(profile_lib)
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/f77
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/mpi/interface/f77/profile/Makefile.am

@@ -5,17 +5,17 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS		= -DLAM_PROFILING_DEFINES=1
+AM_CPPFLAGS = -DLAM_PROFILING_DEFINES=1
 
-noinst_LTLIBRARIES	= libmpi_f77_profile.la
+noinst_LTLIBRARIES = libmpi_f77_profile.la
 
-noinst_HEADERS		= defines.h
+noinst_HEADERS = defines.h
 
-nodist_libmpi_f77_profile_la_SOURCES= \
-			pcomm_get_name_f.c \
-			pcomm_set_name_f.c \
-			pinit_f.c \
-			pfinalize_f.c
+nodist_libmpi_f77_profile_la_SOURCES = \
+	pcomm_get_name_f.c \
+	pcomm_set_name_f.c \
+	pinit_f.c \
+	pfinalize_f.c
 
 # Sym link in the sources from the real MPI directory
 
@@ -25,6 +25,15 @@ $(nodist_libmpi_f77_profile_la_SOURCES):
 		ln -s $(top_srcdir)/src/mpi/f77/$$pname $@ ; \
 	fi
 
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/f77/profile
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif
+
 # These files were created by targets above
 
 MAINTAINERCLEANFILES = $(nodist_libmpi_f77_profile_la_SOURCES)