diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-02-28 23:23:46 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-02-28 23:23:46 (GMT) |
| commit | 11fabfd693a5970ab30ca4460f8ec5aef3227beb (patch) | |
| tree | 0dcdffaf55e06069bc0b8676c44607edd54ab582 /c++ | |
| parent | 5b4232e9d164434e422bdd72199f39507af984d8 (diff) | |
| download | hdf5-11fabfd693a5970ab30ca4460f8ec5aef3227beb.zip hdf5-11fabfd693a5970ab30ca4460f8ec5aef3227beb.tar.gz hdf5-11fabfd693a5970ab30ca4460f8ec5aef3227beb.tar.bz2 | |
[svn-r10108] Purpose:
Bug fix
Description:
C++ tests would die with strange linking-type errors.
Solution:
C++ build needs to be static, too. Applied -static flags liberally in
c++/src and c++/test directories.
Platforms tested:
sleipnir, heping
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/Makefile.am | 8 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 9 | ||||
| -rw-r--r-- | c++/test/Makefile.am | 3 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 3 |
4 files changed, 15 insertions, 8 deletions
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am index daab94e..08cd88d 100644 --- a/c++/src/Makefile.am +++ b/c++/src/Makefile.am @@ -22,13 +22,13 @@ include $(top_srcdir)/config/commence.am # Include src directory INCLUDES=-I$(top_srcdir)/src -# This is our main target -lib_LTLIBRARIES=libhdf5_cpp.la - # Build the library statically because some compliers can only link one # dynamic library, and that's the main hdf5 library (which is much larger # than this one). -libhdf5_cpp_la_LDFLAGS=-static +AM_LDFLAGS=-static + +# This is our main target +lib_LTLIBRARIES=libhdf5_cpp.la bin_SCRIPTS=h5c++ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 7a1b894..ea138dc 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -196,13 +196,13 @@ F9XMODFLAG = @F9XMODFLAG@ # Include src directory INCLUDES = -I$(top_srcdir)/src -# This is our main target -lib_LTLIBRARIES = libhdf5_cpp.la - # Build the library statically because some compliers can only link one # dynamic library, and that's the main hdf5 library (which is much larger # than this one). -libhdf5_cpp_la_LDFLAGS = -static +AM_LDFLAGS = -static + +# This is our main target +lib_LTLIBRARIES = libhdf5_cpp.la bin_SCRIPTS = h5c++ @@ -247,6 +247,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = h5c++ LTLIBRARIES = $(lib_LTLIBRARIES) +libhdf5_cpp_la_LDFLAGS = libhdf5_cpp_la_LIBADD = am_libhdf5_cpp_la_OBJECTS = H5Exception.lo H5IdComponent.lo H5Library.lo \ H5Attribute.lo H5Object.lo H5PropList.lo H5FaccProp.lo \ diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am index 34c1945..62dfb37 100644 --- a/c++/test/Makefile.am +++ b/c++/test/Makefile.am @@ -22,6 +22,9 @@ include $(top_srcdir)/config/commence.am # Include src, test, and c++/src directories INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src +# C++ libraries and tests are built statically +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=dsets testhdf5 diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 2df0e49..6d88e49 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -196,6 +196,9 @@ F9XMODFLAG = @F9XMODFLAG@ # Include src, test, and c++/src directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src +# C++ libraries and tests are built statically +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 = dsets testhdf5 |