2 files changed, 43 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
diff --git a/src/liblzma/lzma/Makefile.inc b/src/liblzma/lzma/Makefile.inc
new file mode 100644
index 00000000..7fc4d172
--- /dev/null
+++ b/src/liblzma/lzma/Makefile.inc
@@ -0,0 +1,43 @@
+##
+## Author: Lasse Collin
+##
+## This file has been put into the public domain.
+## You can do whatever you want with this file.
+##
+
+EXTRA_DIST += lzma/fastpos_tablegen.c
+
+liblzma_la_SOURCES += lzma/lzma_common.h
+
+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
+
+if !COND_SMALL
+liblzma_la_SOURCES += lzma/fastpos_table.c
+endif
+endif
+
+if COND_DECODER_LZMA1
+liblzma_la_SOURCES += \
+	lzma/lzma_decoder.c \
+	lzma/lzma_decoder.h
+endif
+
+if COND_ENCODER_LZMA2
+liblzma_la_SOURCES += \
+	lzma/lzma2_encoder.c \
+	lzma/lzma2_encoder.h
+endif
+
+if COND_DECODER_LZMA2
+liblzma_la_SOURCES += \
+	lzma/lzma2_decoder.c \
+	lzma/lzma2_decoder.h
+endif