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 /hl | |
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 'hl')
-rwxr-xr-x | hl/Makefile.in | 6 | ||||
-rw-r--r-- | hl/c++/Makefile.in | 6 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 6 | ||||
-rw-r--r-- | hl/c++/test/Makefile.in | 6 | ||||
-rw-r--r-- | hl/fortran/Makefile.in | 6 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 6 | ||||
-rw-r--r-- | hl/fortran/test/Makefile.in | 6 | ||||
-rw-r--r-- | hl/src/Makefile.in | 6 | ||||
-rw-r--r-- | hl/test/Makefile.in | 6 | ||||
-rw-r--r-- | hl/tools/gif2h5/Makefile.in | 6 |
10 files changed, 20 insertions, 40 deletions
diff --git a/hl/Makefile.in b/hl/Makefile.in index 7152cca..1babc4a 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -665,8 +665,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 \ @@ -693,8 +692,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/hl/c++/Makefile.in b/hl/c++/Makefile.in index a4f6f4d..7cb74b0 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -668,8 +668,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 \ @@ -696,8 +695,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/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 9616d86..5571bd8 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -690,8 +690,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 \ @@ -718,8 +717,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/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index f5ff54b..691184f 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -639,8 +639,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 \ @@ -667,8 +666,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/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index f7ca3db..4d156ed 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -663,8 +663,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 \ @@ -691,8 +690,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/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 0c8021f..9ad5b74 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -714,8 +714,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 \ @@ -742,8 +741,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/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index be1fb28..9544efc 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -630,8 +630,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 \ @@ -658,8 +657,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/hl/src/Makefile.in b/hl/src/Makefile.in index dae01ac..2cd9956 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -678,8 +678,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 \ @@ -706,8 +705,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/hl/test/Makefile.in b/hl/test/Makefile.in index 95fa97e..0a8cbc1 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -664,8 +664,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 \ @@ -692,8 +691,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/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index ade4183..8380ab6 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/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 \ |