diff options
Diffstat (limited to 'hl')
| -rwxr-xr-x | hl/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/c++/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.am | 6 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 5 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.am | 6 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 5 | ||||
| -rw-r--r-- | hl/fortran/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/test/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 2 |
12 files changed, 38 insertions, 0 deletions
diff --git a/hl/Makefile.in b/hl/Makefile.in index 5f0bfc5..9282106 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -110,6 +110,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index debf475..9da9c36 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -115,6 +115,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am index fb0681b..63e95b6 100644 --- a/hl/c++/src/Makefile.am +++ b/hl/c++/src/Makefile.am @@ -25,6 +25,12 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src # This is our main target lib_LTLIBRARIES=libhdf5_hl_cpp.la +# Shared C++ libraries aren't universally supported. +if CXX_SHARED_CONDITIONAL +else + AM_LDFLAGS=-static +endif + # Source files for the library # At the moment, only the H5PT Packet Table has a C++ API. libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index ad39496..3026d44 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -137,6 +137,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ @@ -316,6 +318,9 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src # This is our main target lib_LTLIBRARIES = libhdf5_hl_cpp.la +# Shared C++ libraries aren't universally supported. +@CXX_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static + # Source files for the library # At the moment, only the H5PT Packet Table has a C++ API. libhdf5_hl_cpp_la_SOURCES = H5PacketTable.cpp diff --git a/hl/c++/test/Makefile.am b/hl/c++/test/Makefile.am index 0eee1c1..d438e41 100644 --- a/hl/c++/test/Makefile.am +++ b/hl/c++/test/Makefile.am @@ -22,6 +22,12 @@ include $(top_srcdir)/config/commence.am # Include directories INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test +# 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=ptableTest diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 6b544f9..1029002 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -131,6 +131,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ @@ -307,6 +309,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Include directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test +# Shared C++ libraries aren't universally supported. +@CXX_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static + # 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 = ptableTest diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 4c8a289..fe12efb 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -110,6 +110,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 206428c..97b516b 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -131,6 +131,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index e820541..828c15d 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -130,6 +130,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index a50e581..1e38ccb 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -128,6 +128,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 09b9779..9a3d8aa 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -140,6 +140,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 9f3aff2..d48d0ad 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -138,6 +138,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ |