mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-25 17:00:45 +08:00
[svn-r3966] Purpose:
bug fix Description: The last reported problem that the parallel example program in examples could not be compiled, could not be duplicated again. I guessed maybe Rushad mistook the compile warning messages as error messages. Just a guess. Furthermore, the changed examples/Makefile.in and configure.in, did not work for the parallel case. The examples/ph5example.c was never included for compiling. Solution: Removed the fix in configure.in, put ph5exmple directly back in the examples/Makefile.in but put it in a variable for easier future maintenance. Also, easier to identify the parallel examples too. Platforms tested: Eirene, both serial and parallel modes.
This commit is contained in:
parent
9cf66905ff
commit
1585cc57c0
5
configure
vendored
5
configure
vendored
@ -9868,12 +9868,10 @@ touch ./config/stamp1
|
||||
saved_no_create=$no_create
|
||||
no_create=yes
|
||||
|
||||
PARALLEL_MAKE=""
|
||||
PARALLEL_EXAMPLES_SRC=""
|
||||
PARALLEL_MAKE=
|
||||
|
||||
if test -n "$TESTPARALLEL"; then
|
||||
PARALLEL_MAKE="$TESTPARALLEL/Makefile"
|
||||
PARALLEL_EXAMPLES_SRC="examples/ph5example.c"
|
||||
fi
|
||||
|
||||
EXTRA_H4_MAKEFILES=
|
||||
@ -10112,7 +10110,6 @@ s%@COMMENCE@%%g
|
||||
s%@CONCLUDE@%%g
|
||||
s%@SEARCH@%$SEARCH%g
|
||||
s%@SETX@%$SETX%g
|
||||
s%@PARALLEL_EXAMPLES_SRC@%$PARALLEL_EXAMPLES_SRC%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
@ -1606,12 +1606,10 @@ touch ./config/stamp1
|
||||
saved_no_create=$no_create
|
||||
no_create=yes
|
||||
|
||||
PARALLEL_MAKE=""
|
||||
AC_SUBST(PARALLEL_EXAMPLES_SRC) PARALLEL_EXAMPLES_SRC=""
|
||||
PARALLEL_MAKE=
|
||||
|
||||
if test -n "$TESTPARALLEL"; then
|
||||
PARALLEL_MAKE="$TESTPARALLEL/Makefile"
|
||||
PARALLEL_EXAMPLES_SRC="examples/ph5example.c"
|
||||
fi
|
||||
|
||||
EXTRA_H4_MAKEFILES=
|
||||
|
@ -15,9 +15,10 @@ LIBHDF5=../src/libhdf5.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=h5_write h5_read h5_extend_write h5_chunk_read \
|
||||
h5_compound h5_group h5_select h5_attribute h5_mount \
|
||||
h5_reference $(PARALLEL_EXAMPLES_SRC:.c=)
|
||||
TEST_PROGS_PARA=ph5example
|
||||
TEST_PROGS=h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
|
||||
h5_group h5_select h5_attribute h5_mount h5_reference \
|
||||
$(TEST_PROGS_PARA)
|
||||
|
||||
## These are the files that `make clean' (and derivatives) will remove from
|
||||
## this directory.
|
||||
@ -26,9 +27,11 @@ CLEAN=*.h5
|
||||
## List all source files here. The list of object files will be
|
||||
## created by replacing the `.c' with a `.o'. This list is necessary
|
||||
## for building automatic dependencies.
|
||||
TEST_SRC_PARA=ph5example.c
|
||||
TEST_SRC=h5_chunk_read.c h5_compound.c h5_extend_write.c h5_group.c \
|
||||
h5_read.c h5_write.c h5_select.c h5_attribute.c h5_mount.c \
|
||||
h5_reference.c $(PARALLEL_EXAMPLES_SRC)
|
||||
h5_reference.c \
|
||||
$(TEST_SRC_PARA)
|
||||
TEST_OBJ=$(TEST_SRC:.c=.lo)
|
||||
|
||||
## How to build the programs... they all depend on the hdf5 library
|
||||
|
Loading…
x
Reference in New Issue
Block a user