[vlc-commits] Remove recursion into modules/access/vcd/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 11:46:26 2012 +0300| [4d1cee9e23f4f8249299752eb0f5909c2c8b21c3] | committer: Rémi Denis-Courmont

Remove recursion into modules/access/vcd/

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

 configure.ac                  |    1 -
 modules/access/Modules.am     |   10 +++++++---
 modules/access/vcd/Modules.am |    6 ------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 569e211..4747d26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4130,7 +4130,6 @@ AC_CONFIG_FILES([
   modules/access/Makefile
   modules/access/mms/Makefile
   modules/access/rtp/Makefile
-  modules/access/vcd/Makefile
   modules/access/vcdx/Makefile
   modules/access/zip/Makefile
   modules/access/zip/unzip/Makefile
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 3f48099..0b3d554 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = mms rtp vcd vcdx zip
+SUBDIRS = mms rtp vcdx zip
 
 libfilesystem_plugin_la_SOURCES = \
 	fs.h \
@@ -165,8 +165,12 @@ SOURCES_cdda = \
         cdda.c \
         vcd/cdrom.c \
         vcd/cdrom.h \
-        vcd/cdrom_internals.h \
-        $(NULL)
+        vcd/cdrom_internals.h
+SOURCES_vcd = \
+	vcd/vcd.c \
+	vcd/cdrom.c \
+	vcd/cdrom.h \
+	vcd/cdrom_internals.h
 
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
diff --git a/modules/access/vcd/Modules.am b/modules/access/vcd/Modules.am
deleted file mode 100644
index 2219068..0000000
--- a/modules/access/vcd/Modules.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCES_vcd = \
-	vcd.c \
-	cdrom.c \
-	cdrom.h \
-	cdrom_internals.h \
-	$(NULL)