Sort of garbage collection commit. :-| Many things are still

broken. API has changed a lot and it will still change a
little more here and there. The command line tool doesn't
have all the required changes to reflect the API changes, so
it's easy to get "internal error" or trigger assertions.

1 files changed, 23 insertions, 14 deletions

diff --git a/src/liblzma/lzma/Makefile.am b/src/liblzma/lzma/Makefile.am
index 59ded214..7aeceb63 100644
--- a/src/liblzma/lzma/Makefile.am
+++ b/src/liblzma/lzma/Makefile.am
@@ -14,37 +14,46 @@
 
 EXTRA_DIST = fastpos_tablegen.c
 
-noinst_LTLIBRARIES = liblzma4.la
-liblzma4_la_CPPFLAGS = \
+## 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
 
-liblzma4_la_SOURCES = \
-	lzma_common.h \
-	lzma_literal.c \
-	lzma_literal.h
+liblzma2_la_SOURCES = lzma_common.h
 
-if COND_MAIN_ENCODER
-liblzma4_la_SOURCES += \
+if COND_ENCODER_LZMA
+liblzma2_la_SOURCES += \
 	fastpos.h \
 	lzma_encoder.h \
 	lzma_encoder.c \
 	lzma_encoder_presets.c \
 	lzma_encoder_private.h \
-	lzma_encoder_init.c \
 	lzma_encoder_features.c \
-	lzma_encoder_getoptimum.c \
-	lzma_encoder_getoptimumfast.c
+	lzma_encoder_optimum_fast.c \
+	lzma_encoder_optimum_normal.c
 
 if !COND_SMALL
-liblzma4_la_SOURCES += fastpos_table.c
+liblzma2_la_SOURCES += fastpos_table.c
 endif
 endif
 
-if COND_MAIN_DECODER
-liblzma4_la_SOURCES += \
+if COND_DECODER_LZMA
+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