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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 11:07:30 2012 +0300| [74baa8cafc2a20c7cc479cd3c7a3b0756a0ec98b] | committer: Rémi Denis-Courmont

Remove recursion into modules/access/bd

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

 configure.ac                 |    1 -
 modules/access/Modules.am    |   28 +++++++++++++++++++---------
 modules/access/bd/Modules.am |   10 ----------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8fbcd81..56b5800 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4150,7 +4150,6 @@ AC_CONFIG_FILES([
   bin/Makefile
   test/Makefile
   modules/access/Makefile
-  modules/access/bd/Makefile
   modules/access/dshow/Makefile
   modules/access/mms/Makefile
   modules/access/rtp/Makefile
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 80ff073..125ef70 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,4 +1,4 @@
-BASE_SUBDIRS = bd mms rtp rtsp screen vcd vcdx zip
+BASE_SUBDIRS = mms rtp rtsp screen vcd vcdx zip
 EXTRA_SUBDIRS = dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
@@ -41,8 +41,6 @@ SOURCES_access_http = http.c
 SOURCES_access_ftp = ftp.c
 SOURCES_access_gnomevfs = gnomevfs.c
 SOURCES_access_eyetv = eyetv.m
-SOURCES_dvdnav = dvdnav.c
-SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c
 SOURCES_dv1394 = dv.c
 SOURCES_pvr = pvr.c
@@ -52,12 +50,6 @@ SOURCES_linsys_hdsdi = \
 	linsys/linsys_sdiaudio.h \
 	linsys/linsys_sdivideo.h \
 	$(NULL)
-SOURCES_cdda = \
-        cdda.c \
-        vcd/cdrom.c \
-        vcd/cdrom.h \
-        vcd/cdrom_internals.h \
-        $(NULL)
 SOURCES_access_jack = jack.c
 SOURCES_access_mtp = mtp.c
 SOURCES_access_sftp = sftp.c
@@ -158,6 +150,24 @@ libvlc_LTLIBRARIES += libxcb_screen_plugin.la
 endif
 
 
+### Optical media ###
+
+SOURCES_cdda = \
+        cdda.c \
+        vcd/cdrom.c \
+        vcd/cdrom.h \
+        vcd/cdrom_internals.h \
+        $(NULL)
+
+SOURCES_dvdnav = dvdnav.c
+SOURCES_dvdread = dvdread.c
+
+libaccess_bd_plugin_la_SOURCES = bd/bd.c bd/mpls.c bd/mpls.h bd/clpi.c bd/clpi.h
+libaccess_bd_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_bd_plugin_la_LIBADD = $(AM_LIBADD)
+libvlc_LTLIBRARIES += libaccess_bd_plugin.la
+
+
 ### Digital TV ###
 
 libdtv_plugin_la_SOURCES = \
diff --git a/modules/access/bd/Modules.am b/modules/access/bd/Modules.am
deleted file mode 100644
index 3c78f06..0000000
--- a/modules/access/bd/Modules.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SOURCES_access_bd = \
-    bd.c \
-    mpls.c \
-    mpls.h \
-    clpi.c \
-    clpi.h \
-    $(NULL)
-
-libvlc_LTLIBRARIES += libaccess_bd_plugin.la
-