[vlc-commits] modules: avoid using genmf where unnecessary

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul  8 19:06:56 2013 +0300| [69128da6bd6ab0b3babc01e404b4ad6ec23b0ea5] | committer: Rémi Denis-Courmont

modules: avoid using genmf where unnecessary

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

 modules/access/rtp/{Modules.am => Makefile.am}    |    6 ++++--
 modules/altivec/{Modules.am => Makefile.am}       |    8 +++++---
 modules/arm_neon/{Modules.am => Makefile.am}      |    8 +++++---
 modules/audio_mixer/{Modules.am => Makefile.am}   |    5 ++++-
 modules/mmx/{Modules.am => Makefile.am}           |    8 +++++---
 modules/sse2/{Modules.am => Makefile.am}          |    8 +++++---
 modules/stream_filter/{Modules.am => Makefile.am} |    4 ++++
 7 files changed, 32 insertions(+), 15 deletions(-)

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 4b8aa95..7cdcae6 100644
--- 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 5178b01..cf28a03 100644
--- 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 decb3b8..c6eb6cb 100644
--- 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 18575f8..2adfdb4 100644
--- 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 e4dec7d..38bf267 100644
--- 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 41e2bb2..9fc6894 100644
--- 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 805670e..c14d3fd 100644
--- 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)