summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-11-17 18:49:28 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-11-17 18:49:28 (GMT)
commit75ea10e5f50c3c23fd73f073adb84b0baf551edc (patch)
tree86ac2ae00334b79b7aa3d010415cc01e4e2caae4 /c++
parent706885260d43891095c910cd5975390504934c09 (diff)
downloadhdf5-75ea10e5f50c3c23fd73f073adb84b0baf551edc.zip
hdf5-75ea10e5f50c3c23fd73f073adb84b0baf551edc.tar.gz
hdf5-75ea10e5f50c3c23fd73f073adb84b0baf551edc.tar.bz2
[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
Diffstat (limited to 'c++')
-rw-r--r--c++/Makefile.in8
-rw-r--r--c++/examples/Makefile.in8
-rw-r--r--c++/src/Makefile.in8
-rw-r--r--c++/test/Makefile.in8
4 files changed, 32 insertions, 0 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in
index a443524..30e56e3 100644
--- a/c++/Makefile.in
+++ b/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
+
# Install examples
install-examples uninstall-examples:
@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index f27e4bd..229a15a 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -514,6 +514,14 @@ uninstall-am: uninstall-info-am uninstall-local
# 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
+
# Some of the examples depend on files created by running other examples
readdata.chkexe_: create.chkexe_
chunks.chkexe_: extend_ds.chkexe_
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index ea70e62..f952b22 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -741,6 +741,14 @@ uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS \
# 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
+
# Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that
# holds *.ii files, which are template entity instantiations.
# This entire directory should be cleaned.
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 88df2a0..d3e329d 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -631,6 +631,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
+
# Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that
# holds *.ii files, which are template entity instantiations.
# This entire directory should be cleaned.