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/test | |
| 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/test')
| -rw-r--r-- | fortran/test/Makefile.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 920f06f..811aaaa 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/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 CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@ ## Add include directory to the C preprocessor flags and the h5test and hdf5 ## libraries to the library list. -LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) +LT_LINK_FLIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) FLIB=../src/libhdf5_fortran.la HDF5LIB=$(hdf5_builddir)/libhdf5.la TCLIB=../../test/.libs/libh5test.a @@ -51,12 +53,12 @@ MOSTLYCLEAN=*.h5 *.tmp $(TEST_PROGS): $(LIB) $(FLIB) fortranlib_test: $(FORTLIBTEST_OBJ) - @$(LT_LINK_FEXE) $(FFLAGS) -o $@ $(FORTLIBTEST_OBJ) $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB) + @$(LT_LINK_FEXE) -static $(FFLAGS) -o $@ $(FORTLIBTEST_OBJ) $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB) fflush1: fflush1.lo - @$(LT_LINK_FEXE) $(FFLAGS) -o $@ fflush1.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB) + @$(LT_LINK_FEXE) -static $(FFLAGS) -o $@ fflush1.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB) fflush2: fflush2.lo - @$(LT_LINK_FEXE) $(FFLAGS) -o $@ fflush2.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB) + @$(LT_LINK_FEXE) -static $(FFLAGS) -o $@ fflush2.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB) @CONCLUDE@ |