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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/Makefile.am | 5 | ||||
| -rw-r--r-- | examples/Makefile.in | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index b6f4b8d..1981072 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -39,11 +39,12 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c \ h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c \ h5_ref2reg.c h5_shared_mesg.c ph5example.c -# Additional dependencies for each program are listed below. -$(EXTRA_PROG): $(LIBHDF5) +# How to build examples, using installed version of h5cc if BUILD_PARALLEL_CONDITIONAL +$(EXTRA_PROG): $(H5CC_PP) $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c; else +$(EXTRA_PROG): $(H5CC) $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c; endif diff --git a/examples/Makefile.in b/examples/Makefile.in index b1597a3..2499328 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -533,9 +533,10 @@ uninstall-am: uninstall-info-am uninstall-local build-tests check-clean check-install check-p check-s check-vfd \ install-doc lib progs tests uninstall-doc _exec_check-s _test -# Additional dependencies for each program are listed below. -$(EXTRA_PROG): $(LIBHDF5) +# How to build examples, using installed version of h5cc +@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5CC_PP) @BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c; +@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5CC) @BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c; # Two of the examples depend on files created by other examples. |