mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-17 16:10:24 +08:00
[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)
This commit is contained in:
Quincey Koziol
parent
1809f040c9
commit
bcd6c3f7cc
3
MANIFEST
3
MANIFEST
@ -365,7 +365,6 @@
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
./perform/COPYING
|
||||
./perform/H5srcdir_str.h.in
|
||||
./perform/Makefile.am
|
||||
./perform/Makefile.in
|
||||
./perform/benchpar.c
|
||||
@ -937,7 +936,6 @@
|
||||
./test/testfiles/error_test_2
|
||||
|
||||
./testpar/COPYING
|
||||
./testpar/H5srcdir_str.h.in
|
||||
./testpar/Makefile.am
|
||||
./testpar/Makefile.in
|
||||
./testpar/t_cache.c
|
||||
@ -2054,7 +2052,6 @@
|
||||
./windows/misc/typegen/h5tinit/h5tinit.vcproj
|
||||
|
||||
# Performance Tests
|
||||
./windows/perform/H5srcdir_str.h
|
||||
./windows/perform/checkperformtests.bat
|
||||
./windows/perform/perf_serialdll/perf_serialdll.vcproj
|
||||
./windows/perform/perf_serial/perf_serial.vcproj
|
||||
|
||||
@ -50,7 +50,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(srcdir)/H5srcdir.h.in $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = $(srcdir)/H5srcdir_str.h.in $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(top_srcdir)/config/commence.am \
|
||||
$(top_srcdir)/config/conclude.am
|
||||
|
||||
@ -65,7 +65,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 = H5srcdir_str.h
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__EXEEXT_1 = testhdf5$(EXEEXT)
|
||||
am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) dsets.$(OBJEXT) \
|
||||
@ -420,7 +420,7 @@ $(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
|
||||
H5srcdir_str.h: $(top_builddir)/config.status $(srcdir)/H5srcdir_str.h.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
clean-checkPROGRAMS:
|
||||
|
||||
13
configure
vendored
13
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 18413 2010-03-17 21:38:20Z koziol .
|
||||
# From configure.in Id: configure.in 18419 2010-03-18 12:23:04Z koziol .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.64 for HDF5 1.9.63.
|
||||
#
|
||||
@ -28266,7 +28266,7 @@ if test -n "$TESTPARALLEL"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/H5srcdir.h test/testlibinfo.sh testpar/Makefile testpar/H5srcdir.h testpar/testph5.sh perform/Makefile perform/H5srcdir.h tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/H5srcdir.h tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile examples/Makefile examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir.h c++/examples/Makefile c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir.h hl/tools/Makefile hl/tools/gif2h5/Makefile hl/examples/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile"
|
||||
ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/H5srcdir_str.h test/testlibinfo.sh testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile examples/Makefile examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/tools/Makefile hl/tools/gif2h5/Makefile hl/examples/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile"
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
@ -29478,13 +29478,11 @@ do
|
||||
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
|
||||
"test/testcheck_version.sh") CONFIG_FILES="$CONFIG_FILES test/testcheck_version.sh" ;;
|
||||
"test/testerror.sh") CONFIG_FILES="$CONFIG_FILES test/testerror.sh" ;;
|
||||
"test/H5srcdir.h") CONFIG_FILES="$CONFIG_FILES test/H5srcdir.h" ;;
|
||||
"test/H5srcdir_str.h") CONFIG_FILES="$CONFIG_FILES test/H5srcdir_str.h" ;;
|
||||
"test/testlibinfo.sh") CONFIG_FILES="$CONFIG_FILES test/testlibinfo.sh" ;;
|
||||
"testpar/Makefile") CONFIG_FILES="$CONFIG_FILES testpar/Makefile" ;;
|
||||
"testpar/H5srcdir.h") CONFIG_FILES="$CONFIG_FILES testpar/H5srcdir.h" ;;
|
||||
"testpar/testph5.sh") CONFIG_FILES="$CONFIG_FILES testpar/testph5.sh" ;;
|
||||
"perform/Makefile") CONFIG_FILES="$CONFIG_FILES perform/Makefile" ;;
|
||||
"perform/H5srcdir.h") CONFIG_FILES="$CONFIG_FILES perform/H5srcdir.h" ;;
|
||||
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
|
||||
"tools/h5dump/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5dump/Makefile" ;;
|
||||
"tools/h5dump/testh5dump.sh") CONFIG_FILES="$CONFIG_FILES tools/h5dump/testh5dump.sh" ;;
|
||||
@ -29494,7 +29492,6 @@ do
|
||||
"tools/h5diff/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5diff/Makefile" ;;
|
||||
"tools/h5jam/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5jam/Makefile" ;;
|
||||
"tools/h5jam/testh5jam.sh") CONFIG_FILES="$CONFIG_FILES tools/h5jam/testh5jam.sh" ;;
|
||||
"tools/h5repack/H5srcdir.h") CONFIG_FILES="$CONFIG_FILES tools/h5repack/H5srcdir.h" ;;
|
||||
"tools/h5repack/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5repack/Makefile" ;;
|
||||
"tools/h5repack/h5repack.sh") CONFIG_FILES="$CONFIG_FILES tools/h5repack/h5repack.sh" ;;
|
||||
"tools/h5ls/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5ls/Makefile" ;;
|
||||
@ -29511,7 +29508,7 @@ do
|
||||
"c++/src/Makefile") CONFIG_FILES="$CONFIG_FILES c++/src/Makefile" ;;
|
||||
"c++/src/h5c++") CONFIG_FILES="$CONFIG_FILES c++/src/h5c++" ;;
|
||||
"c++/test/Makefile") CONFIG_FILES="$CONFIG_FILES c++/test/Makefile" ;;
|
||||
"c++/test/H5srcdir.h") CONFIG_FILES="$CONFIG_FILES c++/test/H5srcdir.h" ;;
|
||||
"c++/test/H5srcdir_str.h") CONFIG_FILES="$CONFIG_FILES c++/test/H5srcdir_str.h" ;;
|
||||
"c++/examples/Makefile") CONFIG_FILES="$CONFIG_FILES c++/examples/Makefile" ;;
|
||||
"c++/examples/testh5c++.sh") CONFIG_FILES="$CONFIG_FILES c++/examples/testh5c++.sh" ;;
|
||||
"fortran/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/Makefile" ;;
|
||||
@ -29524,7 +29521,7 @@ do
|
||||
"hl/Makefile") CONFIG_FILES="$CONFIG_FILES hl/Makefile" ;;
|
||||
"hl/src/Makefile") CONFIG_FILES="$CONFIG_FILES hl/src/Makefile" ;;
|
||||
"hl/test/Makefile") CONFIG_FILES="$CONFIG_FILES hl/test/Makefile" ;;
|
||||
"hl/test/H5srcdir.h") CONFIG_FILES="$CONFIG_FILES hl/test/H5srcdir.h" ;;
|
||||
"hl/test/H5srcdir_str.h") CONFIG_FILES="$CONFIG_FILES hl/test/H5srcdir_str.h" ;;
|
||||
"hl/tools/Makefile") CONFIG_FILES="$CONFIG_FILES hl/tools/Makefile" ;;
|
||||
"hl/tools/gif2h5/Makefile") CONFIG_FILES="$CONFIG_FILES hl/tools/gif2h5/Makefile" ;;
|
||||
"hl/examples/Makefile") CONFIG_FILES="$CONFIG_FILES hl/examples/Makefile" ;;
|
||||
|
||||
@ -4054,10 +4054,8 @@ AC_CONFIG_FILES([src/libhdf5.settings
|
||||
test/H5srcdir_str.h
|
||||
test/testlibinfo.sh
|
||||
testpar/Makefile
|
||||
testpar/H5srcdir_str.h
|
||||
testpar/testph5.sh
|
||||
perform/Makefile
|
||||
perform/H5srcdir_str.h
|
||||
tools/Makefile
|
||||
tools/h5dump/Makefile
|
||||
tools/h5dump/testh5dump.sh
|
||||
|
||||
@ -53,7 +53,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(srcdir)/H5srcdir.h.in $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = $(srcdir)/H5srcdir_str.h.in $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(top_srcdir)/config/commence.am \
|
||||
$(top_srcdir)/config/conclude.am COPYING
|
||||
check_PROGRAMS = $(am__EXEEXT_1)
|
||||
@ -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 = H5srcdir_str.h
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__EXEEXT_1 = test_lite$(EXEEXT) test_image$(EXEEXT) \
|
||||
test_table$(EXEEXT) test_ds$(EXEEXT) test_packet$(EXEEXT)
|
||||
@ -448,7 +448,7 @@ $(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
|
||||
H5srcdir_str.h: $(top_builddir)/config.status $(srcdir)/H5srcdir_str.h.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
clean-checkPROGRAMS:
|
||||
|
||||
@ -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@";
|
||||
|
||||
@ -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)"
|
||||
|
||||
@ -52,7 +52,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(srcdir)/H5srcdir.h.in $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = $(srcdir)/H5srcdir_str.h.in $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/testcheck_version.sh.in \
|
||||
$(srcdir)/testerror.sh.in $(srcdir)/testlibinfo.sh.in \
|
||||
$(top_srcdir)/config/commence.am \
|
||||
@ -68,7 +68,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 = testcheck_version.sh testerror.sh H5srcdir.h \
|
||||
CONFIG_CLEAN_FILES = testcheck_version.sh testerror.sh H5srcdir_str.h \
|
||||
testlibinfo.sh
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
||||
@ -801,7 +801,7 @@ testcheck_version.sh: $(top_builddir)/config.status $(srcdir)/testcheck_version.
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
testerror.sh: $(top_builddir)/config.status $(srcdir)/testerror.sh.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
H5srcdir.h: $(top_builddir)/config.status $(srcdir)/H5srcdir.h.in
|
||||
H5srcdir_str.h: $(top_builddir)/config.status $(srcdir)/H5srcdir_str.h.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
testlibinfo.sh: $(top_builddir)/config.status $(srcdir)/testlibinfo.sh.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include "h5test.h"
|
||||
#include "H5srcdir.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <process.h>
|
||||
|
||||
@ -142,60 +142,6 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */
|
||||
#define DBL_REL_EQUAL(X,Y,M) (fabs((Y-X)/X)<M)
|
||||
#define LDBL_REL_EQUAL(X,Y,M) (fabsl((Y-X)/X)<M)
|
||||
|
||||
/* =================================== */
|
||||
/* Support for srcdir queries in tests */
|
||||
/* =================================== */
|
||||
#include "H5srcdir.h"
|
||||
|
||||
/* Buffer to construct path in and return pointer to */
|
||||
static char srcdir_path[1024] = "";
|
||||
|
||||
/* Buffer to construct file in and return pointer to */
|
||||
static char srcdir_testpath[1024] = "";
|
||||
|
||||
/* Append the test file name to the srcdir path and return the whole string */
|
||||
static const char *H5_get_srcdir_filename(const char *filename)
|
||||
{
|
||||
const char *srcdir = HDgetenv("srcdir");
|
||||
|
||||
/* Check for using the srcdir from configure time */
|
||||
if(NULL == srcdir)
|
||||
srcdir = config_srcdir;
|
||||
|
||||
/* Build path to test file */
|
||||
if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
|
||||
HDstrcpy(srcdir_testpath, srcdir);
|
||||
HDstrcat(srcdir_testpath, "/");
|
||||
HDstrcat(srcdir_testpath, filename);
|
||||
return(srcdir_testpath);
|
||||
} /* end if */
|
||||
else
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
/* Just return the srcdir path */
|
||||
static const char *H5_get_srcdir(void)
|
||||
{
|
||||
const char *srcdir = HDgetenv("srcdir");
|
||||
|
||||
/* Check for using the srcdir from configure time */
|
||||
if(NULL == srcdir)
|
||||
srcdir = config_srcdir;
|
||||
|
||||
/* Build path to all test files */
|
||||
if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
|
||||
HDstrcpy(srcdir_path, srcdir);
|
||||
HDstrcat(srcdir_path, "/");
|
||||
return(srcdir_path);
|
||||
} /* end if */
|
||||
else
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
/* ========================================== */
|
||||
/* End of support for srcdir queries in tests */
|
||||
/* ========================================== */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
@ -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@";
|
||||
|
||||
@ -50,9 +50,8 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(srcdir)/H5srcdir.h.in $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/testph5.sh.in \
|
||||
$(top_srcdir)/config/commence.am \
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(srcdir)/testph5.sh.in $(top_srcdir)/config/commence.am \
|
||||
$(top_srcdir)/config/conclude.am COPYING
|
||||
check_PROGRAMS = $(am__EXEEXT_1)
|
||||
TESTS = $(check_PROGRAMS) $(am__EXEEXT_2)
|
||||
@ -63,7 +62,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 testph5.sh
|
||||
CONFIG_CLEAN_FILES = testph5.sh
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__EXEEXT_1 = t_mpi$(EXEEXT) t_posix_compliant$(EXEEXT) \
|
||||
testphdf5$(EXEEXT) t_cache$(EXEEXT) t_pflush1$(EXEEXT) \
|
||||
@ -445,8 +444,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)/$@
|
||||
testph5.sh: $(top_builddir)/config.status $(srcdir)/testph5.sh.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
|
||||
@ -51,9 +51,8 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(srcdir)/H5srcdir.h.in $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/h5repack.sh.in \
|
||||
$(top_srcdir)/config/commence.am \
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(srcdir)/h5repack.sh.in $(top_srcdir)/config/commence.am \
|
||||
$(top_srcdir)/config/conclude.am
|
||||
noinst_PROGRAMS = testh5repack_detect_szip$(EXEEXT)
|
||||
check_PROGRAMS = $(am__EXEEXT_1)
|
||||
@ -66,7 +65,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 h5repack.sh
|
||||
CONFIG_CLEAN_FILES = h5repack.sh
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(bindir)"
|
||||
am__EXEEXT_1 = h5repacktst$(EXEEXT)
|
||||
@ -450,8 +449,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)/$@
|
||||
h5repack.sh: $(top_builddir)/config.status $(srcdir)/h5repack.sh.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
install-binPROGRAMS: $(bin_PROGRAMS)
|
||||
|
||||
@ -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 = ".";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user