summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2000-12-13 16:47:02 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2000-12-13 16:47:02 (GMT)
commit4b882ef48687f5c369bfc5d48752411d659b4be9 (patch)
treef8bc8189a4052a2c4a0e3936e38e84f4a82ab6bf
parent7e2e2add5362adb738060634528a1c89ca9ac632 (diff)
downloadhdf5-4b882ef48687f5c369bfc5d48752411d659b4be9.zip
hdf5-4b882ef48687f5c369bfc5d48752411d659b4be9.tar.gz
hdf5-4b882ef48687f5c369bfc5d48752411d659b4be9.tar.bz2
[svn-r3126] Purpose:
Bug Fix Description: Parallel stuff wasn't being compiled on T3E. It was complaining about not being able to find said files. Also, I was confused about which Fortran module needed to be compiled when it was parallel. Solution: Did magic so that the correct files are specified when parallel is enabled. Platforms tested: T3E
-rw-r--r--fortran/src/Makefile.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index ef6cc34..0762b18 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -22,18 +22,18 @@ LIB=libhdf5_fortran.la
DISTCLEAN=H5fortran_types.f90
## Source and object files for the library
-CPAR_SRC=H5FDmpiof.c
-FPAR_SRC=H5FDmpioff.f90 HDF5mpio.f90
-
ADD_PARALLEL_FILES=@ADD_PARALLEL_FILES@
-CPARALLEL=${ADD_PARALLEL_FILES:yes=$(CPAR_SRC)}
+
+FPAR_MOD=${ADD_PARALLEL_FILES:yes=HDF5mpio.f90}
+
+CPARALLEL=${ADD_PARALLEL_FILES:yes=H5FDmpiof.c}
CLIB_SRC=H5f90kit.c H5f.c H5Git.c H5Rf.c H5Ff.c H5Sf.c H5Df.c H5Gf.c \
H5Af.c H5Tf.c H5Pf.c H5If.c H5Ef.c ${CPARALLEL:no=}
-FPARALLEL=${ADD_PARALLEL_FILES:yes=$(FPAR_SRC)}
+FPARALLEL=${ADD_PARALLEL_FILES:yes=H5FDmpioff.f90}
FLIB_SRC=H5fortran_types.f90 H5fortran_flags.f90 H5f90global.f90 H5ff.f90 \
H5Rff.f90 H5Fff.f90 H5Sff.f90 H5Dff.f90 H5Gff.f90 H5Aff.f90 H5Tff.f90 \
- H5Pff.f90 H5Iff.f90 H5Eff.f90 HDF5.f90 ${FPARALLEL:no=}
+ H5Pff.f90 H5Iff.f90 H5Eff.f90 HDF5.f90 ${FPARALLEL:no=} ${FPAR_MOD:no=HDF5.f90}
LIB_SRC=$(CLIB_SRC) $(FLIB_SRC)
LIB_OBJ=$(CLIB_SRC:.c=.lo) $(FLIB_SRC:.f90=.lo)