From e79fa0f234cb8ed37427ad8415eb5879d4df9248 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 1 Dec 2000 15:00:54 -0500 Subject: [svn-r3054] Purpose: Bug Fix Description: We were not propagating the FFLAGS macro. I.e., we were overwriting it after it was set in the commence.in includes. Solution: Include it with a ``@FFLAGS@'' where we'd normally overwrite it so that it isn't. Platforms tested: T3E --- fortran/examples/Makefile.in | 2 +- fortran/test/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index a452d90..0ff5ae1 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -15,7 +15,7 @@ hdf5_builddir=$(top_builddir)/src ## libraries to the library list. LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) MFLAG=@F9XMODFLAG@ -FFLAGS=$(MFLAG). $(MFLAG)../src +FFLAGS=$(MFLAG). $(MFLAG)../src @FFLAGS@ FLIB=../src/libhdf5_fortran.la HDF5LIB=$(hdf5_builddir)/libhdf5.la diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 1a3de05..a389684 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -15,7 +15,7 @@ hdf5_builddir=$(top_builddir)/src ## libraries to the library list. LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) MFLAG=@F9XMODFLAG@ -FFLAGS=$(MFLAG). $(MFLAG)../src +FFLAGS=$(MFLAG). $(MFLAG)../src @FFLAGS@ FLIB=../src/libhdf5_fortran.la HDF5LIB=$(hdf5_builddir)/libhdf5.la -- cgit v0.12