2 files changed, 47 insertions, 51 deletions
diff --git a/src/liblzma/simple/Makefile.am b/src/liblzma/simple/Makefile.am
deleted file mode 100644
index 9b1a719e..00000000
--- a/src/liblzma/simple/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.
-##
-
-noinst_LTLIBRARIES = libsimple.la
-libsimple_la_CPPFLAGS = \
-	-I$(top_srcdir)/src/liblzma/api \
-	-I$(top_srcdir)/src/liblzma/common
-libsimple_la_SOURCES = \
-	simple_coder.c \
-	simple_coder.h \
-	simple_private.h
-
-if COND_ENCODER_SIMPLE
-libsimple_la_SOURCES += \
-	simple_encoder.c \
-	simple_encoder.h
-endif
-
-if COND_DECODER_SIMPLE
-libsimple_la_SOURCES += \
-	simple_decoder.c \
-	simple_decoder.h
-endif
-
-if COND_FILTER_X86
-libsimple_la_SOURCES += x86.c
-endif
-
-if COND_FILTER_POWERPC
-libsimple_la_SOURCES += powerpc.c
-endif
-
-if COND_FILTER_IA64
-libsimple_la_SOURCES += ia64.c
-endif
-
-if COND_FILTER_ARM
-libsimple_la_SOURCES += arm.c
-endif
-
-if COND_FILTER_ARMTHUMB
-libsimple_la_SOURCES += armthumb.c
-endif
-
-if COND_FILTER_SPARC
-libsimple_la_SOURCES += sparc.c
-endif
diff --git a/src/liblzma/simple/Makefile.inc b/src/liblzma/simple/Makefile.inc
new file mode 100644
index 00000000..8a5e2d7f
--- /dev/null
+++ b/src/liblzma/simple/Makefile.inc
@@ -0,0 +1,47 @@
+##
+## Author: Lasse Collin
+##
+## This file has been put into the public domain.
+## You can do whatever you want with this file.
+##
+
+liblzma_la_SOURCES += \
+	simple/simple_coder.c \
+	simple/simple_coder.h \
+	simple/simple_private.h
+
+if COND_ENCODER_SIMPLE
+liblzma_la_SOURCES += \
+	simple/simple_encoder.c \
+	simple/simple_encoder.h
+endif
+
+if COND_DECODER_SIMPLE
+liblzma_la_SOURCES += \
+	simple/simple_decoder.c \
+	simple/simple_decoder.h
+endif
+
+if COND_FILTER_X86
+liblzma_la_SOURCES += simple/x86.c
+endif
+
+if COND_FILTER_POWERPC
+liblzma_la_SOURCES += simple/powerpc.c
+endif
+
+if COND_FILTER_IA64
+liblzma_la_SOURCES += simple/ia64.c
+endif
+
+if COND_FILTER_ARM
+liblzma_la_SOURCES += simple/arm.c
+endif
+
+if COND_FILTER_ARMTHUMB
+liblzma_la_SOURCES += simple/armthumb.c
+endif
+
+if COND_FILTER_SPARC
+liblzma_la_SOURCES += simple/sparc.c
+endif