From 6470e417e8148558631c1793887d5b5bc65765af Mon Sep 17 00:00:00 2001 From: Robb Matzke Date: Mon, 19 Jul 1999 14:56:57 -0500 Subject: [svn-r1515] Changes since 19990715 ---------------------- ./Makefile.in [1.3] ./examples/Makefile.in [1.3] ./pablo/Makefile.in [1.3] ./src/Makefile.in [1.3] ./test/Makefile.in [1.3] ./testpar/Makefile.in [1.3] ./tools/Makefile.in [1.3] ./config/commence.in [1.3] ./config/conclude.in [1.3] ./config/depend.in [1.3] Added a `.PATH' target for Irix pmake which is identical to the VPATH used by most other `make' programs. Irix 6.5 (or 6.4?) and later `make' ignores VPATH. Started all beginning-of-line comments with `##' instead of just `#' because Irix `pmake' barfs on things like the following because it sees the `# if' as a directive: # make will barf on the following line # if running Irix pmake ./config/commence.in [1.3] Added empty definitions for optional `make' macros because Irix pmake complains if it sees a macro which has never been defined. The main body of the Makefiles can redefine these macros to whatever they need. --- INSTALL | 24 ++++++++++ Makefile.in | 109 +++++++++++++++++++++----------------------- README | 2 +- config/commence.in | 112 ++++++++++++++++++++++++--------------------- config/conclude.in | 78 ++++++++++++++++---------------- config/depend.in | 42 ++++++++--------- examples/Makefile.in | 31 ++++++------- pablo/Makefile.in | 125 ++++++++++++++++++++++++++------------------------- src/Makefile.in | 29 ++++++------ test/Makefile.in | 51 ++++++++++----------- testpar/Makefile.in | 27 +++++------ tools/Makefile.in | 37 +++++++-------- 12 files changed, 350 insertions(+), 317 deletions(-) diff --git a/INSTALL b/INSTALL index be3862e..4b4d3b8 100644 --- a/INSTALL +++ b/INSTALL @@ -96,6 +96,30 @@ INSTALL.ascired for instructions. *** Bzip'd tar archive (*.tar.bz2) $ bunzip2 H5Tinit.c -# no $(LIB) in the action below since that's being made now. +## no $(LIB) in the action below since that's being made now. H5detect: H5detect.o $(CC) $(CFLAGS) -o $@ H5detect.o $(LDFLAGS) $(LIBS) diff --git a/test/Makefile.in b/test/Makefile.in index 20b699b..7ad9478 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,30 +1,31 @@ -# HDF5 Library Test Makefile(.in) -# -# Copyright (C) 1997 National Center for Supercomputing Applications. -# All rights reserved. -# -# +## HDF5 Library Test Makefile(.in) +## +## Copyright (C) 1997 National Center for Supercomputing Applications. +## All rights reserved. +## +## top_srcdir=@top_srcdir@ top_builddir=.. srcdir=@srcdir@ VPATH=.:@srcdir@ +.PATH: . @srcdir@ @COMMENCE@ -# Add include directory to the C preprocessor flags and the h5test and hdf5 -# libraries to the library list. +## Add include directory to the C preprocessor flags and the h5test and hdf5 +## libraries to the library list. CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@ -# These are our main targets. They should be listed in the order to be -# executed, generally most specific tests to least specific tests. +## These are our main targets. They should be listed in the order to be +## executed, generally most specific tests to least specific tests. RUNTEST=$(LT_RUN) TEST_PROGS=testhdf5 lheap ohdr stab gheap hyperslab istore bittests dtypes \ dsets cmpd_dset extend external links unlink big mtime fillval mount \ flush1 flush2 enum TIMINGS=iopipe chunk ragged overhead -# The libh5test.a library provides common support code for the tests. We link -# this library statically because some systems can only link executables to -# a single shared library and libhdf5 is much bigger than libh5test. +## The libh5test.a library provides common support code for the tests. We link +## this library statically because some systems can only link executables to +## a single shared library and libhdf5 is much bigger than libh5test. LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir) LIBHDF5=../src/libhdf5.la LIB=libh5test.la @@ -32,11 +33,11 @@ LIB_SRC=h5test.c LIB_OBJ=$(LIB_SRC:.c=.lo) PUB_LIB= -# Temporary files. These files are the ones created by setting the -# HDF5_NOCLEANUP environment variable and running `make test' without -# specifying a file prefix or low-level driver. Changing the file -# prefix or low-level driver with environment variables will influence -# the temporary file name in ways that the makefile is not aware of. +## Temporary files. These files are the ones created by setting the +## HDF5_NOCLEANUP environment variable and running `make test' without +## specifying a file prefix or low-level driver. Changing the file +## prefix or low-level driver with environment variables will influence +## the temporary file name in ways that the makefile is not aware of. MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5 \ tfile3.h5 th5s1.h5 lheap.h5 ohdr.h5 stab1.h5 stab2.h5 \ extern_1.h5 extern_2.h5 extern_3.h5 extern_1a.raw extern_1b.raw \ @@ -49,10 +50,10 @@ MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5 \ flush.h5 enum1.h5 CLEAN=$(TIMINGS) -# Source and object files for programs... The TEST_SRC list contains all the -# source files and is used for things like dependencies, archiving, etc. The -# other source lists are for the individual tests, the files of which may -# overlap with other tests. +## Source and object files for programs... The TEST_SRC list contains all the +## source files and is used for things like dependencies, archiving, etc. The +## other source lists are for the individual tests, the files of which may +## overlap with other tests. TEST_SRC=big.c bittests.c chunk.c cmpd_dset.c dsets.c dtypes.c extend.c \ external.c fillval.c flush1.c flush2.c gheap.c h5test.c hyperslab.c \ iopipe.c istore.c lheap.c links.c mount.c mtime.c ohdr.c overhead.c \ @@ -60,10 +61,10 @@ TEST_SRC=big.c bittests.c chunk.c cmpd_dset.c dsets.c dtypes.c extend.c \ tselect.c tvltypes.c unlink.c enum.c TEST_OBJ=$(TEST_SRC:.c=.lo) -# Private header files (not to be installed)... +## Private header files (not to be installed)... PRIVATE_HDR=testhdf5.h -# Additional targets +## Additional targets .PHONY: timings _timings timings _timings: $(TIMINGS) @for timing in $(TIMINGS) dummy; do \ @@ -73,7 +74,7 @@ timings _timings: $(TIMINGS) fi; \ done; -# How to build the tests... They all depend on the test and hdf5 libraries. +## How to build the tests... They all depend on the test and hdf5 libraries. $(TEST_PROGS): $(LIB) $(LIBHDF5) TESTHDF5_OBJ=testhdf5.lo tattr.lo tfile.lo tmeta.lo trefer.lo tselect.lo tvltypes.lo th5s.lo testhdf5: $(TESTHDF5_OBJ) diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 624e5f9..fdb47a6 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -1,36 +1,37 @@ -# hdf5 Parallel Library Test Makefile(.in) -# -# Copyright (C) 1998 National Center for Supercomputing Applications -# All rights reserved -# -# +## hdf5 Parallel Library Test Makefile(.in) +## +## Copyright (C) 1998 National Center for Supercomputing Applications +## All rights reserved +## +## top_srcdir=@top_srcdir@ top_builddir=.. srcdir=@srcdir@ VPATH=.:@srcdir@ +.PATH: . @srcdir@ @COMMENCE@ -# Add the include directory to the C preprocessor flags the the hdf5 library -# to the library list. +## Add the include directory to the C preprocessor flags the the hdf5 library +## to the library list. CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@ LIBHDF5=../src/libhdf5.la -# These tests are parallel +## These tests are parallel RUNTEST=$(RUNPARALLEL) -# These are our main targets +## These are our main targets TEST_PROGS=testphdf5 -# Temporary files +## Temporary files MOSTLYCLEAN=ParaEg[123].h5f DISTCLEAN=go -# Test source files +## Test source files TEST_SRC=testphdf5.c t_dset.c t_file.c t_mpi.c TEST_OBJ=$(TEST_SRC:.c=.lo) TEST_HDR=testphdf5.h -# How to build the tests... They all depend on the hdf5 library +## How to build the tests... They all depend on the hdf5 library $(TEST_PROGS): ../src/libhdf5.la testphdf5: $(TEST_OBJ) diff --git a/tools/Makefile.in b/tools/Makefile.in index 6dab9e9..dfc6c9f 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,51 +1,52 @@ -# HDF5 Library Makefile(.in) -# -# Copyright (C) 1997 National Center for Supercomputing Applications. -# All rights reserved. -# -# +## HDF5 Library Makefile(.in) +## +## Copyright (C) 1997 National Center for Supercomputing Applications. +## All rights reserved. +## +## top_srcdir=@top_srcdir@ top_builddir=.. srcdir=@srcdir@ VPATH=.:@srcdir@ +.PATH: . @srcdir@ @COMMENCE@ -# Add include directory to the C preprocessor flags, add -lh5tools and -# -lhdf5 to the list of libraries. +## Add include directory to the C preprocessor flags, add -lh5tools and +## -lhdf5 to the list of libraries. CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@ -# Test programs and scripts. +## Test programs and scripts. TEST_PROGS= TEST_SCRIPTS=$(srcdir)/testh5dump.sh @TESTH5TOH4@ -# These are our main targets: library and tools. We link this library -# statically because some systems can only link executables to a single -# shared library and libhdf5 is much bigger than libh5tools. +## These are our main targets: library and tools. We link this library +## statically because some systems can only link executables to a single +## shared library and libhdf5 is much bigger than libh5tools. LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir) LIB=libh5tools.la LIBHDF5=../src/libhdf5.la PROGS=h5debug h5import h5ls h5repart h5dump h5dumptst @H5TOH4@ -# Source and object files for the library; do not install +## Source and object files for the library; do not install LIB_SRC=h5tools.c h5findshd.c LIB_OBJ=$(LIB_SRC:.c=.lo) PUB_LIB= -# Source and object files for programs... +## Source and object files for programs... PROG_SRC=h5debug.c h5import.c h5ls.c h5repart.c h5dump.c h5dumputil.c \ h5toh4.c h5dumptst.c PROG_OBJ=$(PROG_SRC:.c=.lo) PRIVATE_HDR=h5tools.h -# Source and object files for the tests +## Source and object files for the tests TEST_SRC= TEST_OBJ=$(TEST_SRC:.c=.lo) -# Programs have to be built before they can be tested! +## Programs have to be built before they can be tested! check test _test: $(PROGS) -# How to build the programs... They all depend on the hdf5 library and -# the tools library compiled in this directory. +## How to build the programs... They all depend on the hdf5 library and +## the tools library compiled in this directory. $(PROGS): $(LIB) ../src/libhdf5.la h5debug: h5debug.lo -- cgit v0.12