[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/hl/Makefile.in b/hl/Makefile.in
index 114b6c2..5e3a060 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -650,6 +650,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/hl/c++/Makefile.in b/hl/c++/Makefile.in
index 195d549..9c49e66 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -644,6 +644,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/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 8df2cd2..c9552fe 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -663,6 +663,14 @@ uninstall-am: uninstall-includeHEADERS 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/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index d158c84..b02d907 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -613,6 +613,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/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index f7bff26..32ba6a0 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -648,6 +648,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/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index c903b45..4946cb5 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -666,6 +666,14 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 # 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
+
 # Fortran module files can have different extensions and different names
 # (e.g., different capitalizations) on different platforms.  Write rules
 # for them explicitly rather than trying to teach automake about them.
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 352e570..7740a79 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -616,6 +616,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/hl/src/Makefile.in b/hl/src/Makefile.in
index a2c6c30..67c904f 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -662,6 +662,14 @@ uninstall-am: uninstall-includeHEADERS 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
+
 # Automake naturally assumes that we want it to remove y.tab.c on distclean.
 # Convince it otherwise.
 distclean-compile:
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index c3a6ae4..1214d03 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -648,6 +648,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/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 777d5f0..a74c436 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/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