[vlc-commits] codec: avoid genmf for simple audio codecs

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 14 22:43:53 2013 +0300| [ca8d2b7620d50137cd820eb8cc4dbb232831d4d9] | committer: Rémi Denis-Courmont

codec: avoid genmf for simple audio codecs

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

 modules/codec/Modules.am |   58 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 876ae61..9f60502 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,19 +1,11 @@
 noinst_HEADERS =
 
-SOURCES_a52 = a52.c a52.h
-SOURCES_dts = dts.c dts_header.h dts_header.c
 SOURCES_flac = flac.c
-SOURCES_lpcm = lpcm.c
-SOURCES_araw = araw.c
-SOURCES_g711 = g711.c
 SOURCES_vorbis = vorbis.c
 SOURCES_theora = theora.c
 SOURCES_tremor = vorbis.c
 SOURCES_speex = speex.c
-SOURCES_adpcm = adpcm.c
 SOURCES_opus = opus.c opus_header.c opus_header.h
-SOURCES_uleaddvaudio = uleaddvaudio.c
-SOURCES_mpeg_audio = mpeg_audio.c
 SOURCES_shine = shine/shine_mod.c shine/enc_base.h
 EXTRA_DIST += shine/shine.c
 SOURCES_wma_fixed = \
@@ -47,7 +39,6 @@ SOURCES_cc = cc.c cc.h substext.h
 SOURCES_kate = kate.c
 SOURCES_schroedinger = schroedinger.c
 SOURCES_libass = libass.c
-SOURCES_aes3 = aes3.c
 SOURCES_subsdec = subsdec.c substext.h
 SOURCES_subsusf = subsusf.c
 SOURCES_t140 = t140.c
@@ -62,20 +53,11 @@ SOURCES_scte27 = scte27.c
 SOURCES_qsv = qsv.c
 
 libvlc_LTLIBRARIES += \
-	liba52_plugin.la \
-	libadpcm_plugin.la \
-	libuleaddvaudio_plugin.la \
-	libaes3_plugin.la \
-	libaraw_plugin.la \
 	libcc_plugin.la \
 	libcdg_plugin.la \
 	libcvdsub_plugin.la \
 	libddummy_plugin.la \
-	libdts_plugin.la \
 	libdvbsub_plugin.la \
-	libg711_plugin.la \
-	liblpcm_plugin.la \
-	libmpeg_audio_plugin.la \
 	librawvideo_plugin.la \
 	libspudec_plugin.la \
 	libsvcdsub_plugin.la \
@@ -91,6 +73,46 @@ libvlc_LTLIBRARIES += \
 	libedummy_plugin.la
 endif
 
+### Audio codecs ###
+
+liba52_plugin_la_SOURCES = a52.c a52.h
+liba52_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libadpcm_plugin_la_SOURCES = adpcm.c
+libadpcm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libaes3_plugin_la_SOURCES = aes3.c
+libaes3_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libaraw_plugin_la_SOURCES = araw.c
+libaraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libdts_plugin_la_SOURCES = dts.c dts_header.h dts_header.c
+libdts_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libg711_plugin_la_SOURCES = g711.c
+libg711_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+liblpcm_plugin_la_SOURCES = lpcm.c
+liblpcm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libmpeg_audio_plugin_la_SOURCES = mpeg_audio.c
+libmpeg_audio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libuleaddvaudio_plugin_la_SOURCES = uleaddvaudio.c
+libuleaddvaudio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libvlc_LTLIBRARIES += \
+	liba52_plugin.la \
+	libadpcm_plugin.la \
+	libaes3_plugin.la \
+	libaraw_plugin.la \
+	libdts_plugin.la \
+	libg711_plugin.la \
+	liblpcm_plugin.la \
+	libmpeg_audio_plugin.la \
+	libuleaddvaudio_plugin.la
+
 ### FFmpeg/libav ###
 libavcodec_plugin_la_SOURCES = \
 	avcodec/avcommon_compat.h \