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, 13 insertions, 4 deletions

diff --git a/src/liblzma/Makefile.am b/src/liblzma/Makefile.am
index 78a072f4..a234bfd5 100644
--- a/src/liblzma/Makefile.am
+++ b/src/liblzma/Makefile.am
@@ -22,11 +22,15 @@ liblzma_la_LIBADD = \
 	common/libcommon.la \
 	check/libcheck.la
 
+if COND_FILTER_LZ
+SUBDIRS += lz
+liblzma_la_LIBADD += lz/liblz.la
+endif
+
 if COND_FILTER_LZMA
-SUBDIRS += lz lzma rangecoder
+SUBDIRS += lzma rangecoder
 liblzma_la_LIBADD += \
-	lz/liblz.la \
-	lzma/liblzma4.la \
+	lzma/liblzma2.la \
 	rangecoder/librangecoder.la
 endif
 
@@ -35,7 +39,12 @@ SUBDIRS += subblock
 liblzma_la_LIBADD += subblock/libsubblock.la
 endif
 
-if COND_MAIN_SIMPLE
+if COND_FILTER_DELTA
+SUBDIRS += delta
+liblzma_la_LIBADD += delta/libdelta.la
+endif
+
+if COND_FILTER_SIMPLE
 SUBDIRS += simple
 liblzma_la_LIBADD += simple/libsimple.la
 endif