summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-03-23 21:26:17 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-03-23 21:26:17 (GMT)
commit93aa12407f5b7cbfdb69a8c324fef6b18ea45e16 (patch)
treebccb25e38f50fca798f13689915b4a87f944a6bd /tools
parentb22b47ced52e18aa16fd5347d1333f7c7aaa82af (diff)
downloadhdf5-93aa12407f5b7cbfdb69a8c324fef6b18ea45e16.zip
hdf5-93aa12407f5b7cbfdb69a8c324fef6b18ea45e16.tar.gz
hdf5-93aa12407f5b7cbfdb69a8c324fef6b18ea45e16.tar.bz2
[svn-r12149] Purpose:
Bug fix Description: Previous checkin did a bad thing; 'make clean' failed in example directories. Solution: Fixed commence.am so that examples no longer break, and fixed a mistake in conclude.am. Platforms tested: heping (minor makefile change) Misc. update:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.in8
-rw-r--r--tools/h5diff/Makefile.in8
-rw-r--r--tools/h5dump/Makefile.in8
-rwxr-xr-xtools/h5import/Makefile.in8
-rw-r--r--tools/h5jam/Makefile.in8
-rw-r--r--tools/h5ls/Makefile.in8
-rw-r--r--tools/h5repack/Makefile.in8
-rw-r--r--tools/lib/Makefile.in8
-rw-r--r--tools/misc/Makefile.in8
9 files changed, 9 insertions, 63 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 9aebf64..4649e79 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -644,12 +644,6 @@ uninstall-info: uninstall-info-recursive
uninstall-info-am
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -705,7 +699,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 7702cef..4566cf6 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -686,12 +686,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-am uninstall-binPROGRAMS uninstall-info-am
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -747,7 +741,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 28df9a4..2058e99 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -660,12 +660,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-am uninstall-binPROGRAMS uninstall-info-am
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -721,7 +715,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 3897860..c6cb439 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -653,12 +653,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-am uninstall-binPROGRAMS uninstall-info-am
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -714,7 +708,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index e1aed93..79e116d 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -680,12 +680,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-am uninstall-binPROGRAMS uninstall-info-am
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -741,7 +735,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index bcd1dca..13fe9e3 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -633,12 +633,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-binPROGRAMS uninstall-info-am
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -694,7 +688,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 0398689..5394cca 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -710,12 +710,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-binPROGRAMS uninstall-info-am
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -771,7 +765,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index f65ccda..1ecc413 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -643,12 +643,6 @@ uninstall-am: uninstall-info-am
pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -704,7 +698,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index ca6c812..6a9a81c 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -729,12 +729,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-info-am uninstall-local
-# check-install is a synonym for installcheck.
-# Add this build rule here (rather than in conclude.am, where build rules
-# normally go) because it should be included in the top-level Makefile.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
@@ -799,7 +793,7 @@ build-check-clean:
mostlyclean-local: build-check-clean
# check-install is just a synonym for installcheck
- @$(MAKE) $(AM_MAKEFLAGS) installcheck
+check-install: installcheck
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.