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/src/Makefile.in | |
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/src/Makefile.in')
-rw-r--r-- | hl/fortran/src/Makefile.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index a7ee379..0fdf5cf 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -65,10 +65,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = $(top_builddir)/hl/src/libhdf5_hl.la -libhdf5hl_fortran_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libhdf5hl_fortran_la_OBJECTS = H5LTfc.lo H5IMfc.lo H5TBfc.lo \ - H5LTff.lo H5IMff.lo H5TBff.lo +libhdf5hl_fortran_la_LIBADD = +am_libhdf5hl_fortran_la_OBJECTS = H5LTfc.lo H5IMfc.lo H5IMcc.lo \ + H5TBfc.lo H5LTff.lo H5IMff.lo H5TBff.lo libhdf5hl_fortran_la_OBJECTS = $(am_libhdf5hl_fortran_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/bin/depcomp @@ -309,11 +308,12 @@ AM_LDFLAGS = -static lib_LTLIBRARIES = libhdf5hl_fortran.la # Source files for the library -@BUILD_PARALLEL_CONDITIONAL_TRUE@PARALLEL_COND_SRC = HDFDmpiof.c HDF5mpio.f90 -libhdf5hl_fortran_la_SOURCES = H5LTfc.c H5IMfc.c H5TBfc.c H5LTff.f90 \ +#if BUILD_PARALLEL_CONDITIONAL +# PARALLEL_COND_SRC=HDFDmpiof.c HDF5mpio.f90 +#endif +libhdf5hl_fortran_la_SOURCES = H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c H5LTff.f90 \ H5IMff.f90 H5TBff.f90 -libhdf5hl_fortran_la_LIBADD = $(LIBH5_HL) # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., @@ -396,6 +396,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IMcc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IMfc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5LTfc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5TBfc.Plo@am__quote@ @@ -617,6 +618,8 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-libLTLIBRARIES uninstall-local +#libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) + # Fortran module files can have different extensions and different names # (e.g., different capitalizations) on different platforms. Write rules # for them explicitly rather than trying to teach automake about them. |