diff -urN lam-7.1.5b1/configure.in lam-7.1.5b1_patched/configure.in --- lam-7.1.5b1/configure.in 2008-03-28 22:37:08.000000000 -0400 +++ lam-7.1.5b1_patched/configure.in 2008-03-31 20:29:41.000000000 -0400 @@ -2491,6 +2491,7 @@ share/libmpi/Makefile share/liblam/Makefile + share/liblamf77mpi/Makefile share/dynamic-ssi/Makefile share/dynamic-ssi/boot/Makefile diff -urN lam-7.1.5b1/share/liblamf77mpi/Makefile.am lam-7.1.5b1_patched/share/liblamf77mpi/Makefile.am --- lam-7.1.5b1/share/liblamf77mpi/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ lam-7.1.5b1_patched/share/liblamf77mpi/Makefile.am 2008-03-31 20:23:26.000000000 -0400 @@ -0,0 +1,44 @@ +# -*- makefile -*- +# +# Copyright (c) 2001-2003 The Trustees of Indiana University. +# All rights reserved. +# Copyright (c) 1998-2001 University of Notre Dame. +# All rights reserved. +# Copyright (c) 1994-1998 The Ohio State University. +# All rights reserved. +# +# This file is part of the LAM/MPI software package. For license +# information, see the LICENSE file in the top level directory of the +# LAM/MPI source distribution. +# +# $Id: Makefile.am,v 1.1 2003/11/15 14:09:55 jsquyres Exp $ +# + +include $(top_srcdir)/config/Makefile.options + +if WANT_IMPI_BUILD +impi_lib = $(top_builddir)/share/impi/liblamimpi.la +else +impi_lib = +endif + +if WANT_PROFILE_BUILD +pmpi_lib = $(top_builddir)/share/pmpi/libpmpi.la +else +pmpi_lib = +endif + +if WANT_FORTRAN +fortran_lib = liblamf77mpi.la +else +fortran_lib = +endif + +lib_LTLIBRARIES = $(fortran_lib) + +liblamf77mpi_la_SOURCES = +liblamf77mpi_la_LIBADD = \ + $(top_builddir)/share/mpi/f77/liblamf77mpi_internal.la \ + $(top_builddir)/share/libmpi/libmpi.la +liblamf77mpi_la_LDFLAGS = $(EXTRA_LDFLAGS) $(LIBMPI_EXTRA_LDFLAGS) + diff -urN lam-7.1.5b1/share/libmpi/Makefile.am lam-7.1.5b1_patched/share/libmpi/Makefile.am --- lam-7.1.5b1/share/libmpi/Makefile.am 2008-03-28 22:37:08.000000000 -0400 +++ lam-7.1.5b1_patched/share/libmpi/Makefile.am 2008-03-31 20:23:27.000000000 -0400 @@ -28,12 +28,6 @@ pmpi_lib = endif -if WANT_FORTRAN -fortran_lib = liblamf77mpi.la -else -fortran_lib = -endif - # Note that mpi/liblamextra.la gets built into both liblam.la and # in both libraries, and avoids a dependency from liblam -> libmpi # (dependencies the other way are ok). @@ -53,8 +47,3 @@ $(top_builddir)/share/liblam/liblam.la libmpi_la_LDFLAGS = $(EXTRA_LDFLAGS) $(LIBMPI_EXTRA_LDFLAGS) -liblamf77mpi_la_SOURCES = -liblamf77mpi_la_LIBADD = \ - $(top_builddir)/share/mpi/f77/liblamf77mpi_internal.la \ - $(top_builddir)/share/libmpi/libmpi.la -liblamf77mpi_la_LDFLAGS = $(EXTRA_LDFLAGS) $(LIBMPI_EXTRA_LDFLAGS) diff -urN lam-7.1.5b1/share/Makefile.am lam-7.1.5b1_patched/share/Makefile.am --- lam-7.1.5b1/share/Makefile.am 2006-06-24 16:42:43.000000000 -0400 +++ lam-7.1.5b1_patched/share/Makefile.am 2008-03-31 20:30:00.000000000 -0400 @@ -24,4 +24,4 @@ SUBDIRS = include args boot etc freq kreq impi memory mpi \ $(LIBLTDL_SUBDIR) nreq pmpi rreq ssi \ threads $(TOTALVIEW_DLL_DIR) trillium tstdio \ - liblam libmpi dynamic-ssi + liblam libmpi liblamf77mpi dynamic-ssi