diff options
| author | James Laird <jlaird@hdfgroup.org> | 2007-01-26 15:00:09 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2007-01-26 15:00:09 (GMT) |
| commit | 3fdcb8b3d9bb69243903b4d2ae4a67cdc5bdd544 (patch) | |
| tree | 49c0de341039f917e0bb82799a778ab3ad7ad4dc /fortran | |
| parent | fd63747fd649c609abcbcd6c6143cbe564092867 (diff) | |
| download | hdf5-3fdcb8b3d9bb69243903b4d2ae4a67cdc5bdd544.zip hdf5-3fdcb8b3d9bb69243903b4d2ae4a67cdc5bdd544.tar.gz hdf5-3fdcb8b3d9bb69243903b4d2ae4a67cdc5bdd544.tar.bz2 | |
[svn-r13203] Unable to replicate Daily Test error, but hopefully this is a fix anyway.
The examples had been depending on the build libraries in src, but should have
been depending only on the installed h5cc. Fixed this.
Tested on kagiso (dependency change only, and was unable to replicate the
problem on any system). Real test will be Daily Tests tonight.
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/examples/Makefile.am | 3 | ||||
| -rw-r--r-- | fortran/examples/Makefile.in | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am index 1d258c7..3200f63 100644 --- a/fortran/examples/Makefile.am +++ b/fortran/examples/Makefile.am @@ -53,10 +53,11 @@ attrexample.chkexe_: rwdsetexample.chkexe_ # Tell automake how to build examples using h5fc # Additional dependencies for the examples are listed below -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) if BUILD_PARALLEL_CONDITIONAL +$(EXTRA_PROG): $(H5FC_PP) $(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; else +$(EXTRA_PROG): $(H5FC) $(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; endif diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 04b5775..0862d25 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -544,8 +544,9 @@ attrexample.chkexe_: rwdsetexample.chkexe_ # Tell automake how to build examples using h5fc # Additional dependencies for the examples are listed below -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) +@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5FC_PP) @BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; +@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5FC) @BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; # List dependencies for each example. Normally, automake would take |