diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2005-06-24 05:00:01 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2005-06-24 05:00:01 (GMT) |
| commit | 2ab6b12b552e9260e2e76640a788b5a3744c6a9f (patch) | |
| tree | 6ef872a02a4fd46af33370854af5e7876f4fa29b /hl/fortran/test | |
| parent | e38365206ae36d83b8e573eb0b2e51e555699c97 (diff) | |
| download | hdf5-2ab6b12b552e9260e2e76640a788b5a3744c6a9f.zip hdf5-2ab6b12b552e9260e2e76640a788b5a3744c6a9f.tar.gz hdf5-2ab6b12b552e9260e2e76640a788b5a3744c6a9f.tar.bz2 | |
[svn-r10977] Purpose: Bug fix
Description:
1.7 daily tests failed in HL library when Fortran was not
enabled; also long long instead of long_long declarations
were used and caused failures on Windows
Solution:
Removed Fortran related functions (except H5IM_find_palette) from
H5IM.c file and put it into fortran/src/H5IMcc.c
Modified appropriate Makefile.am files, regenerated Makefile.in files, updated header files, MANIFEST, etc.
Note: H5IM_find_palette should be also in H5IMcc.c, but
for some unknown to me reason, linking fails if the function is
included in H5IMcc.c. I will really appreciate if some C guru
will look into the code and figure out what is wrong :-) Thanks!
Platforms tested: mir with g95, heping with and without Fortran enabled
Misc. update:
Diffstat (limited to 'hl/fortran/test')
| -rw-r--r-- | hl/fortran/test/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.in | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am index bbff539..8597e1f 100644 --- a/hl/fortran/test/Makefile.am +++ b/hl/fortran/test/Makefile.am @@ -11,7 +11,7 @@ include $(top_srcdir)/config/commence.am -AM_CPPFLAGS=-I$(top_srcdir)/src $(top_builddir)/src +AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/hl/src AM_FCFLAGS=-I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src # Fortran libraries are linked statically to solve a build problem. @@ -21,7 +21,7 @@ AM_LDFLAGS=-static TEST_PROG=tstlite tstimage tsttable check_PROGRAMS=$(TEST_PROG) -LDADD=$(LIBH5_HL) $(LIBH5F_HL) $(LIBH5F) $(LIBHDF5) +LDADD= $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5) # Source files for the programs tstlite_SOURCES=tstlite.f90 diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index a6bb76a..bcc5110 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -60,10 +60,10 @@ am__EXEEXT_1 = tstlite$(EXEEXT) tstimage$(EXEEXT) tsttable$(EXEEXT) am_tstimage_OBJECTS = tstimage.$(OBJEXT) tstimage_OBJECTS = $(am_tstimage_OBJECTS) tstimage_LDADD = $(LDADD) -am__DEPENDENCIES_1 = $(top_builddir)/hl/src/libhdf5_hl.la -am__DEPENDENCIES_2 = \ +am__DEPENDENCIES_1 = \ $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la -am__DEPENDENCIES_3 = $(top_builddir)/fortran/src/libhdf5_fortran.la +am__DEPENDENCIES_2 = $(top_builddir)/fortran/src/libhdf5_fortran.la +am__DEPENDENCIES_3 = $(top_builddir)/hl/src/libhdf5_hl.la am__DEPENDENCIES_4 = $(top_builddir)/src/libhdf5.la tstimage_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) @@ -295,7 +295,7 @@ H5CC = $(bindir)/h5cc H5CC_PP = $(bindir)/h5pcc H5FC = $(bindir)/h5fc H5FC_PP = $(bindir)/h5pfc -AM_CPPFLAGS = -I$(top_srcdir)/src $(top_builddir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/hl/src AM_FCFLAGS = -I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src # Fortran libraries are linked statically to solve a build problem. @@ -303,7 +303,7 @@ AM_LDFLAGS = -static # Our main target, the test programs TEST_PROG = tstlite tstimage tsttable -LDADD = $(LIBH5_HL) $(LIBH5F_HL) $(LIBH5F) $(LIBHDF5) +LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5) # Source files for the programs tstlite_SOURCES = tstlite.f90 |