summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2011-04-15 16:44:30 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2011-04-15 16:44:30 (GMT)
commit92bfc35459da4a495ca7935bde6b4a1ac85b3e67 (patch)
treee85f652f317413ae949a59e4127d3b814e991ad4 /fortran
parentea2a03bc5f682de67cd405e41d84aaebee5e4f2f (diff)
downloadhdf5-92bfc35459da4a495ca7935bde6b4a1ac85b3e67.zip
hdf5-92bfc35459da4a495ca7935bde6b4a1ac85b3e67.tar.gz
hdf5-92bfc35459da4a495ca7935bde6b4a1ac85b3e67.tar.bz2
[svn-r20507] Merged the changes in 'fortran' from the trunk into branch, used:
svn merge -r 18556:20506 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran Tested: jam (gnu, intel, pgi compilers)
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/Makefile.am3
-rw-r--r--fortran/src/Makefile.in5
2 files changed, 7 insertions, 1 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index 481a0db..ee06a88 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -70,6 +70,9 @@ libhdf5_fortran_la_SOURCES= H5f90global.f90 \
H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c \
$(PARALLEL_COND_SRC)
+# HDF5 Fortran library depends on HDF5 Library.
+libhdf5_fortran_la_LIBADD=$(LIBHDF5)
+
# h5fc is generated during configure.
# Remove it only when distclean.
DISTCLEANFILES=h5fc
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 51c9ad6..c794180 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -96,7 +96,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libhdf5_fortran_la_LIBADD =
+libhdf5_fortran_la_DEPENDENCIES = $(LIBHDF5)
am__libhdf5_fortran_la_SOURCES_DIST = H5f90global.f90 \
H5fortran_types.f90 H5_ff.f90 H5Aff.f90 H5Dff.f90 H5Eff.f90 \
H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 H5Off.f90 H5Pff.f90 \
@@ -477,6 +477,9 @@ libhdf5_fortran_la_SOURCES = H5f90global.f90 \
$(PARALLEL_COND_SRC)
+# HDF5 Fortran library depends on HDF5 Library.
+libhdf5_fortran_la_LIBADD = $(LIBHDF5)
+
# h5fc is generated during configure.
# Remove it only when distclean.
DISTCLEANFILES = h5fc