mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r13203] Unable to replicate Daily Test error, but hopefully this is a fix anyway.

Browse Source 
The examples had been depending on the build libraries in src, but should have
been depending only on the installed h5cc.  Fixed this.

Tested on kagiso (dependency change only, and was unable to replicate the
problem on any system).  Real test will be Daily Tests tonight.
This commit is contained in:
James Laird 2007-01-26 10:00:09 -05:00
parent fd63747fd6
commit 3fdcb8b3d9
14 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
c++/examples/Makefile.am
View File

@ -39,7 +39,7 @@ HDF_CXX=yes
EXAMPLEDIR=$(docdir)/hdf5/examples/c++
# How to build programs using h5c++
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP)
$(EXTRA_PROG): $(H5CPP)
$(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
# List dependencies for each program. Normally, automake would take

2
c++/examples/Makefile.in
View File

@ -528,7 +528,7 @@ readdata.chkexe_: create.chkexe_
chunks.chkexe_: extend_ds.chkexe_
# How to build programs using h5c++
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP)
$(EXTRA_PROG): $(H5CPP)
$(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
# List dependencies for each program. Normally, automake would take

2
c++/test/Makefile.in
View File

@ -230,6 +230,7 @@ SIZE_T = @SIZE_T@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
TIME = @TIME@
TR = @TR@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
@ -293,7 +294,6 @@ target_alias = @target_alias@
# Shell commands used in Makefiles
RM = rm -f
CP = cp
TIME = time
# Some machines need a command to run executables; this is that command
# so that our tests will run.

2
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 13195 2007-01-25 08:35:44Z hdftest .
# From configure.in Id: configure.in 13198 2007-01-25 16:30:53Z jlaird .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60 for HDF5 1.8.0-alpha5snap1.
#

5
examples/Makefile.am
View File

@ -39,11 +39,12 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c \
h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c \
h5_ref2reg.c h5_shared_mesg.c ph5example.c
# Additional dependencies for each program are listed below.
$(EXTRA_PROG): $(LIBHDF5)
# How to build examples, using installed version of h5cc
if BUILD_PARALLEL_CONDITIONAL
$(EXTRA_PROG): $(H5CC_PP)
$(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c;
else
$(EXTRA_PROG): $(H5CC)
$(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c;
endif

5
examples/Makefile.in
View File

@ -533,9 +533,10 @@ uninstall-am: uninstall-info-am uninstall-local
build-tests check-clean check-install check-p check-s check-vfd \
install-doc lib progs tests uninstall-doc _exec_check-s _test
# Additional dependencies for each program are listed below.
$(EXTRA_PROG): $(LIBHDF5)
# How to build examples, using installed version of h5cc
@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5CC_PP)
@BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c;
@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5CC)
@BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c;
# Two of the examples depend on files created by other examples.

3
fortran/examples/Makefile.am
View File

@ -53,10 +53,11 @@ attrexample.chkexe_: rwdsetexample.chkexe_
# Tell automake how to build examples using h5fc
# Additional dependencies for the examples are listed below
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F)
if BUILD_PARALLEL_CONDITIONAL
$(EXTRA_PROG): $(H5FC_PP)
$(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
else
$(EXTRA_PROG): $(H5FC)
$(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
endif

3
fortran/examples/Makefile.in
View File

@ -544,8 +544,9 @@ attrexample.chkexe_: rwdsetexample.chkexe_
# Tell automake how to build examples using h5fc
# Additional dependencies for the examples are listed below
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F)
@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5FC_PP)
@BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5FC)
@BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
# List dependencies for each example. Normally, automake would take

2
hl/c++/examples/Makefile.am
View File

@ -34,7 +34,7 @@ HDF_CXX=yes
EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c++
# How to build programs using h5c++
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) $(LIBH5CPP_HL)
$(EXTRA_PROG): $(H5CPP)
$(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
# List dependencies for each program. Normally, automake would take

2
hl/c++/examples/Makefile.in
View File

@ -522,7 +522,7 @@ uninstall-am: uninstall-info-am uninstall-local
install-doc lib progs tests uninstall-doc _exec_check-s _test
# How to build programs using h5c++
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) $(LIBH5CPP_HL)
$(EXTRA_PROG): $(H5CPP)
$(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
# List dependencies for each program. Normally, automake would take

3
hl/examples/Makefile.am
View File

@ -43,10 +43,11 @@ TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \
INSTALL_FILES = ptExampleFL.c ptExampleVL.c
# Additional dependencies for each program are listed below.
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5_HL)
if BUILD_PARALLEL_CONDITIONAL
$(EXTRA_PROG): $(H5CC_PP)
$(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c;
else
$(EXTRA_PROG): $(H5CC)
$(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c;
endif

3
hl/examples/Makefile.in
View File

@ -529,8 +529,9 @@ uninstall-am: uninstall-info-am uninstall-local
install-doc lib progs tests uninstall-doc _exec_check-s _test
# Additional dependencies for each program are listed below.
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5_HL)
@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5CC_PP)
@BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c;
@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5CC)
@BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c;
# ex_lite2 uses a file created by ex_lite1

4
hl/fortran/examples/Makefile.am
View File

@ -39,11 +39,11 @@ INSTALL_FILES=
HDF_FORTRAN=yes
# Tell automake how to build examples using h5fc
# Additional dependencies for the examples are listed below
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) $(LIBH5F_HL)
if BUILD_PARALLEL_CONDITIONAL
$(EXTRA_PROG): $(H5FC_PP)
$(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
else
$(EXTRA_PROG): $(H5FC)
$(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
endif

4
hl/fortran/examples/Makefile.in
View File

@ -528,9 +528,9 @@ uninstall-am: uninstall-info-am uninstall-local
install-doc lib progs tests uninstall-doc _exec_check-s _test
# Tell automake how to build examples using h5fc
# Additional dependencies for the examples are listed below
$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) $(LIBH5F_HL)
@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5FC_PP)
@BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5FC)
@BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90;
# How to create EXAMPLEDIR if it doesn't already exist