audio_mixer: remove recursion

diff --git a/configure.ac b/configure.ac
index 9f8c9fb76007f8df36a867922f9f441f02350cfb..ba4d8e8710d915a19a8ff53406bd39ff5be54742 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4189,7 +4189,6 @@ AC_CONFIG_FILES([
   modules/access/rtp/Makefile
   modules/access_output/Makefile
   modules/audio_filter/Makefile
-  modules/audio_mixer/Makefile
   modules/control/Makefile
   modules/gui/Makefile
   modules/gui/macosx/Makefile

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 336e2c246cbbde6f1c28b8028d9d1f80535800e7..c90b20da4d10734e41e6461ffceed19b99809373 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -4,7 +4,6 @@ noinst_HEADERS =
 BASE_SUBDIRS = \
        access/rtp \
        audio_filter \
-       audio_mixer \
        control \
        gui \
        misc \
@@ -42,6 +41,7 @@ dist_noinst_DATA = MODULES_LIST
 include common.am
 include access/Makefile.am
 include arm_neon/Makefile.am
+include audio_mixer/Makefile.am
 include audio_output/Makefile.am
 include codec/Makefile.am
 include demux/Makefile.am

diff --git a/modules/audio_mixer/Makefile.am b/modules/audio_mixer/Makefile.am
index da69dc2fdc27c08c5908ddad7e78be7ea18ac155..5e7cb430c85af70df37e8e946c5995d462eeef17 100644 (file)
--- a/modules/audio_mixer/Makefile.am
+++ b/modules/audio_mixer/Makefile.am
@@ -1,11 +1,10 @@
-include $(top_srcdir)/modules/common.am
 audio_mixerdir = $(pluginsdir)/audio_mixer
 
-libfloat_mixer_plugin_la_SOURCES = float.c
+libfloat_mixer_plugin_la_SOURCES = audio_mixer/float.c
 libfloat_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libfloat_mixer_plugin_la_LIBADD = $(LIBM)
 
-libinteger_mixer_plugin_la_SOURCES = integer.c
+libinteger_mixer_plugin_la_SOURCES = audio_mixer/integer.c
 libinteger_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 audio_mixer_LTLIBRARIES = \