diff options
| author | Max Kellermann <max@duempel.org> | 2014-09-26 11:06:11 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-09-26 11:06:11 +0200 |
| commit | 8547611479f8169497d257da5e40dcd885398865 (patch) | |
| tree | 3a2cd4e5559ced80479c4e7024493bf12705f4fb /Makefile.am | |
| parent | 45310d0cf6731bad36956510e5c54faab691a877 (diff) | |
| parent | fe45f282044c3500894f65b94a514ebe799da6a1 (diff) | |
| download | mpd-8547611479f8169497d257da5e40dcd885398865.tar.gz mpd-8547611479f8169497d257da5e40dcd885398865.tar.xz mpd-8547611479f8169497d257da5e40dcd885398865.zip | |
Merge tag 'v0.18.16'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 3c2f4214c..f07cca401 100644 --- a/Makefile.am +++ b/Makefile.am @@ -796,12 +796,6 @@ endif libdecoder_a_SOURCES = \ src/decoder/plugins/PcmDecoderPlugin.cxx \ src/decoder/plugins/PcmDecoderPlugin.hxx \ - src/decoder/plugins/DsdiffDecoderPlugin.cxx \ - src/decoder/plugins/DsdiffDecoderPlugin.hxx \ - src/decoder/plugins/DsfDecoderPlugin.cxx \ - src/decoder/plugins/DsfDecoderPlugin.hxx \ - src/decoder/plugins/DsdLib.cxx \ - src/decoder/plugins/DsdLib.hxx \ src/decoder/DecoderBuffer.cxx src/decoder/DecoderBuffer.hxx \ src/decoder/DecoderPlugin.cxx \ src/decoder/DecoderList.cxx src/decoder/DecoderList.hxx @@ -845,6 +839,16 @@ DECODER_LIBS = \ $(ADPLUG_LIBS) \ $(FAAD_LIBS) +if ENABLE_DSD +libdecoder_a_SOURCES += \ + src/decoder/plugins/DsdiffDecoderPlugin.cxx \ + src/decoder/plugins/DsdiffDecoderPlugin.hxx \ + src/decoder/plugins/DsfDecoderPlugin.cxx \ + src/decoder/plugins/DsfDecoderPlugin.hxx \ + src/decoder/plugins/DsdLib.cxx \ + src/decoder/plugins/DsdLib.hxx +endif + if HAVE_MAD libdecoder_a_SOURCES += \ src/decoder/plugins/MadDecoderPlugin.cxx \ @@ -2061,6 +2065,8 @@ test_test_queue_priority_LDADD = \ libutil.a \ $(CPPUNIT_LIBS) +if ENABLE_DSD + noinst_PROGRAMS += src/pcm/dsd2pcm/dsd2pcm src_pcm_dsd2pcm_dsd2pcm_SOURCES = \ @@ -2073,6 +2079,8 @@ src_pcm_dsd2pcm_dsd2pcm_LDADD = libutil.a endif +endif + # # Documentation |