diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-03-29 17:38:17 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-03-29 17:38:17 (GMT) |
| commit | 7acf3f1b12cb743850f2ae4a13d67a080fc26793 (patch) | |
| tree | 76ff86178b02b6329483b0975862032e73d1a991 /tools | |
| parent | 9e4b79ad482c7fe41e893dac8f52b101fcdc38c3 (diff) | |
| download | hdf5-7acf3f1b12cb743850f2ae4a13d67a080fc26793.zip hdf5-7acf3f1b12cb743850f2ae4a13d67a080fc26793.tar.gz hdf5-7acf3f1b12cb743850f2ae4a13d67a080fc26793.tar.bz2 | |
[svn-r10475] Purpose:
Feature - conditional compilation
Description:
SRB file driver and tests are now compiled only when SRB is enabled
(using --with-srb during configure).
Solution:
Added an automake conditional in configure.in, altered Makefiles.am in
src and test directories to depend on that conditional.
This should make a nice example for posterity to add conditionally
compiled sources.
Platforms tested:
heping (only configure change)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/gifconv/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5diff/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5dump/Makefile.in | 2 | ||||
| -rwxr-xr-x | tools/h5import/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5jam/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5ls/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5repack/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/lib/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/misc/Makefile.in | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 2520b1a..4df189e 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -101,6 +101,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 176fdbe..b11fdd4 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -124,6 +124,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 918e311..206822f 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -132,6 +132,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index a677541..c81c729 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -125,6 +125,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 4108f63..5618afe 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -125,6 +125,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 2571346..0444884 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -120,6 +120,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 0051bb2..b588a30 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -118,6 +118,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 51c19a4..da0f144 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -140,6 +140,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index e52a4e0..39c77a3 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -122,6 +122,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 1924195..77e79d9 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -130,6 +130,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ BUILD_PDB2HDF = @BUILD_PDB2HDF@ BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@ BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@ +BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@ +BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ |