summaryrefslogtreecommitdiffstats
path: root/hl/src/Makefile.in
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-04-21 19:21:24 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-04-21 19:21:24 (GMT)
commit91e56dc68db9b37fb536bac555e95953ba240ac2 (patch)
tree55140e8a869ac834886f90f94dd805ff4be2fd08 /hl/src/Makefile.in
parent5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5 (diff)
downloadhdf5-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/src/Makefile.in')
-rw-r--r--hl/src/Makefile.in13
1 files changed, 6 insertions, 7 deletions
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)