video_chroma: avoid genmf

diff --git a/configure.ac b/configure.ac
index b52c322f8ac11b5c8f570b7364ce1c33699f1a73..b4cc0bd254b42f64a23918bcf3f28fb2f0d9f88c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -655,7 +655,7 @@ AC_CHECK_FUNC(getopt_long,, [
 AC_SUBST(GNUGETOPT_LIBS)
 
 AC_CHECK_LIB(m,cos,[
-  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
+  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
   LIBM="-lm"
 ], [
   LIBM=""

diff --git a/modules/video_chroma/.gitignore b/modules/video_chroma/.gitignore
deleted file mode 100644 (file)
index 08a6d72..0000000
--- a/modules/video_chroma/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am

diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
new file mode 100644 (file)
index 0000000..caaff57
--- /dev/null
+++ b/modules/video_chroma/Makefile.am
@@ -0,0 +1,55 @@
+basedir = video_chroma
+include $(top_srcdir)/modules/common.am
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+libchain_plugin_la_SOURCES = chain.c
+libchain_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libchroma_omx_plugin_la_SOURCES = omxdl.c
+libchroma_omx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OMXIP_CFLAGS)
+libchroma_omx_plugin_la_LIBADD = $(AM_LIBADD) $(OMXIP_LIBS)
+
+libswscale_plugin_la_SOURCES = swscale.c ../codec/avcodec/chroma.c
+libswscale_plugin_la_CFLAGS = $(AM_CFLAGS) $(SWSCALE_CFLAGS)
+libswscale_plugin_la_LIBADD = $(AM_LIBADD) $(SWSCALE_LIBS)
+
+libgrey_yuv_plugin_la_SOURCES = grey_yuv.c
+libgrey_yuv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libi420_rgb_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \
+       i420_rgb8.c i420_rgb16.c i420_rgb_c.h
+libi420_rgb_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libi420_rgb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+
+libi420_yuy2_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
+libi420_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libi422_i420_plugin_la_SOURCES = i422_i420.c
+libi422_i420_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libi422_yuy2_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h
+libi422_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+librv32_plugin_la_SOURCES = rv32.c
+librv32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libyuy2_i420_plugin_la_SOURCES = yuy2_i420.c
+libyuy2_i420_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libyuy2_i422_plugin_la_SOURCES = yuy2_i422.c
+libyuy2_i422_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libvlc_LTLIBRARIES = \
+       libi420_rgb_plugin.la \
+       libi420_yuy2_plugin.la \
+       libi422_i420_plugin.la \
+       libi422_yuy2_plugin.la \
+       libgrey_yuv_plugin.la \
+       libyuy2_i420_plugin.la \
+       libyuy2_i422_plugin.la \
+       librv32_plugin.la \
+       libchain_plugin.la \
+       $(LTLIBswscale)
+
+EXTRA_LTLIBRARIES = libswscale_plugin.la libchroma_omx_plugin.la

diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am
deleted file mode 100644 (file)
index 6bdaa84..0000000
--- a/modules/video_chroma/Modules.am
+++ /dev/null
@@ -1,68 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-SOURCES_i420_rgb = \
-       i420_rgb.c \
-       i420_rgb.h \
-       i420_rgb8.c \
-       i420_rgb16.c \
-       i420_rgb_c.h \
-       $(NULL)
-
-SOURCES_i420_yuy2 = \
-       i420_yuy2.c \
-       i420_yuy2.h \
-       $(NULL)
-
-SOURCES_i422_yuy2 = \
-       i422_yuy2.c \
-       i422_yuy2.h \
-       $(NULL)
-
-SOURCES_i422_i420 = \
-       i422_i420.c \
-       $(NULL)
-
-SOURCES_grey_yuv = \
-       grey_yuv.c \
-       $(NULL)
-
-SOURCES_yuy2_i422 = \
-       yuy2_i422.c \
-       $(NULL)
-
-SOURCES_yuy2_i420 = \
-       yuy2_i420.c \
-       $(NULL)
-
-SOURCES_rv32 = rv32.c
-
-libchain_plugin_la_SOURCES = chain.c
-libchain_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-if HAVE_WIN32
-libchain_plugin_la_DEPENDENCIES = libchain_plugin.rc.o
-endif
-
-libswscale_plugin_la_SOURCES = swscale.c ../codec/avcodec/chroma.c
-libswscale_plugin_la_CFLAGS = $(AM_CFLAGS) $(SWSCALE_CFLAGS)
-libswscale_plugin_la_LIBADD = $(AM_LIBADD) $(SWSCALE_LIBS)
-if HAVE_WIN32
-libswscale_plugin_la_DEPENDENCIES = libswscale_plugin.rc.o
-endif
-EXTRA_LTLIBRARIES += libswscale_plugin.la
-
-libvlc_LTLIBRARIES += \
-       libi420_rgb_plugin.la \
-       libi420_yuy2_plugin.la \
-       libi422_i420_plugin.la \
-       libi422_yuy2_plugin.la \
-       libgrey_yuv_plugin.la \
-       libyuy2_i420_plugin.la \
-       libyuy2_i422_plugin.la \
-       librv32_plugin.la \
-       libchain_plugin.la \
-       $(LTLIBswscale)
-
-libchroma_omx_plugin_la_SOURCES = omxdl.c
-libchroma_omx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OMXIP_CFLAGS)
-libchroma_omx_plugin_la_LIBADD = $(AM_LIBADD) $(OMXIP_LIBS)
-EXTRA_LTLIBRARIES += libchroma_omx_plugin.la