mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-12-27 08:01:04 +08:00
6a00b1b6ff
Fix BZ #1583 Description: The --enable-static-exec flag was broken. Configure was adding the -all-static linker flag to an environment variable which was subsequently never used. (looks like it was used in 1.6 Makefile.ins, but never moved to 1.8's Makefile.ams when we added automake support). To fix, I've added this environment varibale to the link lines of all the tools. Now, when --enable-static-exec is invoked, it will correctly generate statically linked executables in the installed bin directory. Tested: I've tested manually to ensure that the generated execs are static when the flag is used and dynamic when not. I've also tested when szip is used, as this was a use case mentioned in the bug report. Also: ran full tests with make check on jam and smirom for good measure.
62 lines
2.0 KiB
Makefile
62 lines
2.0 KiB
Makefile
#
|
|
# Copyright by The HDF Group.
|
|
# Copyright by the Board of Trustees of the University of Illinois.
|
|
# All rights reserved.
|
|
#
|
|
# This file is part of HDF5. The full HDF5 copyright notice, including
|
|
# terms governing use, modification, and redistribution, is contained in
|
|
# the files COPYING and Copyright.html. COPYING can be found at the root
|
|
# of the source code distribution tree; Copyright.html can be found at the
|
|
# root level of an installed copy of the electronic HDF5 document set and
|
|
# is linked from the top-level documents page. It can also be found at
|
|
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
|
|
# access to either file, you may request a copy from help@hdfgroup.org.
|
|
##
|
|
## Makefile.am
|
|
## Run automake to generate a Makefile.in from this file.
|
|
#
|
|
# HDF5 Library Makefile(.in)
|
|
#
|
|
|
|
include $(top_srcdir)/config/commence.am
|
|
|
|
# Include src and tools/lib directories
|
|
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
|
|
|
|
# Always build and test h5diff but build and test ph5diff only if parallel
|
|
# is enabled.
|
|
if BUILD_PARALLEL_CONDITIONAL
|
|
H5PDIFF=ph5diff
|
|
TEST_SCRIPT_PARA=$(srcdir)/testph5diff.sh
|
|
endif
|
|
|
|
# Our main target, h5diff
|
|
bin_PROGRAMS=h5diff $(H5PDIFF)
|
|
|
|
# Add h5diff specific linker flags here
|
|
h5diff_LDFLAGS = $(LT_STATIC_EXEC)
|
|
|
|
# Test programs and scripts
|
|
TEST_PROG=h5diffgentest
|
|
TEST_SCRIPT=$(srcdir)/testh5diff.sh
|
|
|
|
check_PROGRAMS=$(TEST_PROG)
|
|
check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
|
|
# The parallel test script testph5diff.sh actually depends on testh5diff.sh.
|
|
SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) $(srcdir)/testh5diff.sh
|
|
|
|
# Source files for the program
|
|
h5diff_SOURCES=h5diff_main.c h5diff_common.c
|
|
ph5diff_SOURCES=ph5diff_main.c h5diff_common.c
|
|
h5diffgentest_SOURCES=h5diffgentest.c
|
|
|
|
# Programs depend on the main HDF5 library and tools library
|
|
LDADD=$(LIBH5TOOLS) $(LIBHDF5)
|
|
|
|
# Temporary files. *.h5 are generated by h5diff. They should
|
|
# be copied to the testfiles/ directory if update is required
|
|
CHECK_CLEANFILES+=*.h5 expect_sorted actual_sorted
|
|
|
|
include $(top_srcdir)/config/conclude.am
|
|
|