[svn-r18451] Description:

	Bring r18172:18446 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

1 files changed, 17 insertions, 21 deletions

diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index e6d4f70..03c8ff7 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -50,8 +50,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/config/commence.am \
+DIST_COMMON = $(srcdir)/H5srcdir_str.h.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/config/commence.am \
 	$(top_srcdir)/config/conclude.am
 
 # Shared C++ libraries aren't universally supported.
@@ -65,17 +65,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = H5srcdir_str.h
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = dsets$(EXEEXT) testhdf5$(EXEEXT)
-am_dsets_OBJECTS = dsets.$(OBJEXT) h5cpputil.$(OBJEXT)
-dsets_OBJECTS = $(am_dsets_OBJECTS)
-dsets_LDADD = $(LDADD)
-dsets_DEPENDENCIES = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
-am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tattr.$(OBJEXT) \
-	tcompound.$(OBJEXT) tfile.$(OBJEXT) tfilter.$(OBJEXT) \
-	th5s.$(OBJEXT) tlinks.$(OBJEXT) trefer.$(OBJEXT) \
-	ttypes.$(OBJEXT) tvlstr.$(OBJEXT) h5cpputil.$(OBJEXT)
+am__EXEEXT_1 = testhdf5$(EXEEXT)
+am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) dsets.$(OBJEXT) \
+	tattr.$(OBJEXT) tcompound.$(OBJEXT) tfile.$(OBJEXT) \
+	tfilter.$(OBJEXT) th5s.$(OBJEXT) tlinks.$(OBJEXT) \
+	trefer.$(OBJEXT) ttypes.$(OBJEXT) tvlstr.$(OBJEXT) \
+	h5cpputil.$(OBJEXT)
 testhdf5_OBJECTS = $(am_testhdf5_OBJECTS)
 testhdf5_LDADD = $(LDADD)
 testhdf5_DEPENDENCIES = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
@@ -92,8 +89,8 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(dsets_SOURCES) $(testhdf5_SOURCES)
-DIST_SOURCES = $(dsets_SOURCES) $(testhdf5_SOURCES)
+SOURCES = $(testhdf5_SOURCES)
+DIST_SOURCES = $(testhdf5_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -362,13 +359,13 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
 
 # These are our main targets.  They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
-TEST_PROG = dsets testhdf5
+TEST_PROG = testhdf5
 
 # The tests depend on the hdf5 library, test library, and the c++ library
 LDADD = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
-dsets_SOURCES = dsets.cpp h5cpputil.cpp
-testhdf5_SOURCES = testhdf5.cpp tattr.cpp tcompound.cpp tfile.cpp tfilter.cpp \
-	th5s.cpp tlinks.cpp trefer.cpp ttypes.cpp tvlstr.cpp h5cpputil.cpp
+testhdf5_SOURCES = testhdf5.cpp dsets.cpp tattr.cpp tcompound.cpp	\
+	tfile.cpp tfilter.cpp th5s.cpp tlinks.cpp trefer.cpp	\
+	ttypes.cpp tvlstr.cpp h5cpputil.cpp
 
 
 # Tell conclude.am that these are C++ tests.
@@ -423,6 +420,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+H5srcdir_str.h: $(top_builddir)/config.status $(srcdir)/H5srcdir_str.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -432,9 +431,6 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-dsets$(EXEEXT): $(dsets_OBJECTS) $(dsets_DEPENDENCIES) 
-	@rm -f dsets$(EXEEXT)
-	$(CXXLINK) $(dsets_OBJECTS) $(dsets_LDADD) $(LIBS)
 testhdf5$(EXEEXT): $(testhdf5_OBJECTS) $(testhdf5_DEPENDENCIES) 
 	@rm -f testhdf5$(EXEEXT)
 	$(CXXLINK) $(testhdf5_OBJECTS) $(testhdf5_LDADD) $(LIBS)