summaryrefslogtreecommitdiffstats
path: root/fortran/src
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2008-05-15 05:12:00 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2008-05-15 05:12:00 (GMT)
commit7b7f10a4448122cc7d2996f748f47df7436f9605 (patch)
tree352d4bbf9b5036b9ac1833908ffd07dba3e1a456 /fortran/src
parentc57a9ec023e85e9ee4a712fbb6ffcbdeb801019d (diff)
downloadhdf5-7b7f10a4448122cc7d2996f748f47df7436f9605.zip
hdf5-7b7f10a4448122cc7d2996f748f47df7436f9605.tar.gz
hdf5-7b7f10a4448122cc7d2996f748f47df7436f9605.tar.bz2
[svn-r15003] Purpose:
Improvement. Description: src/libhdf5.settings was the initial configure summary and is installed. Then configure is changed to dump a summary of the configure settings to the output and also append it to src/libhdf5.settings. That created two different output formats and duplicated information. This is the initial attempt to clean up this confusion and unify the output format. It is decided to use the src/libhdf5.settings template as the unified means. This requires more macros symbols be defined. The following symbols are all related to generating the src/libhdf5.settings file. AC_SUBST(EXTERNAL_FILTERS) AC_SUBST(MPE) MPE=no AC_SUBST(STATIC_EXEC) STATIC_EXEC=no AC_SUBST(HDF_FORTRAN) HDF_FORTRAN=no AC_SUBST(FC) HDF_FORTRAN=no AC_SUBST(HDF_CXX) HDF_CXX=no AC_SUBST(CXX) HDF_CXX=no AC_SUBST(HDF5_HL) HDF5_HL=yes AC_SUBST(GPFS) GPFS=no AC_SUBST(LINUX_LFS) LINUX_LFS=no AC_SUBST(INSTRUMENT) INSTRUMENT=no AC_SUBST(CODESTACK) CODESTACK=no AC_SUBST(HAVE_DMALLOC) HAVE_DMALLOC=no AC_SUBST(DIRECT_VFD) DIRECT_VFD=no AC_SUBST(THREADSAFE) THREADSAFE=no AC_SUBST(STATIC_SHARED) AC_SUBST(enable_shared) AC_SUBST(enable_static) AC_SUBST(UNAME_INFO) UNAME_INFO=`uname -a` The src/libhdf5.settings.in has CONDITIONAL's added to it too. The untrue conditions turned into a "#" and these lines are cleaned by the post processing script. Platform tested: h5committest on kagiso, smirom and linew.
Diffstat (limited to 'fortran/src')
-rw-r--r--fortran/src/Makefile.in20
1 files changed, 17 insertions, 3 deletions
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 523e703..a08bec2 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -153,6 +153,7 @@ CC_VERSION = @CC_VERSION@
# but which shouldn't be exported to h5cc for building other programs.
CFLAGS = @CFLAGS@ @H5_CFLAGS@
CLEARFILEBUF = @CLEARFILEBUF@
+CODESTACK = @CODESTACK@
CONFIG_DATE = @CONFIG_DATE@
CONFIG_MODE = @CONFIG_MODE@
CONFIG_USER = @CONFIG_USER@
@@ -168,6 +169,7 @@ DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
+DIRECT_VFD = @DIRECT_VFD@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DYNAMIC_DIRS = @DYNAMIC_DIRS@
@@ -176,6 +178,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
# Make sure that these variables are exported to the Makefiles
F9XMODEXT = @F9XMODEXT@
@@ -188,6 +191,7 @@ FCLIBS = @FCLIBS@
FGREP = @FGREP@
FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
+GPFS = @GPFS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
@@ -196,7 +200,13 @@ H5_FCFLAGS = @H5_FCFLAGS@
H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
+HAVE_DMALLOC = @HAVE_DMALLOC@
+HDF5_HL = @HDF5_HL@
HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF_CXX = @HDF_CXX@
+
+# Mark this directory as part of the Fortran API
+HDF_FORTRAN = yes
HID_T = @HID_T@
HL = @HL@
HL_FOR = @HL_FOR@
@@ -208,12 +218,14 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTRUMENT = @INSTRUMENT@
INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LINUX_LFS = @LINUX_LFS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_STATIC_EXEC = @LT_STATIC_EXEC@
@@ -253,13 +265,16 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
+STATIC_EXEC = @STATIC_EXEC@
STATIC_SHARED = @STATIC_SHARED@
STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
+THREADSAFE = @THREADSAFE@
TIME = @TIME@
TR = @TR@
TRACE_API = @TRACE_API@
+UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
USE_FILTER_NBIT = @USE_FILTER_NBIT@
@@ -292,6 +307,8 @@ datadir = @datadir@
datarootdir = @datarootdir@
docdir = $(exec_prefix)/doc
dvidir = @dvidir@
+enable_shared = @enable_shared@
+enable_static = @enable_static@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -427,9 +444,6 @@ H5fortran_detect_SOURCES = H5fortran_detect.f90
# how to compile a fortran program given its sources.
H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90
-# Mark this directory as part of the Fortran API
-HDF_FORTRAN = yes
-
# 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.,
# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and