[vlc-commits] arm_neon: remove recursion

[Rémi Denis-Courmont]

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

arm_neon: remove recursion

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

 configure.ac                  |    1 -
 modules/Makefile.am           |    5 +----
 modules/arm_neon/Makefile.am  |   33 ++++++++++++++++++---------------
 modules/arm_neon/chroma_yuv.c |    2 +-
 modules/arm_neon/yuv_rgb.c    |    2 +-
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index 417bfdb..9f8c9fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4210,7 +4210,6 @@ AC_CONFIG_FILES([
   modules/video_output/Makefile
   modules/video_splitter/Makefile
   modules/visualization/Makefile
-  modules/arm_neon/Makefile
   modules/hw/vdpau/Makefile
 ])
 
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 88749ad..336e2c2 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_SUBDIRS = \
 	access_output \
 	mux \
 	stream_out \
-	arm_neon \
 	hw/vdpau \
 	lua
 
@@ -30,9 +29,6 @@ DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 if ENABLE_SOUT
 SUBDIRS += access_output mux stream_out
 endif
-if HAVE_NEON
-SUBDIRS += arm_neon
-endif
 if HAVE_VDPAU
 SUBDIRS += hw/vdpau
 endif
@@ -45,6 +41,7 @@ dist_noinst_DATA = MODULES_LIST
 
 include common.am
 include access/Makefile.am
+include arm_neon/Makefile.am
 include audio_output/Makefile.am
 include codec/Makefile.am
 include demux/Makefile.am
diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
index ff34b46..212605f 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -1,33 +1,36 @@
-AM_LIBTOOLFLAGS=--tag=CC
-include $(top_srcdir)/modules/common.am
 neondir = $(pluginsdir)/arm_neon
 
 libsimple_channel_mixer_neon_plugin_la_SOURCES = \
-	simple_channel_mixer.S \
-	simple_channel_mixer.c
+	arm_neon/simple_channel_mixer.S \
+	arm_neon/simple_channel_mixer.c
 libsimple_channel_mixer_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
-libsimple_channel_mixer_neon_plugin_la_DEPENDENCIES =
+libsimple_channel_mixer_neon_plugin_LIBTOOLFLAGS = --tag=CC
 
 libchroma_yuv_neon_plugin_la_SOURCES = \
-	i420_yuyv.S \
-	i422_yuyv.S \
-	yuyv_i422.S \
-	chroma_yuv.c chroma_neon.h
+	arm_neon/i420_yuyv.S \
+	arm_neon/i422_yuyv.S \
+	arm_neon/yuyv_i422.S \
+	arm_neon/chroma_yuv.c arm_neon/chroma_neon.h
 libchroma_yuv_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
+libchroma_yuv_neon_plugin_LIBTOOLFLAGS = --tag=CC
 
-libvolume_neon_plugin_la_SOURCES = volume.c amplify.S
+libvolume_neon_plugin_la_SOURCES = arm_neon/volume.c arm_neon/amplify.S
 libvolume_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
+libvolume_neon_plugin_LIBTOOLFLAGS = --tag=CC
 
 libyuv_rgb_neon_plugin_la_SOURCES = \
-	i420_rgb.S \
-	i420_rv16.S \
-	nv21_rgb.S \
-	nv12_rgb.S \
-	yuv_rgb.c
+	arm_neon/i420_rgb.S \
+	arm_neon/i420_rv16.S \
+	arm_neon/nv21_rgb.S \
+	arm_neon/nv12_rgb.S \
+	arm_neon/yuv_rgb.c
 libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
+libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
 
+if HAVE_NEON
 neon_LTLIBRARIES = \
 	libsimple_channel_mixer_neon_plugin.la \
 	libchroma_yuv_neon_plugin.la \
 	libvolume_neon_plugin.la \
 	libyuv_rgb_neon_plugin.la
+endif
diff --git a/modules/arm_neon/chroma_yuv.c b/modules/arm_neon/chroma_yuv.c
index 6f1a965..9e1f0fc 100644
--- a/modules/arm_neon/chroma_yuv.c
+++ b/modules/arm_neon/chroma_yuv.c
@@ -26,7 +26,7 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_cpu.h>
-#include "chroma_neon.h"
+#include "arm_neon/chroma_neon.h"
 
 static int Open (vlc_object_t *);
 
diff --git a/modules/arm_neon/yuv_rgb.c b/modules/arm_neon/yuv_rgb.c
index d28a27e..1149aee 100644
--- a/modules/arm_neon/yuv_rgb.c
+++ b/modules/arm_neon/yuv_rgb.c
@@ -27,7 +27,7 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_cpu.h>
-#include "chroma_neon.h"
+#include "arm_neon/chroma_neon.h"
 
 static int Open (vlc_object_t *);