Remove CDDAX module

[vlc] / modules / access / Modules.am

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index d9a6969e3556ab39ee4019c91bd457dd0348c1e6..06cba1654c08b48eb9ab108ad4924747c4fdbef6 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -3,7 +3,7 @@
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
-BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp v4l2 vcd vcdx screen
+BASE_SUBDIRS = dvb mms rtp rtsp vcd vcdx screen bd zip
 EXTRA_SUBDIRS = bda dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
@@ -29,6 +29,7 @@ SOURCES_dc1394 = dc1394.c
 SOURCES_access_fake = fake.c
 SOURCES_pvr = pvr.c videodev2.h
 SOURCES_v4l = v4l.c videodev_mjpeg.h
+SOURCES_v4l2 = v4l2.c
 SOURCES_qtcapture = qtcapture.m
 SOURCES_cdda = \
         cdda.c \
@@ -38,6 +39,21 @@ SOURCES_cdda = \
         $(NULL)
 SOURCES_access_jack = jack.c
 SOURCES_access_alsa = alsa.c
+SOURCES_access_oss = oss.c
+SOURCES_access_mtp = mtp.c
+SOURCES_access_sftp = sftp.c
+SOURCES_access_imem = imem.c
+SOURCES_access_avio = avio.c avio.h
+
+libaccess_rtmp_plugin_la_SOURCES = \
+        rtmp/access.c \
+        rtmp/rtmp_amf_flv.c \
+        rtmp/rtmp_amf_flv.h \
+        $(NULL)
+libaccess_rtmp_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       -fno-strict-aliasing
+libaccess_rtmp_plugin_la_LIBADD = $(AM_LIBADD)
+libaccess_rtmp_plugin_la_DEPENDENCIES =
 
 libvlc_LTLIBRARIES += \
        libaccess_file_plugin.la \
@@ -47,4 +63,15 @@ libvlc_LTLIBRARIES += \
        libaccess_http_plugin.la \
        libaccess_ftp_plugin.la \
        libaccess_fake_plugin.la \
+       libaccess_rtmp_plugin.la \
+       libaccess_imem_plugin.la \
        $(NULL)
+
+libxcb_screen_plugin_la_SOURCES = screen/xcb.c
+libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(XCB_CFLAGS)
+libxcb_screen_plugin_la_LIBADD = $(AM_LIBADD) \
+       $(XCB_LIBS)
+libxcb_screen_plugin_la_DEPENDENCIES =
+EXTRA_LTLIBRARIES += libxcb_screen_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBxcb_screen)