diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2009-06-30 17:09:57 +0300 |
---|---|---|
committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-06-30 17:09:57 +0300 |
commit | f42ee981668b545ab6d06c6072e262c29605273c (patch) | |
tree | 3c629000a91b0b0dccf11bacdd1878cea508be73 /src/liblzma/lzma/Makefile.am | |
parent | Added a comment about "autoconf -fi" to autogen.sh. (diff) | |
download | xz-f42ee981668b545ab6d06c6072e262c29605273c.tar.xz |
Build system fixes
Don't use libtool convenience libraries to avoid recently
discovered long-standing subtle but somewhat severe bugs
in libtool (at least 1.5.22 and 2.2.6 are affected). It
was found when porting XZ Utils to Windows
<http://lists.gnu.org/archive/html/libtool/2009-06/msg00070.html>
but the problem is significant also e.g. on GNU/Linux.
Unless --disable-shared is passed to configure, static
library built from a set of convenience libraries will
contain PIC objects. That is, while libtool builds non-PIC
objects too, only PIC objects will be used from the
convenience libraries. On 32-bit x86 (tested on mobile XP2400+),
using PIC instead of non-PIC makes the decompressor 10 % slower
with the default CFLAGS.
So while xz was linked against static liblzma by default,
it got the slower PIC objects unless --disable-shared was
used. I tend develop and benchmark with --disable-shared
due to faster build time, so I hadn't noticed the problem
in benchmarks earlier.
This commit also adds support for building Windows resources
into liblzma and executables.
Diffstat (limited to 'src/liblzma/lzma/Makefile.am')
-rw-r--r-- | src/liblzma/lzma/Makefile.am | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/liblzma/lzma/Makefile.am b/src/liblzma/lzma/Makefile.am deleted file mode 100644 index 1afe0677..00000000 --- a/src/liblzma/lzma/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## -## Author: Lasse Collin -## -## This file has been put into the public domain. -## You can do whatever you want with this file. -## - -EXTRA_DIST = fastpos_tablegen.c - -## Using liblzma2 since liblzma is already used for the final library. -noinst_LTLIBRARIES = liblzma2.la -liblzma2_la_CPPFLAGS = \ - -I$(top_srcdir)/src/liblzma/api \ - -I$(top_srcdir)/src/liblzma/common \ - -I$(top_srcdir)/src/liblzma/lz \ - -I$(top_srcdir)/src/liblzma/rangecoder - -liblzma2_la_SOURCES = lzma_common.h - -if COND_ENCODER_LZMA1 -liblzma2_la_SOURCES += \ - fastpos.h \ - lzma_encoder.h \ - lzma_encoder.c \ - lzma_encoder_presets.c \ - lzma_encoder_private.h \ - lzma_encoder_optimum_fast.c \ - lzma_encoder_optimum_normal.c - -if !COND_SMALL -liblzma2_la_SOURCES += fastpos_table.c -endif -endif - -if COND_DECODER_LZMA1 -liblzma2_la_SOURCES += \ - lzma_decoder.c \ - lzma_decoder.h -endif - -if COND_ENCODER_LZMA2 -liblzma2_la_SOURCES += \ - lzma2_encoder.c \ - lzma2_encoder.h -endif - -if COND_DECODER_LZMA2 -liblzma2_la_SOURCES += \ - lzma2_decoder.c \ - lzma2_decoder.h -endif |