diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-07-09 21:28:26 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-07-09 21:28:26 (GMT) |
| commit | 6874139caa0c91fb9f2a52f9606e6fd5ed64a9d5 (patch) | |
| tree | 62d359126b1ca70cdec5a38d68170e2a99c1e832 /fortran/testpar | |
| parent | f4da6baf5dc8a0f029f004c2146ee293ae2ef079 (diff) | |
| download | hdf5-6874139caa0c91fb9f2a52f9606e6fd5ed64a9d5.zip hdf5-6874139caa0c91fb9f2a52f9606e6fd5ed64a9d5.tar.gz hdf5-6874139caa0c91fb9f2a52f9606e6fd5ed64a9d5.tar.bz2 | |
[svn-r4166]
Purpose:
Fix
Description:
Porting fixes from the 1.4 branch to the 1.5 branch. This fixes the
dependency problem in the testpar/ directory and also the problem
with module includes on the command line.
Diffstat (limited to 'fortran/testpar')
| -rw-r--r-- | fortran/testpar/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 0848c94..f0c1a94 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -14,8 +14,6 @@ hdf5_builddir=$(top_builddir)/src ## Add the include directory to the C preprocessor flags the the hdf5 library ## to the library list. LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) -MFLAG=@F9XMODFLAG@ -FFLAGS=$(MFLAG). $(MFLAG)../src @FFLAGS@ LIBFORTRAN=../src/libhdf5_fortran.la LIBHDF5=$(hdf5_builddir)/libhdf5.la @@ -41,6 +39,10 @@ $(TEST_PROGS): $(LIBHDF5) $(LIBH5TEST) $(TEST_OBJ): $(TEST_HDR) +## Put in dependencies to the THDF5 module so that things will be built +## in the correct order. +thyperslab_wr.lo: $(srcdir)/thyperslab_wr.f90 thdf5.lo + ptesthdf5_fortran: thdf5.lo thyperslab_wr.lo tcheck.lo ptesthdf5_fortran.lo @$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo tcheck.lo $(LIBFORTRAN) $(LIBHDF5) $(LIBS) |