Revert "audio_filter: remove Makefile recursion"

[vlc] / modules / audio_filter / Modules.am

diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am
index 913c228838efbe79b95c524778969634a5a10898..ba994e605b225a23eab3f01a8397a67f7cf9419e 100644 (file)
--- a/modules/audio_filter/Modules.am
+++ b/modules/audio_filter/Modules.am
@@ -16,7 +16,7 @@ SOURCES_spatializer = \
        spatializer/revmodel.cpp spatializer/revmodel.hpp \
        spatializer/spatializer.cpp
 
-libvlc_LTLIBRARIES += \
+audio_filter_LTLIBRARIES += \
        libaudiobargraph_a_plugin.la \
        libchorus_flanger_plugin.la \
        libcompressor_plugin.la \
@@ -37,7 +37,7 @@ SOURCES_dolby_surround_decoder = channel_mixer/dolby.c
 SOURCES_mono = channel_mixer/mono.c
 SOURCES_remap = channel_mixer/remap.c
 
-libvlc_LTLIBRARIES += \
+audio_filter_LTLIBRARIES += \
        libdolby_surround_decoder_plugin.la \
        libheadphone_channel_mixer_plugin.la \
        libmono_plugin.la \
@@ -46,18 +46,25 @@ libvlc_LTLIBRARIES += \
        libtrivial_channel_mixer_plugin.la
 
 # Converters
-SOURCES_converter_fixed = converter/fixed.c
 SOURCES_a52tospdif = converter/a52tospdif.c
 SOURCES_a52tofloat32 = converter/a52tofloat32.c
 SOURCES_dtstospdif = converter/dtstospdif.c
 SOURCES_dtstofloat32 = converter/dtstofloat32.c
-SOURCES_mpgatofixed32 = converter/mpgatofixed32.c
-SOURCES_audio_format = converter/format.c
 
-libvlc_LTLIBRARIES += \
+libmad_plugin_la_SOURCES = converter/mpgatofixed32.c
+libmad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(MAD_CFLAGS)
+libmad_plugin_la_LIBADD = $(AM_LIBADD) $(MAD_LIBS)
+if HAVE_MAD
+audio_filter_LTLIBRARIES += libmad_plugin.la
+endif
+
+libaudio_format_plugin_la_SOURCES = converter/format.c
+libaudio_format_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libaudio_format_plugin_la_LIBADD = $(LIBM)
+
+audio_filter_LTLIBRARIES += \
        liba52tospdif_plugin.la \
        libaudio_format_plugin.la \
-       libconverter_fixed_plugin.la \
        libdtstospdif_plugin.la
 
 # Resamplers
@@ -66,15 +73,14 @@ SOURCES_bandlimited_resampler = \
 SOURCES_ugly_resampler = resampler/ugly.c
 SOURCES_samplerate = resampler/src.c
 
-libvlc_LTLIBRARIES += \
+audio_filter_LTLIBRARIES += \
        libugly_resampler_plugin.la
 EXTRA_LTLIBRARIES += \
        libbandlimited_resampler_plugin.la
 
 libspeex_resampler_plugin_la_SOURCES = resampler/speex.c
 libspeex_resampler_plugin_la_CFLAGS = $(AM_CFLAGS) $(SPEEXDSP_CFLAGS)
-libspeex_resampler_plugin_la_LIBADD = $(AM_LIBADD) $(SPEEXDSP_LIBS)
-libspeex_resampler_plugin_la_DEPENDENCIES =
+libspeex_resampler_plugin_la_LIBADD = $(SPEEXDSP_LIBS)
 if HAVE_SPEEXDSP
-libvlc_LTLIBRARIES += libspeex_resampler_plugin.la
+audio_filter_LTLIBRARIES += libspeex_resampler_plugin.la
 endif