diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-09-16 21:26:17 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-09-16 21:26:17 (GMT) |
| commit | ae2a313b5ba03538120f5ebd6512096e509a3ae0 (patch) | |
| tree | 4a8839579a705684513083f1932bea74b9543a2c /hl/tools/gif2h5 | |
| parent | b656c90c8a86eb7cb2d14baaadcc23fd8f22fbad (diff) | |
| download | hdf5-ae2a313b5ba03538120f5ebd6512096e509a3ae0.zip hdf5-ae2a313b5ba03538120f5ebd6512096e509a3ae0.tar.gz hdf5-ae2a313b5ba03538120f5ebd6512096e509a3ae0.tar.bz2 | |
[svn-r11421] Purpose:
Feature
Description:
Added H5_CFLAGS, etc. to 1.7 branch.
Now compilation flags can be put in H5_*FLAGS and they'll be used when
building hdf5 but not in h5cc.
Platforms tested:
mir, sleipnir, modi4
Misc. update:
Diffstat (limited to 'hl/tools/gif2h5')
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index d48d0ad..2aff089 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -128,16 +128,19 @@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CC_VERSION = @CC_VERSION@ -CFLAGS = @CFLAGS@ + +# H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5, +# but which shouldn't be exported to h5cc for building other programs. +CFLAGS = @CFLAGS@ @H5_CFLAGS@ CONFIG_DATE = @CONFIG_DATE@ CONFIG_MODE = @CONFIG_MODE@ CONFIG_USER = @CONFIG_USER@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ @H5_CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ +CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ @@ -160,11 +163,15 @@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ FCFLAGS = @FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ +FFLAGS = @FFLAGS@ @H5_FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ FSEARCH_DIRS = @FSEARCH_DIRS@ +H5_CFLAGS = @H5_CFLAGS@ +H5_CPPFLAGS = @H5_CPPFLAGS@ +H5_CXXFLAGS = @H5_CXXFLAGS@ +H5_FFLAGS = @H5_FFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ |