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 /Makefile.in | |
| 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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index 860f4e6..516528a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,8 +129,6 @@ BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@ BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@ BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ -BUILD_SHARED_ONLY_CONDITIONAL_FALSE = @BUILD_SHARED_ONLY_CONDITIONAL_FALSE@ -BUILD_SHARED_ONLY_CONDITIONAL_TRUE = @BUILD_SHARED_ONLY_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -297,9 +295,6 @@ RM = rm -f CP = cp TIME = time -# Path for hl needed in hdf5.h -INCLUDES = -I$(top_srcdir)/hl/src - # Some machines need a command to run executables; this is that command # so that our tests will run. # We use RUNTESTS instead of RUNSERIAL directly because it may be that @@ -320,20 +315,15 @@ LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la docdir = $(exec_prefix)/doc -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5CC = $(bindir)/h5cc # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5CC = $(bindir)/h5cc -shlib -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5CC_PP = $(bindir)/h5pcc -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5CC_PP = $(bindir)/h5pcc -shlib -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5FC = $(bindir)/h5fc -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5FC = $(bindir)/h5fc -shlib -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5FC_PP = $(bindir)/h5pfc -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5FC_PP = $(bindir)/h5pfc -shlib -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5CPP = $(bindir)/h5c++ -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5CPP = $(bindir)/h5c++ -shlib +H5CC = $(bindir)/h5cc $(H5CCFLAGS) +H5CC_PP = $(bindir)/h5pcc $(H5CCFLAGS) +H5FC = $(bindir)/h5fc $(H5CCFLAGS) +H5FC_PP = $(bindir)/h5pfc $(H5CCFLAGS) +H5CPP = $(bindir)/h5c++ $(H5CCFLAGS) # The trace script; this is used on source files from the C library to # insert tracing macros. |