diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-08-03 14:21:53 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-08-03 14:21:53 (GMT) |
| commit | 6fbfd252b89d4a8a6b9b340283723dbe6e28f3a7 (patch) | |
| tree | 4051301cf71adadbcd4c37d1fc28faba8f72dee7 /hl | |
| parent | cd0e71d998898a29b0d8291497faad4c8ab979de (diff) | |
| parent | c7465bdfb8ebd857dbdd36a6e9e89236241add7e (diff) | |
| download | hdf5-6fbfd252b89d4a8a6b9b340283723dbe6e28f3a7.zip hdf5-6fbfd252b89d4a8a6b9b340283723dbe6e28f3a7.tar.gz hdf5-6fbfd252b89d4a8a6b9b340283723dbe6e28f3a7.tar.bz2 | |
Merge pull request #618 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_8 to hdf5_1_8
* commit 'c7465bdfb8ebd857dbdd36a6e9e89236241add7e':
changed comments, (HDFFV-10037)
merged NAG changes from develop, (HDFFV-10037)
merged NAG changes from develop, (HDFFV-10037)
Removed extra Fortran flags, (HDFFV-10037)
Rearranged where the substitution occurs.
added chmod 755 for h5fc
libtool does not pass the correct argument linking (-WL,-WL,,) for the NAG Fortran compiler on Linux (other OSs have not been tested). Therefore, detect if we are using the NAG Fortran compiler, and replace the wl="-Wl," for Fortran to wl="-Wl,-WL,," in the libtool file. (HDFFV-10037)
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/examples/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index b8ed434..71c2866 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -43,10 +43,10 @@ FORTRAN_API=yes # Tell automake how to build examples using h5fc if BUILD_PARALLEL_CONDITIONAL $(EXTRA_PROG): $(H5FC_PP) - $(H5FC_PP) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; + $(H5FC_PP) $(H5CCFLAGS) -o $@ $(srcdir)/$@.f90; else $(EXTRA_PROG): $(H5FC) - $(H5FC) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; + $(H5FC) $(H5CCFLAGS) -o $@ $(srcdir)/$@.f90; endif # Tell automake how to install examples |