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 /hl/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 'hl/fortran')
| -rw-r--r-- | hl/fortran/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/fortran/examples/Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index 9ed304f..def2fdc 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -39,11 +39,11 @@ INSTALL_FILES= HDF_FORTRAN=yes # Tell automake how to build examples using h5fc -# Additional dependencies for the examples are listed below -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) $(LIBH5F_HL) 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/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index f2c754a..ffbe43b 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -528,9 +528,9 @@ uninstall-am: uninstall-info-am uninstall-local install-doc lib progs tests uninstall-doc _exec_check-s _test # Tell automake how to build examples using h5fc -# Additional dependencies for the examples are listed below -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) $(LIBH5F_HL) +@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; # How to create EXAMPLEDIR if it doesn't already exist |