diff options
author | Albert Cheng <acheng@hdfgroup.org> | 2005-07-07 04:52:45 (GMT) |
---|---|---|
committer | Albert Cheng <acheng@hdfgroup.org> | 2005-07-07 04:52:45 (GMT) |
commit | f68a2e6db773f31157cdf500a6509fa5249b9cff (patch) | |
tree | ff6ccc3b41cc6dc42b770af294d4764b585a459f /tools | |
parent | 3781d2ed5af7a38b738246e94def670e9cd971cb (diff) | |
download | hdf5-f68a2e6db773f31157cdf500a6509fa5249b9cff.zip hdf5-f68a2e6db773f31157cdf500a6509fa5249b9cff.tar.gz hdf5-f68a2e6db773f31157cdf500a6509fa5249b9cff.tar.bz2 |
[svn-r11034] Purpose:
bug fix.
Description:
-nt is not a universal option for the test command in all platforms.
The use of it in conclude.am cause some platforms to bark at the
Makefile generated.
Solution:
Created a command script bin/newer which tests if file1 is newer
than file2. Replace the "test file1 -nt file2" by
"newer file1 file2".
Platforms tested:
Tested in sol.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.in | 6 | ||||
-rw-r--r-- | tools/gifconv/Makefile.in | 6 | ||||
-rw-r--r-- | tools/h5diff/Makefile.in | 6 | ||||
-rw-r--r-- | tools/h5dump/Makefile.in | 6 | ||||
-rwxr-xr-x | tools/h5import/Makefile.in | 6 | ||||
-rw-r--r-- | tools/h5jam/Makefile.in | 6 | ||||
-rw-r--r-- | tools/h5ls/Makefile.in | 6 | ||||
-rw-r--r-- | tools/h5repack/Makefile.in | 6 | ||||
-rw-r--r-- | tools/lib/Makefile.in | 6 | ||||
-rw-r--r-- | tools/misc/Makefile.in | 6 |
10 files changed, 20 insertions, 40 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index bcbe036..afb4d5d 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -670,8 +670,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -698,8 +697,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index ade4183..8380ab6 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -673,8 +673,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -701,8 +700,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index bf38e6d..7f8d383 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -711,8 +711,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -739,8 +738,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 0ddb4b4..8fae389 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -687,8 +687,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -715,8 +714,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index edcc1f4..c6d4ea0 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -680,8 +680,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -708,8 +707,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 87e9e3e..79acb52 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -704,8 +704,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -732,8 +731,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 2d464e0..84e46f6 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -660,8 +660,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -688,8 +687,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 3d2635a..2a3ad7c 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -737,8 +737,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -765,8 +764,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 7a7ff20..12fc3dd 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -677,8 +677,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -705,8 +704,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index dd54f02..d801076 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -770,8 +770,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -f $(@:.chkexe_=.chkexe) && \ - test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ @@ -798,8 +797,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -f $(@:.chksh_=.chksh) && \ - test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ + if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ |