diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-26 20:19:17 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-26 20:19:17 +0100 |
| commit | 737a56a0302b1030e1071c7be9add7bdca955e32 (patch) | |
| tree | 93d9b6d625fa1b0ce9e8bf8d13fbc829be5178d1 /Makefile.am | |
| parent | 12b6959ea201fea925c4376f961b8d54738292e2 (diff) | |
| parent | 67cba251c8826409c82fb2ab75072dc4fca2b4dc (diff) | |
| download | mpd-737a56a0302b1030e1071c7be9add7bdca955e32.tar.gz mpd-737a56a0302b1030e1071c7be9add7bdca955e32.tar.xz mpd-737a56a0302b1030e1071c7be9add7bdca955e32.zip | |
Merge tag 'v0.19.5'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 52c314928..f4138116a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -833,7 +833,6 @@ libdecoder_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(WAVPACK_CFLAGS) \ $(MAD_CFLAGS) \ $(MPG123_CFLAGS) \ - $(MP4V2_CFLAGS) \ $(OPUS_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(MPCDEC_CFLAGS) \ @@ -853,7 +852,6 @@ DECODER_LIBS = \ $(WAVPACK_LIBS) \ $(MAD_LIBS) \ $(MPG123_LIBS) \ - $(MP4V2_LIBS) \ $(OPUS_LIBS) \ $(FFMPEG_LIBS2) \ $(MPCDEC_LIBS) \ @@ -968,12 +966,6 @@ noinst_LIBRARIES += libmodplug_decoder_plugin.a DECODER_LIBS += libmodplug_decoder_plugin.a $(MODPLUG_LIBS) endif -if HAVE_MP4V2 -libdecoder_a_SOURCES += \ - src/decoder/plugins/Mp4v2DecoderPlugin.cxx \ - src/decoder/plugins/Mp4v2DecoderPlugin.hxx -endif - if ENABLE_SIDPLAY libdecoder_a_SOURCES += \ src/decoder/plugins/SidplayDecoderPlugin.cxx \ @@ -2193,4 +2185,11 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ $(wildcard scripts/*.sh) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ systemd/mpd.socket \ + android/AndroidManifest.xml \ + android/build.py \ + android/custom_rules.xml \ + android/res/values/strings.xml \ + android/src/Bridge.java \ + android/src/Loader.java \ + android/src/Main.java \ src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico |