diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-15 20:41:32 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-15 20:41:32 (GMT) |
commit | 699098014b590a5e39df37d92e7d36139741fd0c (patch) | |
tree | 718ccce06ac3dde4c295e8d325bcc28baf8ed537 /hl/c++/examples | |
parent | e59c147f5d647e1fdec51a96fc5ebe8754c2c73f (diff) | |
download | hdf5-699098014b590a5e39df37d92e7d36139741fd0c.zip hdf5-699098014b590a5e39df37d92e7d36139741fd0c.tar.gz hdf5-699098014b590a5e39df37d92e7d36139741fd0c.tar.bz2 |
[svn-r20525] Description:
Merge revisions 20475, 20502, and 20504 from trunk to 1.8 branch.
Tested:
Tested on jam, fred, bangan (CYGWIN), and h5committested.
Diffstat (limited to 'hl/c++/examples')
-rw-r--r-- | hl/c++/examples/Makefile.in | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index d04b91c..ed3f1e7 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -68,6 +68,12 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = run-hlc++-ex.sh CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__tty_colors = \ @@ -81,13 +87,16 @@ AMTAR = @AMTAR@ # but which should not be exported to h5cc for building other programs. # AM_CFLAGS is an automake construct which should be used by Makefiles # instead of CFLAGS, as CFLAGS is reserved solely for the user to define. +# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well. AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -AM_LDFLAGS = @AM_LDFLAGS@ +AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ +AS = @AS@ # Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. @@ -147,7 +156,10 @@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ +H5_CXX_SHARED = @H5_CXX_SHARED@ H5_FCFLAGS = @H5_FCFLAGS@ +H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ +H5_LDFLAGS = @H5_LDFLAGS@ H5_LONE_COLON = @H5_LONE_COLON@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ |