Merge branch 1.0-bugfix

[vlc] / modules / video_chroma / Modules.am

diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am
index 2a6adce69ab4fb8cf862bcfbe1cf44cc32e499d7..f886becacfc1b396b0f1a5a16cfab84a9bd55430 100644 (file)
--- a/modules/video_chroma/Modules.am
+++ b/modules/video_chroma/Modules.am
@@ -1,23 +1,85 @@
 SOURCES_i420_rgb = \
-       modules/video_chroma/i420_rgb.c \
-       modules/video_chroma/i420_rgb8.c \
-       modules/video_chroma/i420_rgb16.c
+       i420_rgb.c \
+       i420_rgb.h \
+       i420_rgb8.c \
+       i420_rgb16.c \
+       i420_rgb_c.h \
+       $(NULL)
+
 SOURCES_i420_rgb_mmx = \
-       modules/video_chroma/i420_rgb.c \
-       modules/video_chroma/i420_rgb16.c
+       i420_rgb.c \
+       i420_rgb.h \
+       i420_rgb16.c \
+       i420_rgb_mmx.h \
+       $(NULL)
+
+SOURCES_i420_rgb_sse2 = \
+       i420_rgb.c \
+       i420_rgb.h \
+       i420_rgb16.c \
+       i420_rgb_mmx.h \
+       $(NULL)
+
+SOURCES_i420_yuy2 = \
+       i420_yuy2.c \
+       i420_yuy2.h \
+       $(NULL)
+
+SOURCES_i420_yuy2_mmx = \
+       i420_yuy2.c \
+       i420_yuy2.h \
+       $(NULL)
+
+SOURCES_i420_yuy2_sse2 = \
+       i420_yuy2.c \
+       i420_yuy2.h \
+       $(NULL)
+
+SOURCES_i420_yuy2_altivec = \
+       i420_yuy2.c \
+       i420_yuy2.h \
+       $(NULL)
+
+SOURCES_i422_yuy2 = \
+       i422_yuy2.c \
+       i422_yuy2.h \
+       $(NULL)
+
+SOURCES_i422_yuy2_mmx = \
+       i422_yuy2.c \
+       i422_yuy2.h \
+       $(NULL)
+
+SOURCES_i422_yuy2_sse2 = \
+       i422_yuy2.c \
+       i422_yuy2.h \
+       $(NULL)
+
+SOURCES_i422_i420 = \
+       i422_i420.c \
+       $(NULL)
+
+SOURCES_i420_ymga = \
+       i420_ymga.c \
+       $(NULL)
+
+SOURCES_i420_ymga_mmx = \
+       i420_ymga.c \
+       $(NULL)
 
-SOURCES_i420_yuy2 = modules/video_chroma/i420_yuy2.c
-SOURCES_i420_yuy2_mmx = modules/video_chroma/i420_yuy2.c
+SOURCES_grey_yuv = \
+       grey_yuv.c \
+       $(NULL)
 
-SOURCES_i422_yuy2 = modules/video_chroma/i422_yuy2.c
-SOURCES_i422_yuy2_mmx = modules/video_chroma/i422_yuy2.c
+SOURCES_yuy2_i422 = \
+       yuy2_i422.c \
+       $(NULL)
 
-SOURCES_i420_ymga = modules/video_chroma/i420_ymga.c
-SOURCES_i420_ymga_mmx = modules/video_chroma/i420_ymga.c
+SOURCES_yuy2_i420 = \
+       yuy2_i420.c \
+       $(NULL)
 
-noinst_HEADERS += \
-       modules/video_chroma/i420_rgb.h \
-       modules/video_chroma/i420_rgb_c.h \
-       modules/video_chroma/i420_rgb_mmx.h \
-       modules/video_chroma/i420_yuy2.h \
-       modules/video_chroma/i422_yuy2.h
+libvlc_LTLIBRARIES += \
+       libi420_rgb_plugin.la \
+       libgrey_yuv_plugin.la \
+       $(NULL)