diff options
| author | James Laird <jlaird@hdfgroup.org> | 2006-04-21 19:21:24 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2006-04-21 19:21:24 (GMT) |
| commit | 91e56dc68db9b37fb536bac555e95953ba240ac2 (patch) | |
| tree | 55140e8a869ac834886f90f94dd805ff4be2fd08 /hl | |
| parent | 5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5 (diff) | |
| download | hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.zip hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.tar.gz hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.tar.bz2 | |
[svn-r12295] Purpose:
Several bug fixes
Description:
Added config file for Cray X1 (previous file was misnamed)
Simplified some code in hyperslab.c test that seemed to have been
confusing compiler on Cray X1.
Fixed typo in config/commence.am
Cleaned up hl/src/Makefile.am
Solution:
All four fixes should be straightforward. The failure on Cray was
very difficult to debug, but involved arithmetic errors.
This change seems to fix it.
Platforms tested:
heping, copper, sol, some Cray X1 (more testing when system comes back up)
Diffstat (limited to 'hl')
| -rwxr-xr-x | hl/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/c++/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/c++/examples/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/examples/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/fortran/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/fortran/examples/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/src/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/src/Makefile.in | 13 | ||||
| -rw-r--r-- | hl/test/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/tools/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 6 |
15 files changed, 45 insertions, 50 deletions
diff --git a/hl/Makefile.in b/hl/Makefile.in index 14dfb78..ff860d8 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -142,9 +142,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -152,7 +152,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 27afbac..8c0b9b1 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -138,9 +138,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -148,7 +148,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 8fd1052..42230d9 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index c8e4383..33e49dc 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -161,9 +161,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -171,7 +171,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 8ebea41..9c066a6 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -155,9 +155,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -165,7 +165,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 10c65d0..ffd9bf9 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 15b15a2..00e6ac2 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -142,9 +142,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -152,7 +152,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index fdecd77..8195549 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 67a789c..f00328f 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -164,9 +164,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -174,7 +174,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 7c43420..7aabb0f 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -163,9 +163,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -173,7 +173,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/src/Makefile.am b/hl/src/Makefile.am index 7fa633f..9ad3b8a 100644 --- a/hl/src/Makefile.am +++ b/hl/src/Makefile.am @@ -30,8 +30,4 @@ libhdf5_hl_la_SOURCES=H5LT.c H5TB.c H5IM.c H5DS.c H5PT.c H5LTparse.c H5LTanalyze # Public header files (to be installed) include_HEADERS=hdf5_hl.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h -# Automake naturally assumes that we want it to remove H5LTparse.c on distclean. -# Convince it otherwise. -distclean-compile: - include $(top_srcdir)/config/conclude.am diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 06eb14c..c60d657 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -162,9 +162,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -172,7 +172,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ @@ -430,6 +430,9 @@ libhdf5_hl.la: $(libhdf5_hl_la_OBJECTS) $(libhdf5_hl_la_DEPENDENCIES) mostlyclean-compile: -rm -f *.$(OBJEXT) +distclean-compile: + -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DS.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IM.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5LT.Plo@am__quote@ @@ -670,10 +673,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \ build-tests check-clean check-install check-p check-s check-vfd \ install-doc lib progs tests uninstall-doc _exec_check-s _test -# Automake naturally assumes that we want it to remove H5LTparse.c on distclean. -# Convince it otherwise. -distclean-compile: - # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 1e28bc3..d2372b8 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -174,9 +174,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -184,7 +184,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index ec5ccb9..140039a 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -139,9 +139,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -149,7 +149,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 61875e4..7b4f65f 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -165,9 +165,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -175,7 +175,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ |