summaryrefslogtreecommitdiffstats
path: root/hl/c++
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 /hl/c++
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 'hl/c++')
-rw-r--r--hl/c++/Makefile.in8
-rw-r--r--hl/c++/examples/Makefile.in8
-rw-r--r--hl/c++/src/Makefile.in8
-rw-r--r--hl/c++/test/Makefile.in8
4 files changed, 4 insertions, 28 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index e1d8ceb..d57a8b3 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -642,12 +642,6 @@ uninstall-info: uninstall-info-recursive
tags tags-recursive 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
@@ -719,7 +713,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/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index 25885bd..2332adf 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -514,12 +514,6 @@ uninstall-am: uninstall-info-am uninstall-local
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
@@ -612,7 +606,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/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index dae8515..89296c2 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -661,12 +661,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
uninstall-libLTLIBRARIES
-# 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
@@ -722,7 +716,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/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index c98a2e9..4aeb064 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -611,12 +611,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
@@ -672,7 +666,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.