Remove CDDAX module

[vlc] / modules / access / Modules.am

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 5d76ae05f5ff154f33ceda69f56ac25f2cd0084e..06cba1654c08b48eb9ab108ad4924747c4fdbef6 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,9 +1,17 @@
-SUBDIRS = bda dshow dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
 # Automake forgets to add a proper tag to libtool with Objective-C files.
 # Moreover Libtool should default tag to CC when none is specified but
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
+BASE_SUBDIRS = dvb mms rtp rtsp vcd vcdx screen bd zip
+EXTRA_SUBDIRS = bda dshow
+SUBDIRS = $(BASE_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+
+if HAVE_WIN32
+SUBDIRS += bda dshow
+endif
+
 SOURCES_access_file = file.c
 SOURCES_access_mmap = mmap.c
 SOURCES_access_directory = directory.c
@@ -21,6 +29,8 @@ 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 \
         vcd/cdrom.c \
@@ -28,6 +38,22 @@ SOURCES_cdda = \
         vcd/cdrom_internals.h \
         $(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 \
@@ -37,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)