Fix installation of all header files in all cases (even if we're not building

C++, F90, F77, or separate compilation for profiling).

This commit was SVN r179.

src/mpi/Makefile.am

@@ -8,25 +8,20 @@ include $(top_srcdir)/config/Makefile.options
 # See if configure found a valid f77 compiler
 
 if BUILD_MPI_F77
-f77_subdir	= f77
-f77_lib		= f77/libmpi_f77.la
+f77_lib = f77/libmpi_f77.la
 else
-f77_subdir	=
-f77_lib		=
+f77_lib =
 endif
 
 # See if configure found a valid f90/f95 compiler
 
 if BUILD_MPI_F90
-f90_subdir	= f90
-f90_lib		=
+f90_lib =
 else
-f90_subdir	=
-f90_lib		=
+f90_lib =
 endif
 
-SUBDIRS		= c cxx $(f77_subdir) $(f90_subdir)
-DIST_SUBDIRS	= c cxx f77 f90
+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'
@@ -34,20 +29,20 @@ DIST_SUBDIRS	= c cxx f77 f90
 # (noinst) library.  Otherwise, it should be installed into lib.
 
 if WANT_SINGLE_MPI_LIBRARY
-install_lib		=
-convenience_lib		= libmpi_convenience.la
+install_lib =
+convenience_lib = libmpi_convenience.la
 else
-install_lib		= libmpi.la
-convenience_lib		=
+install_lib = libmpi.la
+convenience_lib =
 endif
 
-lib_LTLIBRARIES		= $(install_lib)
-noinst_LTLIBRARIES	= $(convenience_lib)
+lib_LTLIBRARIES = $(install_lib)
+noinst_LTLIBRARIES = $(convenience_lib)
 
-sources			= c/libmpi_c.la $(f77_lib) $(f90_lib)
+sources = c/libmpi_c.la $(f77_lib) $(f90_lib)
 
-libmpi_la_SOURCES	=
-libmpi_la_LIBADD	= $(sources)
+libmpi_la_SOURCES =
+libmpi_la_LIBADD = $(sources)
 
 libmpi_convenience_la_SOURCES =
 libmpi_convenience_la_LIBADD = $(sources)

src/mpi/interface/Makefile.am

@@ -8,25 +8,20 @@ include $(top_srcdir)/config/Makefile.options
 # See if configure found a valid f77 compiler
 
 if BUILD_MPI_F77
-f77_subdir	= f77
-f77_lib		= f77/libmpi_f77.la
+f77_lib = f77/libmpi_f77.la
 else
-f77_subdir	=
-f77_lib		=
+f77_lib =
 endif
 
 # See if configure found a valid f90/f95 compiler
 
 if BUILD_MPI_F90
-f90_subdir	= f90
-f90_lib		=
+f90_lib =
 else
-f90_subdir	=
-f90_lib		=
+f90_lib =
 endif
 
-SUBDIRS		= c cxx $(f77_subdir) $(f90_subdir)
-DIST_SUBDIRS	= c cxx f77 f90
+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'
@@ -34,20 +29,20 @@ DIST_SUBDIRS	= c cxx f77 f90
 # (noinst) library.  Otherwise, it should be installed into lib.
 
 if WANT_SINGLE_MPI_LIBRARY
-install_lib		=
-convenience_lib		= libmpi_convenience.la
+install_lib =
+convenience_lib = libmpi_convenience.la
 else
-install_lib		= libmpi.la
-convenience_lib		=
+install_lib = libmpi.la
+convenience_lib =
 endif
 
-lib_LTLIBRARIES		= $(install_lib)
-noinst_LTLIBRARIES	= $(convenience_lib)
+lib_LTLIBRARIES = $(install_lib)
+noinst_LTLIBRARIES = $(convenience_lib)
 
-sources			= c/libmpi_c.la $(f77_lib) $(f90_lib)
+sources = c/libmpi_c.la $(f77_lib) $(f90_lib)
 
-libmpi_la_SOURCES	=
-libmpi_la_LIBADD	= $(sources)
+libmpi_la_SOURCES =
+libmpi_la_LIBADD = $(sources)
 
 libmpi_convenience_la_SOURCES =
 libmpi_convenience_la_LIBADD = $(sources)

src/mpi/interface/c/Makefile.am

@@ -5,19 +5,17 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-# If the user selected --disable-profiling, then we don't traverse
-# into the profile directory.
+# We must traverse into the profile directory to install the proper
+# header files.  So only only expect to find the C profiling library
+# if we're compiling profiling separately.
 
 if COMPILE_PROFILING_SEPARATELY
-profile_dir = profile
 profile_lib = profile/libmpi_c_profile.la
 else
-profile_dir =
 profile_lib =
 endif
 
-SUBDIRS = $(profile_dir)
-DIST_SUBDIRS = profile
+SUBDIRS = profile
 
 noinst_LTLIBRARIES = libmpi_c.la
 

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

@@ -7,7 +7,17 @@ include $(top_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = -DLAM_PROFILING_DEFINES=1
 
-noinst_LTLIBRARIES = libmpi_c_profile.la
+# We must traverse into the profile directory to install the proper
+# header files.  So only only expect to find the C profiling library
+# if we're compiling profiling separately.
+
+if COMPILE_PROFILING_SEPARATELY
+lib = libmpi_c_profile.la
+else
+lib =
+endif
+
+noinst_LTLIBRARIES = $(lib)
 
 headers = defines.h
 

src/mpi/interface/f77/Makefile.am

@@ -5,21 +5,31 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+# We must traverse into this directory to install the proper header
+# files.  So only build the f77 bindings if we want to build them, and
+# only expect to find the f77 profiling library if we're building the
+# f77 bindings *and* we're compiling profiling separately.
+
 # If the user selected --disable-profiling, then we don't traverse
 # into the profile directory.
 
+if BUILD_MPI_F77
+f77_lib = libmpi_f77.la
+
 if COMPILE_PROFILING_SEPARATELY
-profile_dir = profile
 profile_lib = profile/libmpi_f77_profile.la
 else
-profile_dir =
 profile_lib =
 endif
 
-SUBDIRS = $(profile_dir)
-DIST_SUBDIRS = profile
+else
+f77_lib =
+profile_lib =
+endif
 
-noinst_LTLIBRARIES = libmpi_f77.la
+SUBDIRS = profile
+
+noinst_LTLIBRARIES = $(f77_lib)
 
 headers = \
 	bindings.h \

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

@@ -7,9 +7,24 @@ include $(top_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = -DLAM_PROFILING_DEFINES=1
 
-noinst_LTLIBRARIES = libmpi_f77_profile.la
+# We must traverse into this directory to install the proper header
+# files.  So only build the f77 profiling bindings only if we're
+# building the f77 bindings *and* we're compiling profiling
+# separately.
 
-noinst_HEADERS = defines.h
+if BUILD_MPI_F77
+if COMPILE_PROFILING_SEPARATELY
+f77_lib = libmpi_f77_profile.la
+else
+f77_lib =
+endif
+else
+f77_lib =
+endif
+
+noinst_LTLIBRARIES = $(f77_lib)
+
+headers = defines.h
 
 nodist_libmpi_f77_profile_la_SOURCES = \
 	pcomm_get_name_f.c \