summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-11-13 15:06:06 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-11-13 15:06:06 (GMT)
commit071aa057aa9bd24145d8796850f41705cd1988ca (patch)
tree48be10bae2e7b536ea8e989550546f36cd5cba57 /examples
parent17869ffb875211e2f1c0f7fcafca1ef972254b71 (diff)
downloadhdf5-071aa057aa9bd24145d8796850f41705cd1988ca.zip
hdf5-071aa057aa9bd24145d8796850f41705cd1988ca.tar.gz
hdf5-071aa057aa9bd24145d8796850f41705cd1988ca.tar.bz2
[svn-r907] Changes since 19981111
---------------------- ./INSTALL Added instructions about specifying a path for GNU zlib and HDF4 headers and library. Added comments for each of the tool names. Added h5toh4 as a tool name. ./configure.in ./conigure [REGENERATED] ./src/H5config.h.in [REGENERATED] The config/* scripts get invoked with $CC_BASENAME set the base name of the compiler in order to make it easier to handle setting compiler flags for different compilers in a big case statement. For instance, if $CC has the value /usr/local/mpi/bin/mpicc -ansi -64 then $CC_BASENAME will be `mpicc'. The $CC_BASENAME is not set if $CC is not set. Fixed alignment in `configure --help'. An include and/or library path can be specified for GNU zlib if configure can't find it in normal places. The "normal" means wherever your compiler normally searches, including search paths you've added through environment variables like CPPFLAGS and LDFLAGS. The INSTALL file has instructions. The `-ljpeg' library is detected. If `ssize_t' is not found then a #define is added to H5config.h similar to what we already do for `size_t'. We detect the hdf5 header file `mfhdf.h' and libraries `-lmfhdf' and `-ldf' and if found define the H5TOH4 and TESTH5TOH4 Makefile variables. The user can specify an include and/or library path. The INSTALL file has instructions. The `RUNTEST' variable has been split into `RUNSERIAL' and `RUNPARALLEL' because these are different commands. The makefile still uses `RUNTEST', which defaults to the RUNSERIAL value. The new testpar/Makefile.in sets RUNTEST to the RUNPARALLEL value. The default RUNSERIAL value is empty and the default RUNPARALLEL value is `mpirun -np 2'. These can both be overridden in the config/* files. To make the value the empty string set it like `RUNPARALLEL=none' in the config/* file. The new testpar/Makefile is generated from testpar/Makefile.in ./config/commence.in Added the RUNSERIAL and RUNPARALLEL makefile definitions. ./src/Makefile.in The `H5detect' program is run with RUNSERIAL, which is empty on all platforms except intel-osf1 (ASCI/Red) ./config/conclude.in Removed the `.c.a:' implicit rule -- we don't use it any more. ./config/BlankForm ./config/alpha-dec ./config/alpha-dec-osf4.0 ./config/freebsd2.2.7 ./config/hpux10.20 ./config/hpux9.03 ./config/intel-osf1 ./config/irix5.3 ./config/irix6.2 ./config/irix64 ./config/linux ./config/powerpc-ibm-aix4.2.1.0 ./config/rs6000-ibm-aix4.1.4.0 ./config/solaris2.5 All of these files have been updated to hande multiple compilers. Most of them assume `cc' if CC is not set. The documentation in `BlankForm' has been updated and documentation in the other files refer to `BlankForm'. The intel-osf1 uses LDFLAGS instead of LIBS to specify the extra library search paths. ./examples/Makefile.in ./test/Makefile.in ./tools/Makefile.in Simplified by grouping some dependency information together more succinctly. The tools Makefile.in has been modified to work with the `h5toh4' and `testh5toh4' programs. Until Paul checks these in you may have problems compiling. If so, just create files h5toh4.c and testh5toh4.c that contain: #include <stdio.h> int main(int argc, char *argv[]) { fprintf(stderr, "%s: not implemented\n", argv[0]); return 1; } ./src/H5public.h Removed definition for `ssize_t' since this is now handled by configure in H5config.h with a #define. ./MANIFEST ./testpar/Makefile.in [NEW] Added a makefile for parallel tests. As soon as we get this working properly we can remove the other four makefiles in that directory and maintain just one.
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile.in68
1 files changed, 21 insertions, 47 deletions
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 2d476db..5d24890 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -6,8 +6,10 @@
#
@COMMENCE@
-# Add include directory to the C preprocessor flags.
+# Add include directory to the C preprocessor flags and the hdf5 library
+# to the library list.
CPPFLAGS=-I. -I../src @CPPFLAGS@
+LIBS=../src/libhdf5.a @LIBS@
# These are the programs that `make all' will build, `make install'
# will copy to the binaries directory, and `make uninstall' will
@@ -29,59 +31,31 @@ PROG_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
PROG_OBJ=$(PROG_SRC:.c=.o)
-# List the source files for each individual program. Most programs
-# will have only one source file, but some might have more. We use
-# these variables instead of listing the object files directly in the
-# rules that build the executable so that we don't have to ever
-# duplicate a list of names.
-CHUNK_READ_SRC=h5_chunk_read.c
-CHUNK_READ_OBJ=$(CHUNK_READ_SRC:.c=.o)
-COMPOUND_SRC=h5_compound.c
-COMPOUND_OBJ=$(COMPOUND_SRC:.c=.o)
+# How to build the programs... they all depend on the hdf5 library
+$(PROGS): ../src/libhdf5.a
+h5_chunk_read: h5_chunk_read.o
+ $(CC) $(CFLAGS) -o $@ h5_chunk_read.o $(LDFLAGS) $(LIBS)
-EXTEND_WRITE_SRC=h5_extend_write.c
-EXTEND_WRITE_OBJ=$(EXTEND_WRITE_SRC:.c=.o)
+h5_compound: h5_compound.o
+ $(CC) $(CFLAGS) -o $@ h5_compound.o $(LDFLAGS) $(LIBS)
-GROUP_SRC=h5_group.c
-GROUP_OBJ=$(GROUP_SRC:.c=.o)
+h5_extend_write: h5_extend_write.o
+ $(CC) $(CFLAGS) -o $@ h5_extend_write.o $(LDFLAGS) $(LIBS)
-READ_SRC=h5_read.c
-READ_OBJ=$(READ_SRC:.c=.o)
+h5_group: h5_group.o
+ $(CC) $(CFLAGS) -o $@ h5_group.o $(LDFLAGS) $(LIBS)
-WRITE_SRC=h5_write.c
-WRITE_OBJ=$(WRITE_SRC:.c=.o)
+h5_write: h5_write.o
+ $(CC) $(CFLAGS) -o $@ h5_write.o $(LDFLAGS) $(LIBS)
-SELECT_SRC=h5_select.c
-SELECT_OBJ=$(SELECT_SRC:.c=.o)
+h5_read: h5_read.o
+ $(CC) $(CFLAGS) -o $@ h5_read.o $(LDFLAGS) $(LIBS)
+h5_select: h5_select.o
+ $(CC) $(CFLAGS) -o $@ h5_select.o $(LDFLAGS) $(LIBS)
-ATTRIBUTE_SRC=h5_attribute.c
-ATTRIBUTE_OBJ=$(ATTRIBUTE_SRC:.c=.o)
-
-# How to build the programs...
-h5_chunk_read: $(CHUNK_READ_OBJ) ../src/libhdf5.a
- $(CC) $(CFLAGS) -o $@ $(CHUNK_READ_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_compound: $(COMPOUND_OBJ) ../src/libhdf5.a
- $(CC) $(CFLAGS) -o $@ $(COMPOUND_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_extend_write: $(EXTEND_WRITE_OBJ) ../src/libhdf5.a
- $(CC) $(CFLAGS) -o $@ $(EXTEND_WRITE_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_group: $(GROUP_OBJ) ../src/libhdf5.a
- $(CC) $(CFLAGS) -o $@ $(GROUP_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_write: $(WRITE_OBJ) ../src/libhdf5.a
- $(CC) $(CFLAGS) -o $@ $(WRITE_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_read: $(READ_OBJ) ../src/libhdf5.a
- $(CC) $(CFLAGS) -o $@ $(READ_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_select: $(SELECT_OBJ) ../src/libhdf5.a
- $(CC) $(CFLAGS) -o $@ $(SELECT_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_attribute: $(ATTRIBUTE_OBJ) ../src/libhdf5.a
- $(CC) $(CFLAGS) -o $@ $(ATTRIBUTE_OBJ) ../src/libhdf5.a $(LIBS)
+h5_attribute: h5_attribute.o
+ $(CC) $(CFLAGS) -o $@ h5_attribute.o $(LDFLAGS) $(LIBS)
@CONCLUDE@