diff options
| author | James Laird <jlaird@hdfgroup.org> | 2006-06-21 23:15:08 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2006-06-21 23:15:08 (GMT) |
| commit | 64b5d95251ccf3f783eff886ad4e825f0a5d9fae (patch) | |
| tree | 10d23dad8364d87865c5bbafc4647bbb75369b19 /config/commence.am | |
| parent | b4e2d8d79a6a33ec43f2e4f5acfaeff03adbfc8a (diff) | |
| download | hdf5-64b5d95251ccf3f783eff886ad4e825f0a5d9fae.zip hdf5-64b5d95251ccf3f783eff886ad4e825f0a5d9fae.tar.gz hdf5-64b5d95251ccf3f783eff886ad4e825f0a5d9fae.tar.bz2 | |
[svn-r12431] Purpose:
Configuration feature
Description:
'make install' now tests both static and shared libraries if both are installed.
Solution:
Previously, shared libraries were only tested when static libraries were not installed.
Also cleaned up line in commence.am that was including HL library in all Makefiles.
Platforms tested:
mir (Makefile change only)
Diffstat (limited to 'config/commence.am')
| -rw-r--r-- | config/commence.am | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/config/commence.am b/config/commence.am index 8e48df3..e719710 100644 --- a/config/commence.am +++ b/config/commence.am @@ -21,9 +21,6 @@ RM=rm -f CP=cp TIME=time -# Path for hl needed in hdf5.h -INCLUDES=-I$(top_srcdir)/hl/src - # Hardcode SHELL to be /bin/sh. Most machines have this shell, and # on at least one machine configure fails to detect its existence (janus). # Also, when HDF5 is configured on one machine but run on another, @@ -57,23 +54,16 @@ docdir = $(exec_prefix)/doc # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -if BUILD_SHARED_ONLY_CONDITIONAL - H5CC=$(bindir)/h5cc -shlib - H5CC_PP=$(bindir)/h5pcc -shlib - H5FC=$(bindir)/h5fc -shlib - H5FC_PP=$(bindir)/h5pfc -shlib - H5CPP=$(bindir)/h5c++ -shlib -else - H5CC=$(bindir)/h5cc - H5CC_PP=$(bindir)/h5pcc - H5FC=$(bindir)/h5fc - H5FC_PP=$(bindir)/h5pfc - H5CPP=$(bindir)/h5c++ -endif +H5CC=$(bindir)/h5cc $(H5CCFLAGS) +H5CC_PP=$(bindir)/h5pcc $(H5CCFLAGS) +H5FC=$(bindir)/h5fc $(H5CCFLAGS) +H5FC_PP=$(bindir)/h5pfc $(H5CCFLAGS) +H5CPP=$(bindir)/h5c++ $(H5CCFLAGS) # H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5, # but which shouldn't be exported to h5cc for building other programs. + CFLAGS=@CFLAGS@ @H5_CFLAGS@ CPPFLAGS=@CPPFLAGS@ @H5_CPPFLAGS@ FCFLAGS=@FCFLAGS@ @H5_FCFLAGS@ |