diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-15 20:38:57 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-15 20:38:57 (GMT) |
| commit | 9af344117c2d41886da1f54d3f5cff4091c4a943 (patch) | |
| tree | 9dcb6bf61c2fbc5634b69f554690bb740b8decbd /c++/src | |
| parent | b2f94f9faf805035e4d0e9cb76007204c8250e58 (diff) | |
| parent | 14e3550348d08d932e0f61a4ae6b8a7afe19a484 (diff) | |
| download | hdf5-9af344117c2d41886da1f54d3f5cff4091c4a943.zip hdf5-9af344117c2d41886da1f54d3f5cff4091c4a943.tar.gz hdf5-9af344117c2d41886da1f54d3f5cff4091c4a943.tar.bz2 | |
[svn-r27794] Reintegration merge of features/autotools_rework branch with trunk
NOTES:
- Developers will have to run autogen.sh before building with the autotools.
- autogen.sh takes the -p option to mimic the old bin/reconfigure behavior.
- The generated error, overflow and version headers have been left in place.
- The generated H5LT parser code has also been left in place.
- There are no changes for CMake users at this time.
Tested on: h5committest
Diffstat (limited to 'c++/src')
| -rw-r--r-- | c++/src/Makefile.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 98e31e8..1220ddd 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -100,9 +100,9 @@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/config/commence.am \ $(top_srcdir)/config/lt_vers.am \ $(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \ - $(srcdir)/h5c++.in $(top_srcdir)/bin/depcomp \ - $(include_HEADERS) $(top_srcdir)/bin/test-driver + $(srcdir)/Makefile.am $(srcdir)/h5c++.in \ + $(top_srcdir)/bin/depcomp $(include_HEADERS) \ + $(top_srcdir)/bin/test-driver TESTS = subdir = c++/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -110,7 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ $(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/H5config.h \ $(top_builddir)/fortran/src/H5config_f.inc CONFIG_CLEAN_FILES = h5c++ @@ -415,7 +415,6 @@ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ -AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ |