From a9419da09c27986708002fcb6a9032371eb1ce2b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 2 Oct 2012 10:58:53 +0200 Subject: Makefile.am: eliminate FLAC_COMMON --- Makefile.am | 13 +++++-------- configure.ac | 3 --- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 97e3959e..f917a233 100644 --- a/Makefile.am +++ b/Makefile.am @@ -611,13 +611,6 @@ libdecoder_plugins_a_SOURCES += \ src/decoder/ogg_codec.c src/decoder/ogg_codec.h endif -if HAVE_FLAC_COMMON -libdecoder_plugins_a_SOURCES += \ - src/decoder/flac_metadata.c \ - src/decoder/flac_pcm.c \ - src/decoder/flac_common.c src/decoder/flac_common.h -endif - if ENABLE_VORBIS_DECODER libdecoder_plugins_a_SOURCES += \ src/decoder/vorbis_comments.c \ @@ -626,7 +619,11 @@ libdecoder_plugins_a_SOURCES += \ endif if HAVE_FLAC -libdecoder_plugins_a_SOURCES += src/decoder/flac_decoder_plugin.c +libdecoder_plugins_a_SOURCES += \ + src/decoder/flac_metadata.c \ + src/decoder/flac_pcm.c \ + src/decoder/flac_common.c src/decoder/flac_common.h \ + src/decoder/flac_decoder_plugin.c endif if HAVE_AUDIOFILE diff --git a/configure.ac b/configure.ac index 685aba1e..3e12626c 100644 --- a/configure.ac +++ b/configure.ac @@ -1140,9 +1140,6 @@ fi AM_CONDITIONAL(HAVE_XIPH, test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_flac = xyes || test x$enable_opus = xyes) -AM_CONDITIONAL(HAVE_FLAC_COMMON, - test x$enable_flac = xyes) - dnl --------------------------------------------------------------------------- dnl Encoders for Streaming Audio Output Plugins dnl --------------------------------------------------------------------------- -- cgit v1.2.3