modules: avoid using genmf where unnecessary

diff --git a/modules/access/rtp/Modules.am b/modules/access/rtp/Makefile.am
similarity index 91%
rename from modules/access/rtp/Modules.am
rename to modules/access/rtp/Makefile.am
index 4b8aa958502b5cc143f58ad9f30f694d06c59898..7cdcae6cbad3bef86889fcd46baba5bb11f84a04 100644 (file)
--- a/modules/access/rtp/Modules.am
+++ b/modules/access/rtp/Makefile.am
@@ -1,6 +1,8 @@
+basedir = access
+include $(top_srcdir)/modules/common.am
+
 # RTP plugin
-libvlc_LTLIBRARIES += \
-       librtp_plugin.la
+libvlc_LTLIBRARIES = librtp_plugin.la
 librtp_plugin_la_SOURCES = \
        rtp.c \
        rtp.h \

diff --git a/modules/altivec/Modules.am b/modules/altivec/Makefile.am
similarity index 70%
rename from modules/altivec/Modules.am
rename to modules/altivec/Makefile.am
index 5178b0163c1553745769e3fa5367b2005df66839..cf28a0370786391a22a24b875e4c093fab26403d 100644 (file)
--- a/modules/altivec/Modules.am
+++ b/modules/altivec/Makefile.am
@@ -1,9 +1,11 @@
+basedir = altivec
+include $(top_srcdir)/modules/common.am
+
 libi420_yuy2_altivec_plugin_la_SOURCES = \
         ../video_chroma/i420_yuy2.c \
        ../video_chroma/i420_yuy2.h
 libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_i420_yuy2_altivec)
 libi420_yuy2_altivec_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_i420_yuy2_altivec)
 
-libvlc_LTLIBRARIES += \
-       libi420_yuy2_altivec_plugin.la \
-       $(NULL)
+libvlc_LTLIBRARIES = \
+       libi420_yuy2_altivec_plugin.la

diff --git a/modules/arm_neon/Modules.am b/modules/arm_neon/Makefile.am
similarity index 89%
rename from modules/arm_neon/Modules.am
rename to modules/arm_neon/Makefile.am
index decb3b8189f0eb6b622c4d9f4b8aaf11fed3cf33..c6eb6cb866bb429408b0eeb9d05f39829bbfabeb 100644 (file)
--- a/modules/arm_neon/Modules.am
+++ b/modules/arm_neon/Makefile.am
@@ -1,3 +1,6 @@
+basedir = arm_neon
+include $(top_srcdir)/modules/common.am
+
 AM_LIBTOOLFLAGS=--tag=CC
 
 libsimple_channel_mixer_neon_plugin_la_SOURCES = \
@@ -28,9 +31,8 @@ libyuv_rgb_neon_plugin_la_SOURCES = \
 libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
 libyuv_rgb_neon_plugin_la_LIBADD = $(AM_LIBADD)
 
-libvlc_LTLIBRARIES += \
+libvlc_LTLIBRARIES = \
        libsimple_channel_mixer_neon_plugin.la \
        libchroma_yuv_neon_plugin.la \
        libvolume_neon_plugin.la \
-       libyuv_rgb_neon_plugin.la \
-       $(NULL)
+       libyuv_rgb_neon_plugin.la

diff --git a/modules/audio_mixer/Modules.am b/modules/audio_mixer/Makefile.am
similarity index 80%
rename from modules/audio_mixer/Modules.am
rename to modules/audio_mixer/Makefile.am
index 18575f8de329977bdcce05c83b48f4786f14b6c4..2adfdb46133a902f8b9a44ef4d1d262f82f49f66 100644 (file)
--- a/modules/audio_mixer/Modules.am
+++ b/modules/audio_mixer/Makefile.am
@@ -1,3 +1,6 @@
+basedir = audio_mixer
+include $(top_srcdir)/modules/common.am
+
 libfloat_mixer_plugin_la_SOURCES = float.c
 libfloat_mixer_plugin_la_CFLAGS = $(AM_CFLAGS)
 libfloat_mixer_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
@@ -6,6 +9,6 @@ libinteger_mixer_plugin_la_SOURCES = integer.c
 libinteger_mixer_plugin_la_CFLAGS = $(AM_CFLAGS)
 libinteger_mixer_plugin_la_LIBADD = $(AM_LIBADD)
 
-libvlc_LTLIBRARIES += \
+libvlc_LTLIBRARIES = \
        libfloat_mixer_plugin.la \
        libinteger_mixer_plugin.la

diff --git a/modules/mmx/Modules.am b/modules/mmx/Makefile.am
similarity index 87%
rename from modules/mmx/Modules.am
rename to modules/mmx/Makefile.am
index e4dec7dea5f1757033af63d761e510b6de454b7e..38bf26793fa90150e58cff6f7bfd39162cbc1e54 100644 (file)
--- a/modules/mmx/Modules.am
+++ b/modules/mmx/Makefile.am
@@ -1,3 +1,6 @@
+basedir = mmx
+include $(top_srcdir)/modules/common.am
+
 libi420_rgb_mmx_plugin_la_SOURCES = \
         ../video_chroma/i420_rgb.c \
        ../video_chroma/i420_rgb.h \
@@ -18,8 +21,7 @@ libi422_yuy2_mmx_plugin_la_SOURCES = \
 libi422_yuy2_mmx_plugin_la_CFLAGS = $(AM_CFLAGS)
 libi422_yuy2_mmx_plugin_la_LIBADD = $(AM_LIBADD)
 
-libvlc_LTLIBRARIES += \
+libvlc_LTLIBRARIES = \
        libi420_rgb_mmx_plugin.la \
        libi420_yuy2_mmx_plugin.la \
-       libi422_yuy2_mmx_plugin.la \
-       $(NULL)
+       libi422_yuy2_mmx_plugin.la

diff --git a/modules/sse2/Modules.am b/modules/sse2/Makefile.am
similarity index 87%
rename from modules/sse2/Modules.am
rename to modules/sse2/Makefile.am
index 41e2bb271924cdb746bf1ee704fda7f9eb362022..9fc68940bbee424d45004b0998d9c15256725b98 100644 (file)
--- a/modules/sse2/Modules.am
+++ b/modules/sse2/Makefile.am
@@ -1,3 +1,6 @@
+basedir = sse2
+include $(top_srcdir)/modules/common.am
+
 libi420_rgb_sse2_plugin_la_SOURCES = \
         ../video_chroma/i420_rgb.c \
        ../video_chroma/i420_rgb.h \
@@ -18,8 +21,7 @@ libi422_yuy2_sse2_plugin_la_SOURCES = \
 libi422_yuy2_sse2_plugin_la_CFLAGS = $(AM_CFLAGS)
 libi422_yuy2_sse2_plugin_la_LIBADD = $(AM_LIBADD)
 
-libvlc_LTLIBRARIES += \
+libvlc_LTLIBRARIES = \
        libi420_rgb_sse2_plugin.la \
        libi420_yuy2_sse2_plugin.la \
-       libi422_yuy2_sse2_plugin.la \
-       $(NULL)
+       libi422_yuy2_sse2_plugin.la

diff --git a/modules/stream_filter/Modules.am b/modules/stream_filter/Makefile.am
similarity index 97%
rename from modules/stream_filter/Modules.am
rename to modules/stream_filter/Makefile.am
index 805670ed483a3b801b95ef4e298f9362d0dac206..c14d3fda4b1614c2027de7aabc4b8aab682bf654 100644 (file)
--- a/modules/stream_filter/Modules.am
+++ b/modules/stream_filter/Makefile.am
@@ -1,3 +1,7 @@
+basedir = stream_filter
+include $(top_srcdir)/modules/common.am
+libvlc_LTLIBRARIES =
+
 libdecomp_plugin_la_SOURCES = decomp.c
 libdecomp_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdecomp_plugin_la_LIBADD = $(AM_LIBADD)