5 files changed, 16 insertions, 12 deletions
diff --git a/bin/snapshot b/bin/snapshot
index 65a83d6..8dd8d1f 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -411,8 +411,13 @@ fi # Test the HDF5 library
 if [ -n "$DEPLOYDIRNAME" ]; then
     if [ "$snapshot" = "yes" ]; then
 	TIMESTAMP "deploy"
-	if (cd ${TESTDIR} && ${CURRENT}/bin/deploy ${deploydir}/${DEPLOYDIRNAME}); then
-	    :	#continue
+        if (cd ${TESTDIR} &&
+            ${CURRENT}/bin/deploy ${deploydir}/${DEPLOYDIRNAME} && \
+            TIMESTAMP "clean" && \
+            ${MAKE} clean && \ 
+            TIMESTAMP "check-install prefix=${deploydir}/${DEPLOYDIRNAME}" && \
+            ${MAKE} check-install prefix=${deploydir}/${DEPLOYDIRNAME}); then
+            :   #continue
 	else
 	    errcode=$?
 	    exit $errcode
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index ed32250..93a0fc9 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -48,8 +48,9 @@ TEST_PROGS=$(TEST_SRC:.cpp=)
 ## this directory.
 CLEAN=*.h5
 
-## How to build the programs... they all depend on the Fortran & C hdf5 libraries
-$(TEST_PROGS): $(LIB) $(LIBHDF5)
+## How to build the programs... they depend only on the installed library
+## and h5c++.
+$(TEST_PROGS):
 
 compound: $(srcdir)/compound.cpp
 	$(CXX) $(CPPFLAGS) -o $@ $(srcdir)/compound.cpp
diff --git a/examples/Makefile.in b/examples/Makefile.in
index be60e94..8b53e93 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -23,7 +23,6 @@ H5CC=$(bindir)/h5cc
 H5CC_PP=$(bindir)/h5pcc
 CPPFLAGS=-I. -I$(srcdir)
 CFLAGS=
-LIBHDF5=../src/libhdf5.la
 
 ## These are the programs that `make all' or `make tests' will build and which
 ## `make check' will run. List them in the order they should be run.
@@ -48,7 +47,7 @@ TEST_OBJ=$(TEST_SRC:.c=.lo)
 EXAMPLE_PROGS=$(TEST_SRC)
 
 ## How to build the programs... they all depend on the hdf5 library
-$(TEST_PROGS) $(TEST_PROGS_PARA): $(LIBHDF5)
+$(TEST_PROGS) $(TEST_PROGS_PARA):
 h5_chunk_read: $(srcdir)/h5_chunk_read.c
 	@if test "X$(PARALLEL)" = "Xno"; then				\
 	  echo $(H5CC) $(CPPFLAGS) -o $@ $(srcdir)/$@.c;		\
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 5d481fb..9249fa3 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -44,8 +44,8 @@ TEST_OBJ=$(TEST_SRC:.f90=.lo)
 
 EXAMPLE_PROGS=$(TEST_SRC)
 
-## How to build the programs... they all depend on the Fortran & C hdf5 libraries
-$(TEST_PROGS): $(LIBHDF5)
+## How to build the programs... they all depend on the installed h5fc.
+$(TEST_PROGS):
 dsetexample: $(srcdir)/dsetexample.f90
 	@if test "X$(PARALLEL)" = "Xno"; then				\
 	  echo $(FC) -o $@ $(srcdir)/$@.f90;				\
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index a8bd1c2..729362b 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -26,8 +26,6 @@ H5CC=$(bindir)/h5cc
 H5PCC=$(bindir)/h5pcc
 CPPFLAGS=-I. -I$(srcdir)
 CFLAGS=
-LIBHDF5=../../src/libhdf5.la
-LIBHDF5_HL=../src/libhdf5_hl.la
 
 hdf5_srcdir=$(top_srcdir)/src
 hdf5_builddir=$(top_builddir)/src
@@ -52,8 +50,9 @@ TEST_PROGS=$(TEST_SRC:.c=)
 ## this directory.
 CLEAN=*.h5
 
-## How to build the programs... they all depend on the C and HL hdf5 libraries
-$(TEST_PROGS): $(LIB) $(LIBHDF5_HL) $(LIBHDF5)
+## How to build the programs... they depend only on the installed versions
+## of the libraries and h5cc.
+$(TEST_PROGS):
 
 ex_lite1: $(srcdir)/ex_lite1.c
 	@if test "X$(PARALLEL)" = "Xno"; then                           \