vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep  9 
11:47:57 2012 +0300| [4cefbe9ad9b53041720e854fc1c3aeed94310f42] | committer: 
Rémi Denis-Courmont

Remove recursion into modules/access/vcdx/

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

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

diff --git a/configure.ac b/configure.ac
index 4747d26..c2f437f 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/vcdx/Makefile
   modules/access/zip/Makefile
   modules/access/zip/unzip/Makefile
   modules/access_output/Makefile
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 0b3d554..7971318 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = mms rtp vcdx zip
+SUBDIRS = mms rtp zip
 
 libfilesystem_plugin_la_SOURCES = \
        fs.h \
@@ -171,6 +171,11 @@ SOURCES_vcd = \
        vcd/cdrom.c \
        vcd/cdrom.h \
        vcd/cdrom_internals.h
+SOURCES_vcdx = \
+       vcdx/access.h vcdx/access.c \
+       vcdx/vcd.c vcdx/vcd.h \
+       vcdx/vcdplayer.h vcdx/vcdplayer.c \
+       vcdx/info.c vcdx/info.h
 
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
diff --git a/modules/access/vcdx/Modules.am b/modules/access/vcdx/Modules.am
deleted file mode 100644
index 038374c..0000000
--- a/modules/access/vcdx/Modules.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SOURCES_vcdx = \
-       access.h \
-       access.c \
-       vcd.c \
-       vcd.h \
-       vcdplayer.h \
-       vcdplayer.c \
-       info.c \
-       info.h \
-       $(NULL)

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to