diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2010-07-09 02:52:14 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2010-07-09 02:52:14 (GMT) |
| commit | 10a8b060ca69eafe2eb73e86e7ed56432a2650d5 (patch) | |
| tree | 9fb057c2a785fdd7691fb69322368602ff4e2ba5 /Makefile.in | |
| parent | 5d5ffe2373f1f5db3e49da5095466c94d16dca19 (diff) | |
| download | hdf5-10a8b060ca69eafe2eb73e86e7ed56432a2650d5.zip hdf5-10a8b060ca69eafe2eb73e86e7ed56432a2650d5.tar.gz hdf5-10a8b060ca69eafe2eb73e86e7ed56432a2650d5.tar.bz2 | |
[svn-r19059] Brought changes from hdf5_1_8 to add version information for fortran and c++ compilers in libhdf5.settings file and configure output (r18836), to install examples as part of make install (r18680), and to provide scripts to compile and run the examples after they are installed (r18817).
Tested with new/h5committest on amani, heiwa, and jam.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 8553153..fc2e887 100644 --- a/Makefile.in +++ b/Makefile.in @@ -172,6 +172,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_VERSION = @CXX_VERSION@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFAULT_API_VERSION = @DEFAULT_API_VERSION@ @@ -197,6 +198,7 @@ FC = @FC@ FCFLAGS = @FCFLAGS@ FCFLAGS_f90 = @FCFLAGS_f90@ FCLIBS = @FCLIBS@ +FC_VERSION = @FC_VERSION@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ @@ -778,10 +780,8 @@ check: check-recursive all-am: Makefile all-local installdirs: installdirs-recursive installdirs-am: -install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am @@ -950,17 +950,20 @@ mostlyclean-local: $(RM) -rf ii_files; \ fi +# 'make install' will now install examples, the same as 'make install-all'. +# 'make-install-all' will be redundant but will still work. +install: install-recursive install-examples +uninstall: uninstall-recursive uninstall-examples + # 'make install-all' also installs examples install-all: @$(MAKE) $(AM_MAKEFLAGS) install - @$(MAKE) $(AM_MAKEFLAGS) install-examples uninstall-all: @$(MAKE) $(AM_MAKEFLAGS) uninstall - @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples # Install examples in this directory and recursively install-examples uninstall-examples: - @@SETX@; for d in examples $(HDF5_INTERFACES); do \ + @@SETX@; for d in examples $(HDF5_INTERFACES) $(HL); do \ (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ done @@ -974,6 +977,9 @@ uninstall-doc: # `make check-install' or `make installcheck' checks that examples can # be successfully built installcheck-local: + if test -n "${DESTDIR}"; then \ + (cd ${DESTDIR}/$(bindir) && pwd && ./h5redeploy -force); \ + fi @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # check-install is just a synonym for installcheck |