diff options
author | James Laird <jlaird@hdfgroup.org> | 2006-03-23 21:26:17 (GMT) |
---|---|---|
committer | James Laird <jlaird@hdfgroup.org> | 2006-03-23 21:26:17 (GMT) |
commit | 93aa12407f5b7cbfdb69a8c324fef6b18ea45e16 (patch) | |
tree | bccb25e38f50fca798f13689915b4a87f944a6bd /hl | |
parent | b22b47ced52e18aa16fd5347d1333f7c7aaa82af (diff) | |
download | hdf5-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')
-rwxr-xr-x | hl/Makefile.in | 8 | ||||
-rw-r--r-- | hl/c++/Makefile.in | 8 | ||||
-rw-r--r-- | hl/c++/examples/Makefile.in | 8 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 8 | ||||
-rw-r--r-- | hl/c++/test/Makefile.in | 8 | ||||
-rw-r--r-- | hl/examples/Makefile.in | 8 | ||||
-rw-r--r-- | hl/fortran/Makefile.in | 8 | ||||
-rw-r--r-- | hl/fortran/examples/Makefile.in | 8 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 8 | ||||
-rw-r--r-- | hl/fortran/test/Makefile.in | 8 | ||||
-rw-r--r-- | hl/src/Makefile.in | 8 | ||||
-rw-r--r-- | hl/test/Makefile.in | 8 | ||||
-rw-r--r-- | hl/tools/Makefile.in | 8 | ||||
-rw-r--r-- | hl/tools/gif2h5/Makefile.in | 8 |
14 files changed, 14 insertions, 98 deletions
diff --git a/hl/Makefile.in b/hl/Makefile.in index 4390200..7e6629d 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -648,12 +648,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 @@ -727,7 +721,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++/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. diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index d044b4f..3a48602 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -521,12 +521,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 @@ -642,7 +636,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/fortran/Makefile.in b/hl/fortran/Makefile.in index 7812030..51dfe3d 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -646,12 +646,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 @@ -723,7 +717,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/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index f535083..14b34db 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -520,12 +520,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 @@ -613,7 +607,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/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index fa0f8ff..e73d461 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -664,12 +664,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-libLTLIBRARIES 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 @@ -756,7 +750,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/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index e757955..521d214 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -614,12 +614,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 @@ -675,7 +669,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/src/Makefile.in b/hl/src/Makefile.in index fe1df2e..a51a244 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -660,12 +660,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 @@ -725,7 +719,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/test/Makefile.in b/hl/test/Makefile.in index ab6f5a0..14b3fcc 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -646,12 +646,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 @@ -707,7 +701,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/tools/Makefile.in b/hl/tools/Makefile.in index 446bf7d..64d704b 100644 --- a/hl/tools/Makefile.in +++ b/hl/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/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 1c6556d..fbd61ba 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -649,12 +649,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 @@ -710,7 +704,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. |