diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-10-31 21:35:49 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-10-31 21:35:49 (GMT) |
| commit | 617522e467c817811d80d60ce7e97212c9df4059 (patch) | |
| tree | 15df31a9336fd427e7cba038852aa033699fe00b /c++/examples/Makefile.am | |
| parent | 6a53f457cfcbfcd3309dbb6fcbab03095302290e (diff) | |
| download | hdf5-617522e467c817811d80d60ce7e97212c9df4059.zip hdf5-617522e467c817811d80d60ce7e97212c9df4059.tar.gz hdf5-617522e467c817811d80d60ce7e97212c9df4059.tar.bz2 | |
[svn-r11646] Purpose:
Bug fix/feature
Description:
Added support for -shlib in h5fc and h5c++.
Made check-install use -shlib when only shared libraries have been installed.
Solution:
h5fc and h5c++ didn't recognize -shlib. Stole code from h5cc to link against
shared libraries.
When static libraries are disabled, the examples Makefiles will automatically
use the -shlib option to link against shared libraries. Thus,
--disable-static and make check-install should work together.
Platforms tested:
heping(disable-static, enable-static, fortran, c++), modi4 (disable-static, fortran, c++, parallel, enable-static)
Diffstat (limited to 'c++/examples/Makefile.am')
| -rw-r--r-- | c++/examples/Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am index d79faea..e82c3cd 100644 --- a/c++/examples/Makefile.am +++ b/c++/examples/Makefile.am @@ -20,9 +20,6 @@ include $(top_srcdir)/config/commence.am -# Use h5c++ to build examples, instead of reguar C++ compiler -H5CPP=$(bindir)/h5c++ - # These are the programs that 'make all' or 'make prog' will build and # which 'make check' will run. List them in the order they should be run. TEST_PROG=create readdata writedata compound extend_ds chunks h5group @@ -88,7 +85,7 @@ installcheck-local: @$(MAKE) $(AM_MAKEFLAGS) check # How to build programs using h5c++ -$(EXTRA_PROG): $(H5CPP) $(LIBHDF5) $(LIBH5CPP) +$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) $(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp # List dependencies for each program. Normally, automake would take |