diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-09-20 21:46:24 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-09-20 21:46:24 (GMT) |
| commit | 3267458b648b168e4e627a0a02924533dfd3b149 (patch) | |
| tree | 54d1c26a2aaf65439d940db65fdb0164abad19c9 /hl/c++ | |
| parent | 8d7dbd9dc1d33990028bbf00a3424545d8e06033 (diff) | |
| download | hdf5-3267458b648b168e4e627a0a02924533dfd3b149.zip hdf5-3267458b648b168e4e627a0a02924533dfd3b149.tar.gz hdf5-3267458b648b168e4e627a0a02924533dfd3b149.tar.bz2 | |
[svn-r11446] Purpose:
Bug fix
Description:
Massaged the newer script and config/conclude.am to make SX6 happy.
Platforms tested:
SX6, sol, mir
Diffstat (limited to 'hl/c++')
| -rw-r--r-- | hl/c++/Makefile.in | 5 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 5 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index d9704e8..197c667 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -740,9 +740,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \ tname=`basename $(@:.chkexe_=)`;\ + chkname=`basename $(@:.chkexe_=.chkexe)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ + if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ @@ -760,7 +761,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \ - && touch `basename $(@:.chkexe_=.chkexe)` || \ + && touch $${chkname} || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ echo "" >> $${log}; \ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 22d0b8d..d609691 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -759,9 +759,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \ tname=`basename $(@:.chkexe_=)`;\ + chkname=`basename $(@:.chkexe_=.chkexe)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ + if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ @@ -779,7 +780,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \ - && touch `basename $(@:.chkexe_=.chkexe)` || \ + && touch $${chkname} || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ echo "" >> $${log}; \ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 51cc434..50e3512 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -709,9 +709,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \ tname=`basename $(@:.chkexe_=)`;\ + chkname=`basename $(@:.chkexe_=.chkexe)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ + if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ @@ -729,7 +730,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \ - && touch `basename $(@:.chkexe_=.chkexe)` || \ + && touch $${chkname} || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ echo "" >> $${log}; \ |