[svn-r15175] An example program showing how to turn on the Journaling feature.

Has has a temporary patch option (-p) to add datasets back in till the object
header codes work.

Makefile.am: also added more cleaning of temporary generated files.

tested: kagiso.
------------------------------------------------------------------------

1 files changed, 16 insertions, 5 deletions

diff --git a/tools/h5recover/Makefile.in b/tools/h5recover/Makefile.in
index b649489..201ef85 100644
--- a/tools/h5recover/Makefile.in
+++ b/tools/h5recover/Makefile.in
@@ -53,7 +53,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/testh5recover.sh.in $(top_srcdir)/config/commence.am \
 	$(top_srcdir)/config/conclude.am
 check_PROGRAMS = $(am__EXEEXT_1)
-bin_PROGRAMS = h5recover$(EXEEXT) trecover$(EXEEXT)
+bin_PROGRAMS = h5recover$(EXEEXT) trecover$(EXEEXT) \
+	enable_journaling$(EXEEXT)
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 subdir = tools/h5recover
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -67,6 +68,10 @@ am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 am__EXEEXT_1 =
 PROGRAMS = $(bin_PROGRAMS)
+enable_journaling_SOURCES = enable_journaling.c
+enable_journaling_OBJECTS = enable_journaling.$(OBJEXT)
+enable_journaling_LDADD = $(LDADD)
+enable_journaling_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
 h5recover_SOURCES = h5recover.c
 h5recover_OBJECTS = h5recover.$(OBJEXT)
 h5recover_LDADD = $(LDADD)
@@ -88,8 +93,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = h5recover.c $(trecover_SOURCES)
-DIST_SOURCES = h5recover.c $(trecover_SOURCES)
+SOURCES = enable_journaling.c h5recover.c $(trecover_SOURCES)
+DIST_SOURCES = enable_journaling.c h5recover.c $(trecover_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -320,9 +325,11 @@ TRACE = perl $(top_srcdir)/bin/trace
 # .chklog files are output from those tests.
 # *.clog are from the MPE option.
 
-# Temporary files.  *.h5 are generated by h5recover.
+# Temporary files.  *.h5 and *.jnl are generated by h5recover.
 # *.out and *.err are generated by testh5recover.sh
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.out *.err
+# *.backup are generated by the h5recover tool.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.jnl *.out *.err \
+	*.backup
 
 # Include files in /src directory and /tools/lib directory
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -425,6 +432,9 @@ clean-checkPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+enable_journaling$(EXEEXT): $(enable_journaling_OBJECTS) $(enable_journaling_DEPENDENCIES) 
+	@rm -f enable_journaling$(EXEEXT)
+	$(LINK) $(enable_journaling_OBJECTS) $(enable_journaling_LDADD) $(LIBS)
 h5recover$(EXEEXT): $(h5recover_OBJECTS) $(h5recover_DEPENDENCIES) 
 	@rm -f h5recover$(EXEEXT)
 	$(LINK) $(h5recover_OBJECTS) $(h5recover_LDADD) $(LIBS)
@@ -438,6 +448,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enable_journaling.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5recover.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trecover_crasher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trecover_main.Po@am__quote@