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

[Rémi Denis-Courmont]

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

Remove recursion into modules/codec/shine/

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

 configure.ac                   |    1 -
 modules/codec/Modules.am       |    4 +++-
 modules/codec/shine/Modules.am |    2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 995d037..f5de87c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4070,7 +4070,6 @@ AC_CONFIG_FILES([
   modules/codec/dmo/Makefile
   modules/codec/loader/Makefile
   modules/codec/omxil/Makefile
-  modules/codec/shine/Makefile
   modules/control/Makefile
   modules/demux/Makefile
   modules/gui/Makefile
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index a3416e2..4a112ea 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = loader dmo avcodec shine omxil
+SUBDIRS = loader dmo avcodec omxil
 SOURCES_a52 = a52.c a52.h
 SOURCES_dts = dts.c
 SOURCES_flac = flac.c
@@ -12,6 +12,8 @@ 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 = \
 	wmafixed/asf.h wmafixed/bswap.h \
 	wmafixed/fft.c wmafixed/fft.h \
diff --git a/modules/codec/shine/Modules.am b/modules/codec/shine/Modules.am
deleted file mode 100644
index 2096a70..0000000
--- a/modules/codec/shine/Modules.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES_shine = shine_mod.c enc_base.h
-EXTRA_DIST += shine.c