diff options
| author | Max Kellermann <max@duempel.org> | 2008-12-27 13:34:51 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-12-27 13:34:51 +0100 |
| commit | 9220e0edfff2428fbbcec60460c5841cbd40eadd (patch) | |
| tree | cc997a53da08b83db7add4a0813d8b2ab80cf8ad /src/Makefile.am | |
| parent | 0e7c67067b11e2db06bfc6a05798559a7e44a25f (diff) | |
| parent | 4674d0442a4edc8647c060fbff2dd5e7ae9e3f84 (diff) | |
| download | mpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.tar.gz mpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.tar.xz mpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.zip | |
Merge branch 'experimental' of git://git.musicpd.org/metyl/mpd
Conflicts:
configure.ac
src/ls.h
src/output/shout_plugin.c
Diffstat (limited to '')
| -rw-r--r-- | src/Makefile.am | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ad4ad99f3..38ba8b223 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,7 +81,10 @@ mpd_headers = \ zeroconf.h \ locate.h \ stored_playlist.h \ - timer.h + timer.h \ + archive_api.h \ + archive_list.h \ + input_archive.h mpd_SOURCES = \ @@ -155,7 +158,10 @@ mpd_SOURCES = \ volume.c \ locate.c \ stored_playlist.c \ - timer.c + timer.c \ + archive_api.c \ + archive_list.c \ + input_archive.c if HAVE_LIBSAMPLERATE mpd_SOURCES += pcm_resample_libsamplerate.c @@ -167,6 +173,19 @@ if HAVE_ID3TAG mpd_SOURCES += tag_id3.c endif +# archive plugins + +if HAVE_BZ2 +mpd_SOURCES += archive/bz2_plugin.c +endif + +if HAVE_ZIP +mpd_SOURCES += archive/zip_plugin.c +endif + +if HAVE_ISO +mpd_SOURCES += archive/iso_plugin.c +endif # decoder plugins |