diff options
| author | Robb Matzke <matzke@llnl.gov> | 1998-11-16 15:29:54 (GMT) |
|---|---|---|
| committer | Robb Matzke <matzke@llnl.gov> | 1998-11-16 15:29:54 (GMT) |
| commit | 841e168a04f14d5ce79713c2937e4cadb543ef0e (patch) | |
| tree | 0b9511e36bc033d97c06368fdf5f50c863203b3e /tools | |
| parent | c3570e984a10701abcef85f3ada67b76d602c4cf (diff) | |
| download | hdf5-841e168a04f14d5ce79713c2937e4cadb543ef0e.zip hdf5-841e168a04f14d5ce79713c2937e4cadb543ef0e.tar.gz hdf5-841e168a04f14d5ce79713c2937e4cadb543ef0e.tar.bz2 | |
[svn-r914] Changes since 19981113
----------------------
./config/conclude.in
./test/Makefile.in
./tools/Makefile.in
The Makefile $TESTS variable has finally been split into
$TEST_PROGS and $TEST_SCRIPTS with the latter being the names
of shell scripts that need to be run with `/bin/sh'. Now we
don't have to copy each shell script before we run it. NOTE:
THIS CHANGE DOES NOT AFFECT THE PABLO MAKEFILE SINCE THAT FILE
IS A COPY OF A PREVIOUSLY GENERATED MAKEFILE.
./src/Makefile.in
Added H5Snone.c to the source list.
./src/H5G.c
Plugged a memory leak by emptying the object type "isa" table
when the library is closed.
./src/H5Tconv.c
./src/H5Tpkg.h
Added 48 new type functions to take advantage of hardware for
integer type conversions. These functions are not registered
in the conversion table yet because I haven't fully tested
them.
./src/H5Tpkg.h
Removed __unused__ qualifiers from prototypes.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index d6840bf..9306e3b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -11,15 +11,13 @@ CPPFLAGS=-I../src -I. @CPPFLAGS@ LIBS=../src/libhdf5.a libh5tools.a @LIBS@ -# Tools test targets. -# Use /bin/sh to use because the test is actually a shell script file. -TESTS=testh5dump -RUNTEST=/bin/sh +# Test programs and scripts. +TEST_PROGS= +TEST_SCRIPTS=testh5dump.sh @TESTH5TOH4@ -# These are our main targets: library, programs, and tests +# These are our main targets: library and tools. LIB=libh5tools.a PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@ -TESTS=@TESTH5TOH4@ # Source and object files for the library. LIB_SRC=h5tools.c @@ -31,7 +29,7 @@ PROG_OBJ=$(PROG_SRC:.c=.o) PRIVATE_HDR=h5tools.h # Source and object files for the tests -TEST_SRC=testh5toh4.c +TEST_SRC= TEST_OBJ=$(TEST_SRC:.c=.o) # Programs have to be built before they can be tested! @@ -56,13 +54,4 @@ h5repart: h5repart.o h5dump: h5dump.o h5dumputil.o $(CC) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LDFLAGS) $(LIBS) -# How to build the tests. The testh5dump is a shell script that we -# copy from its permanent home to a temporary name because `make -# clean' will remove the temporary name. -testh5dump: testh5dump.sh - cp testh5dump.sh $@ - -testh5toh4: testh5toh4.o - $(CC) $(CFLAGS) -o $@ testh5toh4 $(LDFLAGS) $(LIBS) - @CONCLUDE@ |