[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.

1 files changed, 9 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 7acc2db..179fb17 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,17 +125,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
 
@@ -149,6 +152,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