[vlc-commits] audio_mixer: remove recursion

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 28 15:58:11 2013 +0300| [e89cefb48b3a0f6ac57e74c8f6e19ae3a468f564] | committer: Rémi Denis-Courmont

audio_mixer: remove recursion

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e89cefb48b3a0f6ac57e74c8f6e19ae3a468f564
---

 configure.ac                    |    1 -
 modules/Makefile.am             |    2 +-
 modules/audio_mixer/Makefile.am |    5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9f8c9fb..ba4d8e8 100644
--- 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 336e2c2..c90b20d 100644
--- 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 da69dc2..5e7cb43 100644
--- 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 = \