4 files changed, 8 insertions, 6 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index f2ffc1b..b7445d4 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -27,7 +27,7 @@ AM_FFLAGS=-I$(top_srcdir)/src
 # This is our main target, the fortran library
 lib_LTLIBRARIES=libhdf5_fortran.la
 
-# DEBUG - will linking statically solve fortran build problem?
+# Fortran library is linked statically to solve a build problem.
 libhdf5_fortran_la_LDFLAGS=-static
 
 # Include HDF5.f90 if parallel is disabled, HDF5mpiof*  if parallel is enabled
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index f72bb61..4aba994 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -201,7 +201,7 @@ AM_FFLAGS = -I$(top_srcdir)/src
 # This is our main target, the fortran library
 lib_LTLIBRARIES = libhdf5_fortran.la
 
-# DEBUG - will linking statically solve fortran build problem?
+# Fortran library is linked statically to solve a build problem.
 libhdf5_fortran_la_LDFLAGS = -static
 
 # Include HDF5.f90 if parallel is disabled, HDF5mpiof*  if parallel is enabled
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 376a19e..b9f0b8d 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -26,6 +26,9 @@ INCLUDES=-I$(top_srcdir)/src
 # 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)
@@ -34,8 +37,6 @@ libh5test_fortran_la_SOURCES=fortranlib_test.f90 tH5F.f90 tH5D.f90 \
         tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 tH5Sselect.f90 \
         tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 t.c
 
-libh5test_fortran_la_LDFLAGS=-static
-
 # Source files are used for both the library and fortranlib_test.
 # Automake will complain about this without the following workaround.
 fortranlib_test_FFLAGS=$(AM_FFLAGS)
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 2f345fb..d9ad763 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -200,6 +200,9 @@ INCLUDES = -I$(top_srcdir)/src
 # 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)
@@ -209,8 +212,6 @@ libh5test_fortran_la_SOURCES = fortranlib_test.f90 tH5F.f90 tH5D.f90 \
         tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 t.c
 
 
-libh5test_fortran_la_LDFLAGS = -static
-
 # Source files are used for both the library and fortranlib_test.
 # Automake will complain about this without the following workaround.
 fortranlib_test_FFLAGS = $(AM_FFLAGS)