arm_neon: remove recursion

diff --git a/configure.ac b/configure.ac
index 417bfdb5c2ad1ea3b1435a485820ed17fb540ed2..9f8c9fb76007f8df36a867922f9f441f02350cfb 100644 (file)
--- 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 88749adfdb99e685346d32dd268079a048cfe5cb..336e2c246cbbde6f1c28b8028d9d1f80535800e7 100644 (file)
--- 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 ff34b464d6db5d89a8c8285e92780649fb2db91b..212605fc1c3588d438f180c951efa53055606294 100644 (file)
--- 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 6f1a96573d99669a8e879dc9e40212f68824c9e4..9e1f0fca26c39d403b8af98cf487dbec8d72be59 100644 (file)
--- 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 d28a27ef1e5ceb44bab6257188bc286ba7e836af..1149aeeffdc9c4716f18ca651c152f535119f339 100644 (file)
--- 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 *);