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 /c++ | |
| 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 'c++')
| -rw-r--r-- | c++/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 2 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am index f60b6d7..ad597c4 100644 --- a/c++/examples/Makefile.am +++ b/c++/examples/Makefile.am @@ -39,7 +39,7 @@ HDF_CXX=yes EXAMPLEDIR=$(docdir)/hdf5/examples/c++ # How to build programs using h5c++ -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) +$(EXTRA_PROG): $(H5CPP) $(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp # List dependencies for each program. Normally, automake would take diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 41bd789..aaad5f9 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -528,7 +528,7 @@ readdata.chkexe_: create.chkexe_ chunks.chkexe_: extend_ds.chkexe_ # How to build programs using h5c++ -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) +$(EXTRA_PROG): $(H5CPP) $(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp # List dependencies for each program. Normally, automake would take diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 51bc77d..e9684fd 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -230,6 +230,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -293,7 +294,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. |