diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-04-01 20:27:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-04-01 20:27:26 (GMT) |
| commit | 025d90f57313002ddb6ac24dcb034baed1f39012 (patch) | |
| tree | 1982f5277a24a11d0ddc6bf0e814dfc3c792eef3 /c++/test | |
| parent | 4f87ef5e0ea8238a4836e31db0695c149646f7c5 (diff) | |
| download | hdf5-025d90f57313002ddb6ac24dcb034baed1f39012.zip hdf5-025d90f57313002ddb6ac24dcb034baed1f39012.tar.gz hdf5-025d90f57313002ddb6ac24dcb034baed1f39012.tar.bz2 | |
[svn-r26697] HDFFV-9131: Remove obsolete/unneeded sections.
Diffstat (limited to 'c++/test')
| -rw-r--r-- | c++/test/Makefile.am | 6 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am index 2717e9c..705ec72 100644 --- a/c++/test/Makefile.am +++ b/c++/test/Makefile.am @@ -23,12 +23,6 @@ include $(top_srcdir)/config/commence.am # Include src, test, and c++/src directories AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src -# Shared C++ libraries aren't universally supported. -if CXX_SHARED_CONDITIONAL -else - AM_LDFLAGS+=-static -endif - # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. TEST_PROG=testhdf5 diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index d359186..2ffe608 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -99,9 +99,6 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \ $(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \ $(srcdir)/H5srcdir_str.h.in $(top_srcdir)/bin/depcomp \ $(top_srcdir)/bin/test-driver - -# Shared C++ libraries aren't universally supported. -@CXX_SHARED_CONDITIONAL_FALSE@am__append_1 = -static check_PROGRAMS = $(am__EXEEXT_1) TESTS = $(am__EXEEXT_1) subdir = c++/test @@ -407,10 +404,9 @@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \ 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__append_1) +AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -465,7 +461,6 @@ 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@ |