[svn-r11737] Purpose:

Bug fix

Description:
Before this checkin, 'gmake check-s' would fail if there was a file in
the current directory named 'check-s'.
This is fixed under gmake (not sure how to fix for other makes).

Solution:
check, progs, install, etc. are what gmake calls "phony" targets,
which means that no file should be created.  These targets can be
specified by a line of the form
.PHONY: check progs install ...
Automake adds this line for targets it knows about, but HDF5 has a
lot of custom rules.  This checkin adds a .PHONY line for those rules.
I believe that only gmake recognizes the .PHONY line (at least, pmake
doesn't seem to), but a partial solution is better than none.
This error should occur very rarely anyway (the user has to manually
create files with names like 'build-check-s' or '_test').

Platforms tested:
mir, sleipnir, modi4

10 files changed, 80 insertions, 0 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 1d6aab9..14f42b0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -646,6 +646,14 @@ uninstall-info: uninstall-info-recursive
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 777d5f0..a74c436 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -647,6 +647,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 254d344..a8ba16d 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -687,6 +687,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 18e3896..aee2081 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -662,6 +662,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index d52085a..61c82a8 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -655,6 +655,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index dc191fc..78c6539 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -682,6 +682,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 26d3056..39b77b0 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -635,6 +635,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 2fcb220..2ba12db 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -712,6 +712,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 8452a57..a8a27a6 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -645,6 +645,14 @@ uninstall-am: uninstall-info-am
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 # BUILT_SOURCES contain targets that need to be built before anything else
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 47a062b..c85a528 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -731,6 +731,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 # as well.
 check-install: installcheck
 
+# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
+# This tells the Makefiles that these targets are not files to be built but
+# commands that should be executed even if a file with the same name already
+# exists.
+.PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
+        build-tests check-clean check-install check-p check-s check-vfd \
+        install-doc lib progs tests uninstall-doc _exec_check-s _test
+
 install-exec-local:
 	@$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
 uninstall-local: