diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-11-18 20:31:53 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-11-18 20:31:53 (GMT) |
| commit | 0f870b0f479c8f561def96e689fc8835b70de156 (patch) | |
| tree | 2d15f750a4b6d5f9e2ad7c7be76c94c387ddab23 /config | |
| parent | 0426d8d7e17a69ce3e6d870ad981d366c466c42d (diff) | |
| download | hdf5-0f870b0f479c8f561def96e689fc8835b70de156.zip hdf5-0f870b0f479c8f561def96e689fc8835b70de156.tar.gz hdf5-0f870b0f479c8f561def96e689fc8835b70de156.tar.bz2 | |
[svn-r11741] Purpose:
Bug fix
Description:
Fortran type generation was broken in two ways. Fixed both.
Solution:
Firstly, there were a couple of path problems. Fixed a typo and
specified the full path of a file.
Secondly, the dependencies weren't right when building with HDF5-specific
commands (make lib, make check-s, etc.). Tweaked dependencies
to fix the problem.
Platforms tested:
mir, modi4, sleipnir
Diffstat (limited to 'config')
| -rw-r--r-- | config/conclude.am | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/config/conclude.am b/config/conclude.am index 479de46..dafea77 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -28,13 +28,14 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_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 -# in the directory (e.g., Fortran type detection) -build-lib: $(BUILT_SOURCES) $(LIB) -build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS) -build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS) +build-lib: $(LIB) +build-progs: $(LIB) $(PROGS) +build-tests: $(LIB) $(PROGS) $(TESTS) -lib progs tests check-s check-p check-clean :: +# General rule for recursive building targets. +# BUILT_SOURCES contain targets that need to be built before anything else +# in the directory (e.g., for Fortran type detection) +lib progs tests check-s check-p :: $(BUILT_SOURCES) @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; @for d in X $(SUBDIRS); do \ if test $$d != X && test $$d != .; then \ @@ -42,6 +43,15 @@ lib progs tests check-s check-p check-clean :: fi; \ done +# General rule for recursive cleaning targets. Like the rule above, +# but doesn't require building BUILT_SOURCES. +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS); do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. |