summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-02-28 22:54:17 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-02-28 22:54:17 (GMT)
commit5b4232e9d164434e422bdd72199f39507af984d8 (patch)
treef872924dd1d0d6f1059cf99a48317933b341286b /fortran/test
parent08bce1b7d2969ccb08ad4ba963ec6f17f57e9728 (diff)
downloadhdf5-5b4232e9d164434e422bdd72199f39507af984d8.zip
hdf5-5b4232e9d164434e422bdd72199f39507af984d8.tar.gz
hdf5-5b4232e9d164434e422bdd72199f39507af984d8.tar.bz2
[svn-r10107] Purpose:
Bug fix Description: Fortran builds were dying with unknown flags. Solution: Fortran builds should be static, not shared. Static flags had been specified for libraries, but apparently were also needed for executables. Solved problem by adding static flag to everything in fortran directories. Platforms tested: mir, eirene
Diffstat (limited to 'fortran/test')
-rw-r--r--fortran/test/Makefile.am6
-rw-r--r--fortran/test/Makefile.in7
2 files changed, 7 insertions, 6 deletions
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index b9f0b8d..ea9fd71 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -23,12 +23,12 @@ include $(top_srcdir)/config/commence.am
AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
INCLUDES=-I$(top_srcdir)/src
+# Fortran libraries are linked statically to solve a build problem.
+AM_LDFLAGS=-static
+
# The Fortran test library
lib_LTLIBRARIES=libh5test_fortran.la
-# Fortran library is linked statically to solve a build problem.
-libh5test_fortran_la_LDFLAGS=-static
-
# Our main targets, the tests themselves
TEST_PROG=fortranlib_test fflush1 fflush2
check_PROGRAMS=$(TEST_PROG)
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index d9ad763..f2fbab663 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -197,12 +197,12 @@ F9XMODFLAG = @F9XMODFLAG@
AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
INCLUDES = -I$(top_srcdir)/src
+# Fortran libraries are linked statically to solve a build problem.
+AM_LDFLAGS = -static
+
# The Fortran test library
lib_LTLIBRARIES = libh5test_fortran.la
-# Fortran library is linked statically to solve a build problem.
-libh5test_fortran_la_LDFLAGS = -static
-
# Our main targets, the tests themselves
TEST_PROG = fortranlib_test fflush1 fflush2
check_PROGRAMS = $(TEST_PROG)
@@ -251,6 +251,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
+libh5test_fortran_la_LDFLAGS =
libh5test_fortran_la_LIBADD =
am_libh5test_fortran_la_OBJECTS = fortranlib_test.lo tH5F.lo tH5D.lo \
tH5R.lo tH5S.lo tH5T.lo tH5VL.lo tH5Z.lo tH5Sselect.lo tH5P.lo \