diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-18 12:45:29 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-18 12:45:29 (GMT) |
| commit | bcd6c3f7cca0b5cb888132f8d24230c15d03d5d0 (patch) | |
| tree | 3efcd91499c80e5c3f24f31bacaa6b49ed1e7d98 /perform | |
| parent | 1809f040c928269cde2784e76dbcf4a72e02e930 (diff) | |
| download | hdf5-bcd6c3f7cca0b5cb888132f8d24230c15d03d5d0.zip hdf5-bcd6c3f7cca0b5cb888132f8d24230c15d03d5d0.tar.gz hdf5-bcd6c3f7cca0b5cb888132f8d24230c15d03d5d0.tar.bz2 | |
[svn-r18420] Description:
Re-run bin/reconfigure to catch up with recent rearrangements, remove some
unused srcdir headers and duplicated code in main test header.
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug & prod
Linux/32 2.6 (jam)
Diffstat (limited to 'perform')
| -rw-r--r-- | perform/H5srcdir_str.h.in | 22 | ||||
| -rw-r--r-- | perform/Makefile.in | 8 |
2 files changed, 3 insertions, 27 deletions
diff --git a/perform/H5srcdir_str.h.in b/perform/H5srcdir_str.h.in deleted file mode 100644 index d472124..0000000 --- a/perform/H5srcdir_str.h.in +++ /dev/null @@ -1,22 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * 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://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* If you are reading this file and it has a '.h' suffix, it was automatically - * generated from the '.in' version. Make changes there. - */ - -/* Set the 'srcdir' path from configure time */ -static const char *config_srcdir = "@srcdir@"; - diff --git a/perform/Makefile.in b/perform/Makefile.in index 8b05026..a5a28f5 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -51,8 +51,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/H5srcdir.h.in $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/commence.am \ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/commence.am \ $(top_srcdir)/config/conclude.am COPYING @BUILD_PARALLEL_CONDITIONAL_FALSE@bin_PROGRAMS = \ @BUILD_PARALLEL_CONDITIONAL_FALSE@ h5perf_serial$(EXEEXT) @@ -66,7 +66,7 @@ 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 = H5srcdir.h +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" @BUILD_PARALLEL_CONDITIONAL_TRUE@am__EXEEXT_1 = h5perf$(EXEEXT) \ @@ -483,8 +483,6 @@ $(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.h: $(top_builddir)/config.status $(srcdir)/H5srcdir.h.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |