mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-13 16:47:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r15913] Bug fix: #933

Browse Source 
The information of libhdf5_fortran.settings are all included in
libhdf5.settings now. Remove it from the source.

Tested: kagiso with fortran and C++.
This commit is contained in:
Albert Cheng 2008-10-21 00:05:50 -05:00
parent 0ec21efe65
commit 7c67ccef7e
6 changed files with 18 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -221,7 +221,6 @@
./fortran/src/README
./fortran/src/README_DEVELOPEMENT _DO_NOT_DISTRIBUTE_
./fortran/src/h5fc.in
./fortran/src/libhdf5_fortran.settings.in
./fortran/src/hdf5_fortrandll.def
./fortran/test/Makefile.am

5
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 15713 2008-09-28 09:57:24Z hdftest .
# From configure.in Id: configure.in 15825 2008-10-09 03:44:22Z koziol .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for HDF5 1.9.20.
#
@ -50950,7 +50950,7 @@ if test -n "$TESTPARALLEL"; then
fi
fi
ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testerror.sh testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumpxml.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile examples/Makefile examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/examples/Makefile c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/libhdf5_fortran.settings fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/tools/Makefile hl/tools/gif2h5/Makefile hl/examples/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile"
ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testerror.sh testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumpxml.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile examples/Makefile examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/examples/Makefile c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/tools/Makefile hl/tools/gif2h5/Makefile hl/examples/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile"
cat >confcache <<\_ACEOF
@ -52089,7 +52089,6 @@ do
"c++/examples/testh5c++.sh") CONFIG_FILES="$CONFIG_FILES c++/examples/testh5c++.sh" ;;
"fortran/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/Makefile" ;;
"fortran/src/h5fc") CONFIG_FILES="$CONFIG_FILES fortran/src/h5fc" ;;
"fortran/src/libhdf5_fortran.settings") CONFIG_FILES="$CONFIG_FILES fortran/src/libhdf5_fortran.settings" ;;
"fortran/src/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/src/Makefile" ;;
"fortran/test/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/test/Makefile" ;;
"fortran/testpar/Makefile") CONFIG_FILES="$CONFIG_FILES fortran/testpar/Makefile" ;;

1
configure.in
View File

@ -3951,7 +3951,6 @@ AC_CONFIG_FILES([src/libhdf5.settings
c++/examples/testh5c++.sh
fortran/Makefile
fortran/src/h5fc
fortran/src/libhdf5_fortran.settings
fortran/src/Makefile
fortran/test/Makefile
fortran/testpar/Makefile

10
fortran/src/Makefile.am
View File

@ -66,9 +66,9 @@ libhdf5_fortran_la_SOURCES= H5f90global.f90 \
H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c \
$(PARALLEL_COND_SRC)
# h5fc and libhdf5_fortran.settings are generated during configure.
# Remove them only when distclean.
DISTCLEANFILES=h5fc libhdf5_fortran.settings
# h5fc is generated during configure.
# Remove it only when distclean.
DISTCLEANFILES=h5fc
# H5fortran_types.f90 and H5f90i.h are automatically generaed by
# H5match_types, and must be cleaned explicitly. H5fort_type_defines.h
@ -104,10 +104,6 @@ uninstall-local:
install-exec-local:
@$(INSTALL) h5fc $(DESTDIR)$(bindir)/$(H5FC_NAME)
# Install libhdf5_fortran.settings in lib directory
settingsdir=$(libdir)
settings_DATA=libhdf5_fortran.settings
# Custom rule for installing h5fc, since it will be named h5pfc if hdf5
# is configured for parallel mode
if BUILD_PARALLEL_CONDITIONAL

55
fortran/src/Makefile.in
View File

@ -32,7 +32,6 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@ -52,8 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/h5fc.in $(srcdir)/libhdf5_fortran.settings.in \
$(top_srcdir)/config/commence.am \
$(srcdir)/h5fc.in $(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am
noinst_PROGRAMS = H5match_types$(EXEEXT) H5fortran_detect$(EXEEXT) \
H5test_kind$(EXEEXT)
@ -65,14 +63,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/H5config.h
CONFIG_CLEAN_FILES = h5fc libhdf5_fortran.settings
CONFIG_CLEAN_FILES = h5fc
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(settingsdir)"
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libhdf5_fortran_la_LIBADD =
@ -132,8 +130,6 @@ SOURCES = $(libhdf5_fortran_la_SOURCES) $(H5fortran_detect_SOURCES) \
DIST_SOURCES = $(am__libhdf5_fortran_la_SOURCES_DIST) \
$(H5fortran_detect_SOURCES) H5match_types.c \
$(am__H5test_kind_SOURCES_DIST)
settingsDATA_INSTALL = $(INSTALL_DATA)
DATA = $(settings_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -422,9 +418,9 @@ libhdf5_fortran_la_SOURCES = H5f90global.f90 \
$(PARALLEL_COND_SRC)
# h5fc and libhdf5_fortran.settings are generated during configure.
# Remove them only when distclean.
DISTCLEANFILES = h5fc libhdf5_fortran.settings
# h5fc is generated during configure.
# Remove it only when distclean.
DISTCLEANFILES = h5fc
# H5fortran_types.f90 and H5f90i.h are automatically generaed by
# H5match_types, and must be cleaned explicitly. H5fort_type_defines.h
@ -432,10 +428,6 @@ DISTCLEANFILES = h5fc libhdf5_fortran.settings
MOSTLYCLEANFILES = H5fortran_types.f90 H5f90i_gen.h H5fort_type_defines.h \
H5fortran_detect.f90
# Install libhdf5_fortran.settings in lib directory
settingsdir = $(libdir)
settings_DATA = libhdf5_fortran.settings
@BUILD_PARALLEL_CONDITIONAL_FALSE@H5FC_NAME = h5fc
# Custom rule for installing h5fc, since it will be named h5pfc if hdf5
@ -510,8 +502,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
h5fc: $(top_builddir)/config.status $(srcdir)/h5fc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
libhdf5_fortran.settings: $(top_builddir)/config.status $(srcdir)/libhdf5_fortran.settings.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@ -629,23 +619,6 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
install-settingsDATA: $(settings_DATA)
@$(NORMAL_INSTALL)
test -z "$(settingsdir)" || $(MKDIR_P) "$(DESTDIR)$(settingsdir)"
@list='$(settings_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(settingsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(settingsdir)/$$f'"; \
$(settingsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(settingsdir)/$$f"; \
done
uninstall-settingsDATA:
@$(NORMAL_UNINSTALL)
@list='$(settings_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(settingsdir)/$$f'"; \
rm -f "$(DESTDIR)$(settingsdir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -724,9 +697,9 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) all-local
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) all-local
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(settingsdir)"; do \
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@ -778,7 +751,7 @@ info: info-am
info-am:
install-data-am: install-data-local install-settingsDATA
install-data-am: install-data-local
install-dvi: install-dvi-am
@ -815,8 +788,7 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-libLTLIBRARIES uninstall-local \
uninstall-settingsDATA
uninstall-am: uninstall-libLTLIBRARIES uninstall-local
.MAKE: install-am install-strip
@ -830,13 +802,12 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local \
install-exec-am install-exec-local install-html \
install-html-am install-info install-info-am \
install-libLTLIBRARIES install-man install-pdf install-pdf-am \
install-ps install-ps-am install-settingsDATA install-strip \
installcheck installcheck-am installdirs maintainer-clean \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic maintainer-clean-local mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-libLTLIBRARIES uninstall-local \
uninstall-settingsDATA
uninstall-am uninstall-libLTLIBRARIES uninstall-local
# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.

18
fortran/src/libhdf5_fortran.settings.in
View File

@ -1,18 +0,0 @@
SUMMARY OF THE HDF5 CONFIGURATION
=================================
HDF5 Version: @H5_VERSION@
Configured on: @CONFIG_DATE@
Configured by: @CONFIG_USER@
Configure mode: @CONFIG_MODE@
Host system: @host_cpu@-@host_vendor@-@host_os@
Byte sex: @BYTESEX@
Parallel support: @PARALLEL@
Installation point: @prefix@
C Compiler: @CC_VERSION@
C Flags: @CFLAGS@ @CPPFLAGS@
Extra C libraries: @LDFLAGS@ @LIBS@
Fortran Compiler: @FC_VERSION@
Fortran Flags: @FFLAGS@
Archiver: @AR@
Ranlib: @RANLIB@