From 47d9a73c2fcd47366cfbdd6ed5b7eb43ffc4fd49 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Sat, 23 Feb 2008 18:05:03 -0500 Subject: [svn-r14639] Purpose: Bug fix. Descriptions: Some examples are dependent on other files. E.g., a read program depend a write program to create the data file first. Adapted the dependencies from v1.8 Makefiles. Tested: By hand and also by h5committest. --- c++/examples/Makefile.in | 4 ++++ examples/Makefile.in | 4 ++++ fortran/examples/Makefile.in | 8 ++++++++ hl/examples/Makefile.in | 3 +++ 4 files changed, 19 insertions(+) diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 8c453d8..1ea5e2a 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -44,6 +44,10 @@ EXAMPLE_PROGS=$(TEST_SRC) TEST_PROGS=$(TEST_SRC:.cpp=) TEST_SCRIPTS=testh5c++.sh +# Some of the examples depend on files created by running other examples +readdata.chkexe_: create.chkexe_ +chunks.chkexe_: extend_ds.chkexe_ + ## These are the files that `make clean' (and derivatives) will remove from ## this directory. CLEAN=*.h5 diff --git a/examples/Makefile.in b/examples/Makefile.in index 1196580..a81fc43 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -32,6 +32,10 @@ TEST_PROGS=h5_write h5_read h5_extend_write h5_chunk_read h5_compound \ h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers TEST_SCRIPTS=testh5cc.sh +# Two of the examples depend on files created by other examples. +h5_read.chkexe_: h5_write.chkexe_ +h5_chunk_read.chkexe_: h5_extend_write.chkexe_ + ## These are the files that `make clean' (and derivatives) will remove from ## this directory. ## *.clog are from MPE option diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 7cdbfd5..7d39b58 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -33,6 +33,14 @@ TEST_PROGS=dsetexample fileexample rwdsetexample attrexample groupexample \ refregexample mountexample compound TEST_SCRIPTS=testh5fc.sh +# Some examples depend on files created by other examples. +grpdsetexample.chkexe_: grpsexample.chkexe_ +refregexample.chkexe_: refobjexample.chkexe_ +# rwdsetexample and attrexample both modify the same file created by +# dsetexample. Serialize them. +rwdsetexample.chkexe_: dsetexample.chkexe_ +attrexample.chkexe_: rwdsetexample.chkexe_ + ## These are the files that `make clean' (and derivatives) will remove from ## this directory. CLEAN=*.h5 diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index f13af5a..410c26e 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -47,6 +47,9 @@ EXAMPLE_PROGS=$(TEST_SRC) ## `make check' will run. List them in the order they should be run. TEST_PROGS=$(TEST_SRC:.c=) +# ex_lite2 uses a file created by ex_lite1 +ex_lite2.chkexe_: ex_lite1.chkexe_ + ## These are the files that `make clean' (and derivatives) will remove from ## this directory. CLEAN=*.h5 -- cgit v0.12