diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2015-11-03 18:06:40 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2016-06-28 21:09:46 +0300 |
| commit | 97a3109281e475d9cf1b5095237d672fa0ad25e5 (patch) | |
| tree | dd58babbb6f250c04b1f2caa856d796541a054cd | |
| parent | Build: Fix configure to handle LZMA1 dependency with LZMA2. (diff) | |
| download | xz-97a3109281e475d9cf1b5095237d672fa0ad25e5.tar.xz | |
Build: Build LZMA1/2 presets also when only decoder is wanted.
People shouldn't rely on the presets when decoding raw streams,
but xz uses the presets as the starting point for raw decoder
options anyway.
lzma_encocder_presets.c was renamed to lzma_presets.c to
make it clear it's not used solely by the encoder code.
| -rw-r--r-- | src/liblzma/lzma/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/liblzma/lzma/lzma_presets.c (renamed from src/liblzma/lzma/lzma_encoder_presets.c) | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/liblzma/lzma/Makefile.inc b/src/liblzma/lzma/Makefile.inc index 7fc4d172..0c8cd380 100644 --- a/src/liblzma/lzma/Makefile.inc +++ b/src/liblzma/lzma/Makefile.inc @@ -9,12 +9,16 @@ EXTRA_DIST += lzma/fastpos_tablegen.c liblzma_la_SOURCES += lzma/lzma_common.h +if COND_FILTER_LZMA1 +liblzma_la_SOURCES += \ + lzma/lzma_presets.c +endif + if COND_ENCODER_LZMA1 liblzma_la_SOURCES += \ lzma/fastpos.h \ lzma/lzma_encoder.h \ lzma/lzma_encoder.c \ - lzma/lzma_encoder_presets.c \ lzma/lzma_encoder_private.h \ lzma/lzma_encoder_optimum_fast.c \ lzma/lzma_encoder_optimum_normal.c diff --git a/src/liblzma/lzma/lzma_encoder_presets.c b/src/liblzma/lzma/lzma_presets.c index 8484b774..d49d2427 100644 --- a/src/liblzma/lzma/lzma_encoder_presets.c +++ b/src/liblzma/lzma/lzma_presets.c @@ -1,7 +1,8 @@ /////////////////////////////////////////////////////////////////////////////// // -/// \file lzma_encoder_presets.c +/// \file lzma_presets.c /// \brief Encoder presets +/// \note xz needs this even when only decoding is enabled. // // Author: Lasse Collin // |