6 files changed, 10 insertions, 8 deletions
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am
index 85cb35e..7142e8f 100644
--- a/hl/c++/examples/Makefile.am
+++ b/hl/c++/examples/Makefile.am
@@ -34,7 +34,7 @@ HDF_CXX=yes
 EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c++
 
 # How to build programs using h5c++
-$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) $(LIBH5CPP_HL)
+$(EXTRA_PROG): $(H5CPP)
 	$(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
 
 # List dependencies for each program.  Normally, automake would take
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index af034d7..13c5f22 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -522,7 +522,7 @@ uninstall-am: uninstall-info-am uninstall-local
         install-doc lib progs tests uninstall-doc _exec_check-s _test
 
 # How to build programs using h5c++
-$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) $(LIBH5CPP_HL)
+$(EXTRA_PROG): $(H5CPP)
 	$(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
 
 # List dependencies for each program.  Normally, automake would take
diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am
index a98e4a5..df3a8ad 100644
--- a/hl/examples/Makefile.am
+++ b/hl/examples/Makefile.am
@@ -43,10 +43,11 @@ TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \
 INSTALL_FILES = ptExampleFL.c ptExampleVL.c
 
 # Additional dependencies for each program are listed below.
-$(EXTRA_PROG): $(LIBHDF5) $(LIBH5_HL)
 if BUILD_PARALLEL_CONDITIONAL
+$(EXTRA_PROG): $(H5CC_PP)
 	$(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c;
 else
+$(EXTRA_PROG): $(H5CC)
 	$(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c;
 endif
 
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 3fae85b..f61ceae 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -529,8 +529,9 @@ uninstall-am: uninstall-info-am uninstall-local
         install-doc lib progs tests uninstall-doc _exec_check-s _test
 
 # Additional dependencies for each program are listed below.
-$(EXTRA_PROG): $(LIBHDF5) $(LIBH5_HL)
+@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5CC_PP)
 @BUILD_PARALLEL_CONDITIONAL_TRUE@	$(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c;
+@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5CC)
 @BUILD_PARALLEL_CONDITIONAL_FALSE@	$(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c;
 
 # ex_lite2 uses a file created by ex_lite1
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am
index 9ed304f..def2fdc 100644
--- a/hl/fortran/examples/Makefile.am
+++ b/hl/fortran/examples/Makefile.am
@@ -39,11 +39,11 @@ INSTALL_FILES=
 HDF_FORTRAN=yes
 
 # Tell automake how to build examples using h5fc
-# Additional dependencies for the examples are listed below
-$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) $(LIBH5F_HL)
 if BUILD_PARALLEL_CONDITIONAL
+$(EXTRA_PROG): $(H5FC_PP)
 	$(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
 else
+$(EXTRA_PROG): $(H5FC)
 	$(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
 endif
 
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index f2c754a..ffbe43b 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -528,9 +528,9 @@ uninstall-am: uninstall-info-am uninstall-local
         install-doc lib progs tests uninstall-doc _exec_check-s _test
 
 # Tell automake how to build examples using h5fc
-# Additional dependencies for the examples are listed below
-$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) $(LIBH5F_HL)
+@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5FC_PP)
 @BUILD_PARALLEL_CONDITIONAL_TRUE@	$(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
+@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5FC)
 @BUILD_PARALLEL_CONDITIONAL_FALSE@	$(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
 
 # How to create EXAMPLEDIR if it doesn't already exist