diff options
| author | Robb Matzke <matzke@llnl.gov> | 1999-03-18 13:42:52 (GMT) |
|---|---|---|
| committer | Robb Matzke <matzke@llnl.gov> | 1999-03-18 13:42:52 (GMT) |
| commit | 826dbc81465d5d45cb96960ddeee97fb8b536f2d (patch) | |
| tree | ee7e208308f918dd90d23ab64cdb793158efe4f3 /tools | |
| parent | 4ec2ca72ba19629e76fe9de26f82119b0929b307 (diff) | |
| download | hdf5-826dbc81465d5d45cb96960ddeee97fb8b536f2d.zip hdf5-826dbc81465d5d45cb96960ddeee97fb8b536f2d.tar.gz hdf5-826dbc81465d5d45cb96960ddeee97fb8b536f2d.tar.bz2 | |
[svn-r1149] ./configure.in
./configure [REGENERATED]
./src/H5config.h.in [REGENERATED]
./src/H5private.h
Temporarily commented out the code that tries to link a simple
MPI-IO application because I'm not sure how to pass $LDFLAGS
and $LIBS to the compiler.
Removed the `--enable-parallel=ibm' switch because the library
we link with is either -lmpcc or -lmpcc_r but not both. The
only way to tell is to see what compiler was specified (mpcc
or mpcc_r) but if that compiler is specified then we don't
need any libraries (the compiler script supplies them). That
leaves just two choices: the user must use a compiler script:
CC=mpcc ./configure
or the user must state which library is desired:
LDFLAGS='-lmpcc' ./configure --enable-parallel
Checks for <setjmp.h>, longjmp(), and signal(). We don't check
for setjmp() because it could be a macro (in fact, Posix
requires it to be a macro) and if longjmp() is present then
setjmp() is probably present too ;-)
./src/H5detect.c
The alignment detection loop uses SIGBUS and setjmp/longjmp
instead of fork/wait in order to get around bugs with forking
in conjunction with mpich. This hasn't been tested on the
SP-2 yet but it does work on the DEC Alpha.
./test/Makefile.in
./testpar/Makefile.in
./tools/Makefile.in
Changed the order that libraries are linked so -lhdf5 is
always before $LDFLAGS.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 723d930..28ea50b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -10,7 +10,6 @@ top_srcdir=@top_srcdir@ # Add include directory to the C preprocessor flags, add -lh5tools and # -lhdf5 to the list of libraries. CPPFLAGS=-I../src -I. @CPPFLAGS@ -LIBS=../src/libhdf5.la @LIBS@ # Test programs and scripts. TEST_PROGS= @@ -21,6 +20,7 @@ TEST_SCRIPTS=testh5dump.sh @TESTH5TOH4@ # shared library and libhdf5 is much bigger than libh5tools. LT_LINK_LIB=$(LT) --mode=link $(CC) -static LIB=libh5tools.a +LIBHDF5=../src/libhdf5.la PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@ # Source and object files for the library. @@ -44,21 +44,21 @@ check test _test: $(PROGS) $(PROGS): $(LIB) ../src/libhdf5.la h5debug: h5debug.o - $(LT_LINK_EXE) $(CFLAGS) -o $@ h5debug.o $(LIB) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5debug.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) h5import: h5import.o - $(LT_LINK_EXE) $(CFLAGS) -o $@ h5import.o $(LIB) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5import.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) h5ls: h5ls.o - $(LT_LINK_EXE) $(CFLAGS) -o $@ h5ls.o $(LIB) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5ls.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) h5repart: h5repart.o - $(LT_LINK_EXE) $(CFLAGS) -o $@ h5repart.o $(LIB) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5repart.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) h5dump: h5dump.o h5dumputil.o - $(LT_LINK_EXE) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LIB) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) h5toh4: h5toh4.o - $(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.o $(LIB) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) @CONCLUDE@ |