summaryrefslogtreecommitdiffstats
path: root/fortran/testpar
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2003-07-28 21:38:04 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2003-07-28 21:38:04 (GMT)
commit0603e2db00e773702906387620e5644c23360703 (patch)
treea3f999ab9a8ac0ae015fedb9eb45a709a99c4a85 /fortran/testpar
parent6e0e3da2837214179812cf613e78227d4cbb78b3 (diff)
downloadhdf5-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/testpar')
-rw-r--r--fortran/testpar/Makefile.in11
1 files changed, 6 insertions, 5 deletions
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 2cf5cef..4397c0d 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -1,6 +1,5 @@
## HDF5 Fortran Parallel Library Test Makefile(.in)
##
-
##
## Copyright by the Board of Trustees of the University of Illinois.
## All rights reserved.
@@ -14,11 +13,13 @@
## 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_builddir=$(top_builddir)/src
## Add the include directory to the C preprocessor flags the the hdf5 library
@@ -26,8 +27,8 @@ hdf5_builddir=$(top_builddir)/src
LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir)
LIBFORTRAN=../src/libhdf5_fortran.la
LIBHDF5=$(hdf5_builddir)/libhdf5.la
-FTLIB = ../test/libh5test_fortran.la
-CTLIB = ../../test/.libs/libh5test.a
+FTLIB=../test/libh5test_fortran.la
+CTLIB=../../test/libh5test.la
## These tests are parallel
RUNTEST=$(RUNPARALLEL)
@@ -57,6 +58,6 @@ thyperslab_wr.lo: $(srcdir)/thyperslab_wr.f90 thdf5.lo
ptesthdf5_fortran.lo: $(srcdir)/ptesthdf5_fortran.f90 thdf5.lo
ptesthdf5_fortran: thdf5.lo thyperslab_wr.lo ptesthdf5_fortran.lo
- @$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo $(FTLIB) $(CTLIB) $(LIBFORTRAN) $(LIBHDF5) $(LIBS)
+ @$(LT_LINK_FEXE) -static $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo $(FTLIB) $(CTLIB) $(LIBFORTRAN) $(LIBHDF5) $(LIBS)
@CONCLUDE@