[MOAB-dev] r4625 - in MOAB/trunk: . src/io/mhdf src/io/mhdf/example test/h5file

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-03-21 15:14:23 -0500 (Mon, 21 Mar 2011)
New Revision: 4625

Added:
   MOAB/trunk/src/io/mhdf/example/validate.c
Removed:
   MOAB/trunk/test/h5file/validate.c
Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/src/io/mhdf/Makefile.am
   MOAB/trunk/test/h5file/Makefile.am
Log:
move source for h5mvaldate to a more logical place and add configure option --disable-h5mtools to disable build/install of both h5minfo and h5mvalidate

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2011-03-21 20:07:13 UTC (rev 4624)
+++ MOAB/trunk/configure.ac	2011-03-21 20:14:23 UTC (rev 4625)
@@ -571,6 +571,7 @@
 MB_OPTIONAL_TOOL([gsets],        [yes])
 MB_OPTIONAL_TOOL([mbdepth],      [yes])
 MB_OPTIONAL_TOOL([refiner],      [no])
+MB_OPTIONAL_TOOL([h5mtools],     [yes])
 
 if test "xyes" = "x$ENABLE_refiner"; then
   if test "xyes" != "x$WITH_MPI"; then

Modified: MOAB/trunk/src/io/mhdf/Makefile.am
===================================================================
--- MOAB/trunk/src/io/mhdf/Makefile.am	2011-03-21 20:07:13 UTC (rev 4624)
+++ MOAB/trunk/src/io/mhdf/Makefile.am	2011-03-21 20:14:23 UTC (rev 4625)
@@ -1,7 +1,6 @@
 
 noinst_LTLIBRARIES = libmhdf.la
 libmhdf_la_LIBADD = $(HDF5_LIBS)
-bin_PROGRAMS = h5minfo
 
 libmhdf_la_SOURCES = include/mhdf.h \
                      src/adjacency.c \
@@ -19,9 +18,20 @@
                      src/util.c \
                      src/util.h
 
+if ENABLE_h5mtools
+  h5mtools = h5minfo h5mvalidate
+else
+  h5mtools = 
+endif
+
+bin_PROGRAMS = $(h5mtools)
+
 h5minfo_SOURCES = include/mhdf.h example/info.c
 h5minfo_LDADD = libmhdf.la $(HDF5_LIBS)
 
+h5mvalidate_SOURCES = example/validate.c
+h5mvalidate_LDADD = libmhdf.la $(HDF5_LIBS)
+
 DEFS = -I$(srcdir)/include 
 
 EXTRA_DIST = doc/Doxyfile example/hexes_to_gmsh.c

Copied: MOAB/trunk/src/io/mhdf/example/validate.c (from rev 4624, MOAB/trunk/test/h5file/validate.c)
===================================================================
--- MOAB/trunk/src/io/mhdf/example/validate.c	                        (rev 0)
+++ MOAB/trunk/src/io/mhdf/example/validate.c	2011-03-21 20:14:23 UTC (rev 4625)