aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-12-30 23:24:11 +0100
committerMax Kellermann <max@duempel.org>2009-12-30 23:24:11 +0100
commitefc885a9dc2e6632ca2a24a0ff52ab51bb1d82d1 (patch)
tree5ef9fd5214b0b9ffdea14906e45c9cfcb1380837 /Makefile.am
parent333e11d0ebb255a2cd04cfde805e68f257b8a2f5 (diff)
parent4419e5b90dc229c8839de142e22aeba8336fbbd4 (diff)
downloadmpd-efc885a9dc2e6632ca2a24a0ff52ab51bb1d82d1.tar.gz
mpd-efc885a9dc2e6632ca2a24a0ff52ab51bb1d82d1.tar.xz
mpd-efc885a9dc2e6632ca2a24a0ff52ab51bb1d82d1.zip
Merge vorbis+icy fixes from branch 'v0.15.x'
Conflicts: Makefile.am NEWS configure.ac src/input/curl_input_plugin.c src/input_stream.c
Diffstat (limited to '')
-rw-r--r--Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 12c933e9a..b703529a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,6 +99,7 @@ mpd_headers = \
src/input_stream.h \
src/input/file_input_plugin.h \
src/input/curl_input_plugin.h \
+ src/input/rewind_input_plugin.h \
src/input/mms_input_plugin.h \
src/text_file.h \
src/text_input_stream.h \
@@ -584,7 +585,9 @@ INPUT_SRC = \
src/input/file_input_plugin.c
if ENABLE_CURL
-INPUT_SRC += src/input/curl_input_plugin.c src/icy_metadata.c
+INPUT_SRC += src/input/curl_input_plugin.c \
+ src/input/rewind_input_plugin.c \
+ src/icy_metadata.c
endif
if ENABLE_MMS