audio_filter: remove Makefile recursion

diff --git a/configure.ac b/configure.ac
index 198183e893881a3cdecfcb89abbe9a3d5c936d34..198b23a1538dfd2082e3e5b870674d31249e5400 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -699,7 +699,7 @@ AC_CHECK_FUNC(getopt_long,, [
 AC_SUBST(GNUGETOPT_LIBS)
 
 AC_CHECK_LIB(m,cos,[
-  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom noise grain scene chorus_flanger swscale postproc equalizer spatializer param_eq samplerate mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum smooth],[-lm])
+  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient x264 goom noise grain scene swscale postproc mpc qt4 audiobargraph_v colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum smooth],[-lm])
   LIBM="-lm"
 ], [
   LIBM=""
@@ -4136,7 +4136,6 @@ AC_CONFIG_FILES([
   bin/Makefile
   test/Makefile
   modules/access_output/Makefile
-  modules/audio_filter/Makefile
   modules/control/Makefile
   modules/gui/Makefile
   modules/gui/ios_dialog_provider/Makefile

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 46feda18c9f87805769d2166a4b0da7fb95cb75e..704582ab40f4afe7bc824af34847ddad54d3584c 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -4,7 +4,6 @@ check_PROGRAMS =
 EXTRA_DIST =
 
 BASE_SUBDIRS = \
-       audio_filter \
        control \
        gui \
        video_filter \
@@ -34,6 +33,7 @@ include common.am
 include access/Makefile.am
 include access/rtp/Makefile.am
 include arm_neon/Makefile.am
+include audio_filter/Makefile.am
 include audio_mixer/Makefile.am
 include audio_output/Makefile.am
 include codec/Makefile.am

diff --git a/modules/audio_filter/.gitignore b/modules/audio_filter/.gitignore
deleted file mode 100644 (file)
index 08a6d72..0000000
--- a/modules/audio_filter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am

diff --git a/modules/audio_filter/Makefile.am b/modules/audio_filter/Makefile.am
new file mode 100644 (file)
index 0000000..c7b866e
--- /dev/null
+++ b/modules/audio_filter/Makefile.am
@@ -0,0 +1,121 @@
+audio_filterdir = $(pluginsdir)/audio_filter
+
+libaudiobargraph_a_plugin_la_SOURCES = audio_filter/audiobargraph_a.c
+libaudiobargraph_a_plugin_la_LIBADD = $(LIBM)
+libchorus_flanger_plugin_la_SOURCES = audio_filter/chorus_flanger.c
+libchorus_flanger_plugin_la_LIBADD = $(LIBM)
+libcompressor_plugin_la_SOURCES = audio_filter/compressor.c
+libcompressor_plugin_la_LIBADD = $(LIBM)
+libequalizer_plugin_la_SOURCES = audio_filter/equalizer.c \
+       audio_filter/equalizer_presets.h
+libequalizer_plugin_la_LIBADD = $(LIBM)
+libkaraoke_plugin_la_SOURCES = audio_filter/karaoke.c
+libnormvol_plugin_la_SOURCES = audio_filter/normvol.c
+libnormvol_plugin_la_LIBADD = $(LIBM)
+libgain_plugin_la_SOURCES = audio_filter/gain.c
+libparam_eq_plugin_la_SOURCES = audio_filter/param_eq.c
+libparam_eq_plugin_la_LIBADD = $(LIBM)
+libscaletempo_plugin_la_SOURCES = audio_filter/scaletempo.c
+libstereo_widen_plugin_la_SOURCES = audio_filter/stereo_widen.c
+libspatializer_plugin_la_SOURCES = \
+       audio_filter/spatializer/allpass.cpp \
+       audio_filter/spatializer/allpass.hpp \
+       audio_filter/spatializer/comb.cpp \
+       audio_filter/spatializer/comb.hpp \
+       audio_filter/spatializer/denormals.h \
+       audio_filter/spatializer/denormals.c \
+       audio_filter/spatializer/tuning.h \
+       audio_filter/spatializer/revmodel.cpp \
+       audio_filter/spatializer/revmodel.hpp \
+       audio_filter/spatializer/spatializer.cpp
+libspatializer_plugin_la_LIBADD = $(LIBM)
+
+audio_filter_LTLIBRARIES = \
+       libaudiobargraph_a_plugin.la \
+       libchorus_flanger_plugin.la \
+       libcompressor_plugin.la \
+       libequalizer_plugin.la \
+       libkaraoke_plugin.la \
+       libnormvol_plugin.la \
+       libgain_plugin.la \
+       libparam_eq_plugin.la \
+       libscaletempo_plugin.la \
+       libspatializer_plugin.la \
+       libstereo_widen_plugin.la
+
+# Channel mixers
+libdolby_surround_decoder_plugin_la_SOURCES = \
+       audio_filter/channel_mixer/dolby.c
+libheadphone_channel_mixer_plugin_la_SOURCES = \
+       audio_filter/channel_mixer/headphone.c
+libheadphone_channel_mixer_plugin_la_LIBADD = $(LIBM)
+libmono_plugin_la_SOURCES = audio_filter/channel_mixer/mono.c
+libmono_plugin_la_LIBADD = $(LIBM)
+libremap_plugin_la_SOURCES = audio_filter/channel_mixer/remap.c
+libtrivial_channel_mixer_plugin_la_SOURCES = \
+       audio_filter/channel_mixer/trivial.c
+libsimple_channel_mixer_plugin_la_SOURCES = \
+       audio_filter/channel_mixer/simple.c
+
+audio_filter_LTLIBRARIES += \
+       libdolby_surround_decoder_plugin.la \
+       libheadphone_channel_mixer_plugin.la \
+       libmono_plugin.la \
+       libremap_plugin.la \
+       libsimple_channel_mixer_plugin.la \
+       libtrivial_channel_mixer_plugin.la
+
+# Converters
+liba52tofloat32_plugin_la_SOURCES = audio_filter/converter/a52tofloat32.c
+liba52tofloat32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_a52tofloat32)
+liba52tofloat32_plugin_la_LIBADD = $(LIBM) $(LIBS_a52tofloat32)
+liba52tofloat32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(audio_filterdir)'
+libdtstofloat32_plugin_la_SOURCES = audio_filter/converter/dtstofloat32.c
+libdtstofloat32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DCA_CFLAGS)
+libdtstofloat32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(audio_filterdir)'
+libdtstofloat32_plugin_la_LIBADD = $(LIBM) $(DCA_LIBS)
+EXTRA_LTLIBRARIES += liba52tofloat32_plugin.la libdtstofloat32_plugin.la
+audio_filter_LTLIBRARIES += $(LTLIBa52tofloat32) $(LTLIBdtstofloat32)
+
+libmad_plugin_la_SOURCES = audio_filter/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 = audio_filter/converter/format.c
+libaudio_format_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libaudio_format_plugin_la_LIBADD = $(LIBM)
+
+liba52tospdif_plugin_la_SOURCES = audio_filter/converter/a52tospdif.c
+libdtstospdif_plugin_la_SOURCES = audio_filter/converter/dtstospdif.c
+
+audio_filter_LTLIBRARIES += \
+       liba52tospdif_plugin.la \
+       libaudio_format_plugin.la \
+       libdtstospdif_plugin.la
+
+# Resamplers
+libbandlimited_resampler_plugin_la_SOURCES = \
+       audio_filter/resampler/bandlimited.c \
+       audio_filter/resampler/bandlimited.h
+libugly_resampler_plugin_la_SOURCES = audio_filter/resampler/ugly.c
+libsamplerate_plugin_la_SOURCES = audio_filter/resampler/src.c
+libsamplerate_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SAMPLERATE_CFLAGS)
+libsamplerate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(audio_filterdir)'
+libsamplerate_plugin_la_LIBADD = $(LIBM) $(SAMPLERATE_LIBS)
+
+audio_filter_LTLIBRARIES += \
+       $(LTLIBsamplerate) \
+       libugly_resampler_plugin.la
+EXTRA_LTLIBRARIES += \
+       libbandlimited_resampler_plugin.la \
+       libsamplerate_plugin.la
+
+libspeex_resampler_plugin_la_SOURCES = audio_filter/resampler/speex.c
+libspeex_resampler_plugin_la_CFLAGS = $(AM_CFLAGS) $(SPEEXDSP_CFLAGS)
+libspeex_resampler_plugin_la_LIBADD = $(SPEEXDSP_LIBS)
+if HAVE_SPEEXDSP
+audio_filter_LTLIBRARIES += libspeex_resampler_plugin.la
+endif

diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am
deleted file mode 100644 (file)
index ba994e6..0000000
--- a/modules/audio_filter/Modules.am
+++ /dev/null
@@ -1,86 +0,0 @@
-SOURCES_equalizer = equalizer.c equalizer_presets.h
-SOURCES_compressor = compressor.c
-SOURCES_karaoke = karaoke.c
-SOURCES_normvol = normvol.c
-SOURCES_gain = gain.c
-SOURCES_audiobargraph_a = audiobargraph_a.c
-SOURCES_param_eq = param_eq.c
-SOURCES_scaletempo = scaletempo.c
-SOURCES_chorus_flanger = chorus_flanger.c
-SOURCES_stereo_widen = stereo_widen.c
-SOURCES_spatializer = \
-       spatializer/allpass.cpp spatializer/allpass.hpp \
-       spatializer/comb.cpp spatializer/comb.hpp \
-       spatializer/denormals.h spatializer/denormals.c \
-       spatializer/tuning.h \
-       spatializer/revmodel.cpp spatializer/revmodel.hpp \
-       spatializer/spatializer.cpp
-
-audio_filter_LTLIBRARIES += \
-       libaudiobargraph_a_plugin.la \
-       libchorus_flanger_plugin.la \
-       libcompressor_plugin.la \
-       libequalizer_plugin.la \
-       libkaraoke_plugin.la \
-       libnormvol_plugin.la \
-       libgain_plugin.la \
-       libparam_eq_plugin.la \
-       libscaletempo_plugin.la \
-       libspatializer_plugin.la \
-       libstereo_widen_plugin.la
-
-# Channel mixers
-SOURCES_trivial_channel_mixer = channel_mixer/trivial.c
-SOURCES_simple_channel_mixer = channel_mixer/simple.c
-SOURCES_headphone_channel_mixer = channel_mixer/headphone.c
-SOURCES_dolby_surround_decoder = channel_mixer/dolby.c
-SOURCES_mono = channel_mixer/mono.c
-SOURCES_remap = channel_mixer/remap.c
-
-audio_filter_LTLIBRARIES += \
-       libdolby_surround_decoder_plugin.la \
-       libheadphone_channel_mixer_plugin.la \
-       libmono_plugin.la \
-       libremap_plugin.la \
-       libsimple_channel_mixer_plugin.la \
-       libtrivial_channel_mixer_plugin.la
-
-# Converters
-SOURCES_a52tospdif = converter/a52tospdif.c
-SOURCES_a52tofloat32 = converter/a52tofloat32.c
-SOURCES_dtstospdif = converter/dtstospdif.c
-SOURCES_dtstofloat32 = converter/dtstofloat32.c
-
-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 \
-       libdtstospdif_plugin.la
-
-# Resamplers
-SOURCES_bandlimited_resampler = \
-       resampler/bandlimited.c resampler/bandlimited.h
-SOURCES_ugly_resampler = resampler/ugly.c
-SOURCES_samplerate = resampler/src.c
-
-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 = $(SPEEXDSP_LIBS)
-if HAVE_SPEEXDSP
-audio_filter_LTLIBRARIES += libspeex_resampler_plugin.la
-endif