Makefile.am: eliminate FLAC_COMMON

This commit is contained in:
Max Kellermann 2012-10-02 10:58:53 +02:00
parent ccd7104cdc
commit a9419da09c
2 changed files with 5 additions and 11 deletions

View File

@ -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

View File

@ -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 ---------------------------------------------------------------------------