[vlc-commits] video_splitter: remove recursion

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 28 16:14:44 2013 +0300| [9854c23e68d44e792ebfff16b4968ee344c50973] | committer: Rémi Denis-Courmont

video_splitter: remove recursion

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

 configure.ac                       |    1 -
 modules/Makefile.am                |    2 +-
 modules/video_splitter/Makefile.am |    7 +++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 75b2cef..c0c6e5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4203,7 +4203,6 @@ AC_CONFIG_FILES([
   modules/text_renderer/Makefile
   modules/video_filter/Makefile
   modules/video_output/Makefile
-  modules/video_splitter/Makefile
   modules/visualization/Makefile
   modules/hw/vdpau/Makefile
 ])
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 2de5639..0e76750 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -11,7 +11,6 @@ BASE_SUBDIRS = \
 	text_renderer \
 	video_filter \
 	video_output \
-	video_splitter \
 	visualization
 EXTRA_SUBDIRS = \
 	access_output \
@@ -44,6 +43,7 @@ include notify/Makefile.am
 include services_discovery/Makefile.am
 include stream_filter/Makefile.am
 include video_chroma/Makefile.am
+include video_splitter/Makefile.am
 
 BUILT_SOURCES += dummy.cpp
 
diff --git a/modules/video_splitter/Makefile.am b/modules/video_splitter/Makefile.am
index 451c3c5..f0e023c 100644
--- a/modules/video_splitter/Makefile.am
+++ b/modules/video_splitter/Makefile.am
@@ -1,15 +1,14 @@
-include $(top_srcdir)/modules/common.am
 splitterdir = $(pluginsdir)/video_splitter
 
 splitter_LTLIBRARIES = \
 	libclone_plugin.la \
 	libwall_plugin.la
 
-libclone_plugin_la_SOURCES = clone.c
+libclone_plugin_la_SOURCES = video_splitter/clone.c
 
-libwall_plugin_la_SOURCES = wall.c
+libwall_plugin_la_SOURCES = video_splitter/wall.c
 
-libpanoramix_plugin_la_SOURCES = panoramix.c
+libpanoramix_plugin_la_SOURCES = video_splitter/panoramix.c
 libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS)
 libpanoramix_plugin_la_LIBADD = $(LIBM)
 if HAVE_WIN32