[svn-r5730] Purpose:

    Feature Add
Description:
    Install the h5perf program (previously called pio_perf). This
    required the libh5test library to be compiled statically. I copied
    how things were compiled statically for the h5tools library into the
    test/Makefile.in.
Platforms tested:
    Linux

4 files changed, 23 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index 524a553..930ba45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,7 +75,7 @@ tests TAGS dep depend:
 	done
 
 install:
-	@@SETX@; for d in $(SUBDIRS); do				      \
+	@@SETX@; for d in $(SUBDIRS) perform; do				      \
 	   (cd $$d && $(MAKE) $@) || exit 1;				      \
 	done
 	@$(LT) --mode=finish $(libdir);
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 46e7621..2ad8ad8 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -1,8 +1,16 @@
 ## HDF5 Library Performance Makefile(.in)
 ##
-## Copyright (C) 2001, 2002
-##     National Center for Supercomputing Applications.
-##     All rights reserved.
+## Copyright by the Board of Trustees of the University of Illinois.
+## All rights reserved.
+##
+## This file is part of HDF5.  The full HDF5 copyright notice, including
+## terms governing use, modification, and redistribution, is contained in
+## the files COPYING and Copyright.html.  COPYING can be found at the root
+## of the source code distribution tree; Copyright.html can be found at the
+## root level of an installed copy of the electronic HDF5 document set and
+## is linked from the top-level documents page.  It can also be found at
+## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
 top_srcdir=@top_srcdir@
 top_builddir=..
@@ -19,9 +27,11 @@ LIBTOOLS=../tools/lib/libh5tools.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.
-TEST_PROGS_PARA=pio_perf
+TEST_PROGS_PARA=h5perf
 TEST_PROGS=iopipe chunk overhead
 
+PUB_PROGS=h5perf
+
 ## These are the files that `make clean' (and derivatives) will remove from
 ## this directory.
 CLEAN=*.h5 *.raw *.dat x-gnuplot
@@ -40,7 +50,7 @@ TEST_OBJ=$(TEST_SRC:.c=.lo)
 ## How to build the programs... they all depend on the hdf5 library
 $(TEST_PROGS) $(TEST_PROGS_PARA): $(LIBHDF5)
 
-pio_perf: $(PIO_PERF_OBJ)
+h5perf: $(PIO_PERF_OBJ)
 	@$(LT_LINK_EXE) $(CFLAGS) -o $@ $(PIO_PERF_OBJ) $(LIBH5TEST) \
 	$(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index 4e48e24..1b87aad 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -109,7 +109,7 @@ int         pio_debug_level = 0;/* The debug level:
                                  */
 
 /* local variables */
-static const char  *progname = "pio_perf";
+static const char  *progname = "h5perf";
 
 /*
  * Command-line options: The user can specify short or long-named
@@ -1101,7 +1101,7 @@ parse_command_line(int argc, char *argv[])
                     } else if (!strcasecmp(buf, "posix")) {
                         cl_opts->io_types |= PIO_POSIX;
                     } else {
-                        fprintf(stderr, "pio_perf: invalid --api option %s\n",
+                        fprintf(stderr, "h5perf: invalid --api option %s\n",
                                 buf);
                         exit(EXIT_FAILURE);
                     }
@@ -1148,7 +1148,7 @@ parse_command_line(int argc, char *argv[])
 
                         for (j = 0; j < 10 && buf[j] != '\0'; ++j)
                             if (!isdigit(buf[j])) {
-                                fprintf(stderr, "pio_perf: invalid --debug option %s\n",
+                                fprintf(stderr, "h5perf: invalid --debug option %s\n",
                                         buf);
                                 exit(EXIT_FAILURE);
                             }
@@ -1174,7 +1174,7 @@ parse_command_line(int argc, char *argv[])
 			    cl_opts->verify = TRUE;
 			    break;
                         default:
-                            fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
+                            fprintf(stderr, "h5perf: invalid --debug option %s\n", buf);
                             exit(EXIT_FAILURE);
                         }
                     }
@@ -1203,7 +1203,7 @@ parse_command_line(int argc, char *argv[])
 #ifdef H5_HAVE_NOFILL
             cl_opts->h5_no_fill = TRUE;
 #else
-	    fprintf(stderr, "pio_perf: --no-fill not supported\n");
+	    fprintf(stderr, "h5perf: --no-fill not supported\n");
             usage(progname);
 	    exit(EXIT_FAILURE);
 #endif
diff --git a/test/Makefile.in b/test/Makefile.in
index 69be50e..94def7b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -33,8 +33,9 @@ TIMINGS=testmeta
 ## The libh5test.a library provides common support code for the tests. We link
 ## this library statically because some systems can only link executables to
 ## a single shared library and libhdf5 is much bigger than libh5test.
-LIBHDF5=../src/libhdf5.la
+LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir)
 LIB=libh5test.la
+LIBHDF5=$(top_builddir)/src/libhdf5.la
 LIB_SRC=h5test.c
 LIB_OBJ=$(LIB_SRC:.c=.lo)
 PUB_LIB=