diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
| commit | 0603e2db00e773702906387620e5644c23360703 (patch) | |
| tree | a3f999ab9a8ac0ae015fedb9eb45a709a99c4a85 /fortran/src/Makefile.in | |
| parent | 6e0e3da2837214179812cf613e78227d4cbb78b3 (diff) | |
| download | hdf5-0603e2db00e773702906387620e5644c23360703.zip hdf5-0603e2db00e773702906387620e5644c23360703.tar.gz hdf5-0603e2db00e773702906387620e5644c23360703.tar.bz2 | |
[svn-r7269] Purpose:
Update
Description:
Revamped the configuration system. The configurations for the Fortran
and C++ libraries are no longer separate from the "main"
configuration system. This involved removing the "configure*" and
"aclocal.m4" files from the fortran/ and c++/ subdirectories. Also
merging settings in the config/ subdirectories into the main config/
subdirectory.
Fortran header files had to be modified a little for Linux. It was
checking if it was a Linux machine by some #defines, however with the
-std=c99 switch, these defines weren't there. I added a check for
some other ones which should be there whether the -std=c99 switch is
used or not.
Platforms tested:
Verbena (Fortran & C++)
Sol (Fortran & C++)
Copper (Fortran & C++)
Modi4 (Parallel, Fortran, & C++)
Misc. update:
Diffstat (limited to 'fortran/src/Makefile.in')
| -rw-r--r-- | fortran/src/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 80c9945..6b80cc5 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -13,18 +13,20 @@ ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. ## -top_srcdir=@top_srcdir@/.. +top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ @COMMENCE@ +HDF_FORTRAN="yes" + hdf5_srcdir=$(top_srcdir)/src hdf5_builddir=$(top_builddir)/src TRACE=perl $(top_srcdir)/bin/trace ## Add `-I.' to the C preprocessor flags. -CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@ +CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) -I$(srcdir) @CPPFLAGS@ ## This is our main target LIB=libhdf5_fortran.la @@ -34,7 +36,7 @@ LIB=libhdf5_fortran.la DISTCLEAN=H5fortran_types.f90 h5fc libhdf5_fortran.settings ## Public header files (to be installed)... -PUB_HDR=H5pubconf_fortran.h +PUB_HDR= PUB_PROGS=h5fc ## Source and object files for the library |