[vlc-commits] Remove recursion into modules/codec/wmafixed/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 15:35:21 2012 +0300| [9a0c2dcacf1ee86ebe7b05ebe32d13015f0c4499] | committer: Rémi Denis-Courmont

Remove recursion into modules/codec/wmafixed/

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

 configure.ac                      |    1 -
 modules/codec/Modules.am          |   10 +++++++++-
 modules/codec/wmafixed/Modules.am |    3 ---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 98abf66..995d037 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4071,7 +4071,6 @@ AC_CONFIG_FILES([
   modules/codec/loader/Makefile
   modules/codec/omxil/Makefile
   modules/codec/shine/Makefile
-  modules/codec/wmafixed/Makefile
   modules/control/Makefile
   modules/demux/Makefile
   modules/gui/Makefile
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index b6e4cac..a3416e2 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = loader dmo avcodec shine wmafixed omxil
+SUBDIRS = loader dmo avcodec shine omxil
 SOURCES_a52 = a52.c a52.h
 SOURCES_dts = dts.c
 SOURCES_flac = flac.c
@@ -12,6 +12,14 @@ 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_wma_fixed = \
+	wmafixed/asf.h wmafixed/bswap.h \
+	wmafixed/fft.c wmafixed/fft.h \
+	wmafixed/mdct.c wmafixed/mdct.h \
+	wmafixed/wma.c wmafixed/wmadeci.c \
+	wmafixed/bitstream.c wmafixed/bitstream.h \
+	wmafixed/wmadata.h wmafixed/wmadec.h \
+	wmafixed/wmafixed.c wmafixed/wmafixed.h
 SOURCES_libmpeg2 = libmpeg2.c
 SOURCES_rawvideo = rawvideo.c
 SOURCES_quicktime = quicktime.c
diff --git a/modules/codec/wmafixed/Modules.am b/modules/codec/wmafixed/Modules.am
deleted file mode 100644
index e73f81f..0000000
--- a/modules/codec/wmafixed/Modules.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES_wma_fixed = asf.h bswap.h fft.h mdct.h wma.c wmadeci.c bitstream.c \
-  wmadata.h wmafixed.c bitstream.h fft.c mdct.c \
-  wmadec.h wmafixed.h